Skip to content

C
core
Kaydet (Commit) 3d46ec6f authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

weld ImpPDFTabDialog 

Change-Id: I0b7f439a6e712c9824008b21bfc511432641dbee
Reviewed-on: https://gerrit.libreoffice.org/56041
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 6f2b115d
Show whitespace changes
Inline Side-by-side
Showing with 393 additions and 271 deletions
filter/source/pdf/impdialog.cxx
Dosyayı görüntüle @ 3d46ec6f
...@@ -53,17 +53,11 @@ using namespace ::com::sun::star::uno; ...@@ -53,17 +53,11 @@ using namespace ::com::sun::star::uno;
Please note: the default used here are the same as per specification, Please note: the default used here are the same as per specification,
They should be the same in PDFFilter::implExport and in PDFExport::PDFExport They should be the same in PDFFilter::implExport and in PDFExport::PDFExport
*/ */
ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >& rFilterData, ImpPDFTabDialog::ImpPDFTabDialog(weld::Window* pParent, Sequence< PropertyValue >& rFilterData,
const Reference< XComponent >& rxDoc) const Reference< XComponent >& rxDoc)
: SfxTabDialog(pParent, "PdfOptionsDialog","filter/ui/pdfoptionsdialog.ui"), : SfxTabDialogController(pParent, "filter/ui/pdfoptionsdialog.ui", "PdfOptionsDialog"),
maConfigItem( "Office.Common/Filter/PDF/Export/", &rFilterData ), maConfigItem( "Office.Common/Filter/PDF/Export/", &rFilterData ),
maConfigI18N( "Office.Common/I18N/CTL/" ), maConfigI18N( "Office.Common/I18N/CTL/" ),
mnSigningPageId(0),
mnSecurityPageId(0),
mnLinksPage(0),
mnInterfacePageId(0),
mnViewPageId(0),
mnGeneralPageId(0),
mbIsPresentation( false ), mbIsPresentation( false ),
mbIsSpreadsheet( false ), mbIsSpreadsheet( false ),
mbIsWriter( false ), mbIsWriter( false ),
...@@ -247,14 +241,14 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue > ...@@ -247,14 +241,14 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
mbSignPDF = maConfigItem.ReadBool( "SignPDF", false ); mbSignPDF = maConfigItem.ReadBool( "SignPDF", false );
// queue the tab pages for later creation (created when first shown) // queue the tab pages for later creation (created when first shown)
mnSigningPageId = AddTabPage("digitalsignatures", ImpPDFTabSigningPage::Create, nullptr); AddTabPage("general", ImpPDFTabGeneralPage::Create, nullptr );
mnSecurityPageId = AddTabPage("security", ImpPDFTabSecurityPage::Create, nullptr); AddTabPage("digitalsignatures", ImpPDFTabSigningPage::Create, nullptr);
mnLinksPage = AddTabPage("links", ImpPDFTabLinksPage::Create, nullptr); AddTabPage("security", ImpPDFTabSecurityPage::Create, nullptr);
mnInterfacePageId = AddTabPage("userinterface", ImpPDFTabViewerPage::Create, nullptr); AddTabPage("links", ImpPDFTabLinksPage::Create, nullptr);
mnViewPageId = AddTabPage("initialview", ImpPDFTabOpnFtrPage::Create, nullptr); AddTabPage("userinterface", ImpPDFTabViewerPage::Create, nullptr);
AddTabPage("initialview", ImpPDFTabOpnFtrPage::Create, nullptr);
// last queued is the first to be displayed (or so it seems..) SetCurPageId("general");
mnGeneralPageId = AddTabPage("general", ImpPDFTabGeneralPage::Create, nullptr );
// get the string property value (from sfx2/source/dialog/mailmodel.cxx) to overwrite the text for the Ok button // get the string property value (from sfx2/source/dialog/mailmodel.cxx) to overwrite the text for the Ok button
OUString sOkButtonText = maConfigItem.ReadString( "_OkButtonString", OUString() ); OUString sOkButtonText = maConfigItem.ReadString( "_OkButtonString", OUString() );
...@@ -262,21 +256,19 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue > ...@@ -262,21 +256,19 @@ ImpPDFTabDialog::ImpPDFTabDialog(vcl::Window* pParent, Sequence< PropertyValue >
// change text on the Ok button: get the relevant string from resources, update it on the button // change text on the Ok button: get the relevant string from resources, update it on the button
// according to the exported pdf file destination: send as e-mail or write to file? // according to the exported pdf file destination: send as e-mail or write to file?
if (!sOkButtonText.isEmpty()) if (!sOkButtonText.isEmpty())
{ GetOKButton().set_label(sOkButtonText);
GetOKButton().SetText(sOkButtonText);
}
GetCancelButton().SetClickHdl(LINK(this, ImpPDFTabDialog, CancelHdl)); GetCancelButton().connect_clicked(LINK(this, ImpPDFTabDialog, CancelHdl));
// remove the reset button, not needed in this tabbed dialog // remove the reset button, not needed in this tabbed dialog
RemoveResetButton(); RemoveResetButton();
Start_Impl();
} }
ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const
{ {
SfxTabPage* pSecurityPage = GetTabPage(mnSecurityPageId); SfxTabPage* pSecurityPage = GetTabPage("security");
if (pSecurityPage) if (pSecurityPage)
{ {
return static_cast<ImpPDFTabSecurityPage*>(pSecurityPage); return static_cast<ImpPDFTabSecurityPage*>(pSecurityPage);
...@@ -287,7 +279,7 @@ ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const ...@@ -287,7 +279,7 @@ ImpPDFTabSecurityPage* ImpPDFTabDialog::getSecurityPage() const
ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const
{ {
SfxTabPage* pLinksPage = GetTabPage(mnLinksPage); SfxTabPage* pLinksPage = GetTabPage("links");
if (pLinksPage) if (pLinksPage)
{ {
return static_cast<ImpPDFTabLinksPage*>(pLinksPage); return static_cast<ImpPDFTabLinksPage*>(pLinksPage);
...@@ -298,7 +290,7 @@ ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const ...@@ -298,7 +290,7 @@ ImpPDFTabLinksPage* ImpPDFTabDialog::getLinksPage() const
ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const
{ {
SfxTabPage* pGeneralPage = GetTabPage(mnGeneralPageId); SfxTabPage* pGeneralPage = GetTabPage("general");
if (pGeneralPage) if (pGeneralPage)
{ {
return static_cast<ImpPDFTabGeneralPage*>(pGeneralPage); return static_cast<ImpPDFTabGeneralPage*>(pGeneralPage);
...@@ -306,65 +298,43 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const ...@@ -306,65 +298,43 @@ ImpPDFTabGeneralPage* ImpPDFTabDialog::getGeneralPage() const
return nullptr; return nullptr;
} }
IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl, weld::Button&, void)
IMPL_LINK_NOARG(ImpPDFTabDialog, CancelHdl, Button*, void)
{ {
EndDialog(); m_xDialog->response(RET_CANCEL);
} }
ImpPDFTabDialog::~ImpPDFTabDialog() ImpPDFTabDialog::~ImpPDFTabDialog()
{ {
disposeOnce();
}
void ImpPDFTabDialog::dispose()
{
// delete the pages, needed because otherwise the child tab pages
// don't get destroyed
RemoveTabPage(mnGeneralPageId);
RemoveTabPage(mnInterfacePageId);
RemoveTabPage(mnViewPageId);
RemoveTabPage(mnLinksPage);
RemoveTabPage(mnSecurityPageId);
RemoveTabPage(mnSigningPageId);
maConfigItem.WriteModifiedConfig(); maConfigItem.WriteModifiedConfig();
maConfigI18N.WriteModifiedConfig(); maConfigI18N.WriteModifiedConfig();
SfxTabDialog::dispose();
} }
void ImpPDFTabDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
void ImpPDFTabDialog::PageCreated( sal_uInt16 _nId,
SfxTabPage& _rPage )
{ {
if (_nId == mnGeneralPageId) if (rId == "general")
{ static_cast<ImpPDFTabGeneralPage&>(rPage).SetFilterConfigItem(this);
static_cast<ImpPDFTabGeneralPage*>( &_rPage )->SetFilterConfigItem( this ); else if (rId == "userinterface")
}
else if (_nId == mnInterfacePageId)
{ {
static_cast<ImpPDFTabViewerPage*>( &_rPage )->SetFilterConfigItem( this ); static_cast<ImpPDFTabViewerPage&>(rPage).SetFilterConfigItem(this);
} }
else if (_nId == mnViewPageId) else if (rId == "initialview")
{ {
static_cast<ImpPDFTabOpnFtrPage*>( &_rPage )->SetFilterConfigItem( this ); static_cast<ImpPDFTabOpnFtrPage&>(rPage).SetFilterConfigItem(this);
} }
else if (_nId == mnLinksPage) else if (rId == "links")
{ {
static_cast<ImpPDFTabLinksPage*>( &_rPage )->SetFilterConfigItem( this ); static_cast<ImpPDFTabLinksPage&>(rPage).SetFilterConfigItem(this);
} }
else if (_nId == mnSecurityPageId) else if (rId == "security")
{ {
static_cast<ImpPDFTabSecurityPage*>( &_rPage )->SetFilterConfigItem( this ); static_cast<ImpPDFTabSecurityPage&>(rPage).SetFilterConfigItem(this);
} }
else if (_nId == mnSigningPageId) else if (rId == "digitalsignatures")
{ {
static_cast<ImpPDFTabSigningPage*>( &_rPage )->SetFilterConfigItem( this ); static_cast<ImpPDFTabSigningPage&>(rPage).SetFilterConfigItem(this);
} }
} }
short ImpPDFTabDialog::Ok( ) short ImpPDFTabDialog::Ok( )
{ {
// here the whole mechanism of the base class is not used // here the whole mechanism of the base class is not used
...@@ -372,22 +342,21 @@ short ImpPDFTabDialog::Ok( ) ...@@ -372,22 +342,21 @@ short ImpPDFTabDialog::Ok( )
return RET_OK; return RET_OK;
} }
Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData() Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
{ {
// updating the FilterData sequence and storing FilterData to configuration // updating the FilterData sequence and storing FilterData to configuration
if( GetTabPage(mnGeneralPageId) ) if (ImpPDFTabGeneralPage* pPage = static_cast<ImpPDFTabGeneralPage*>(GetTabPage("general")))
static_cast<ImpPDFTabGeneralPage*>( GetTabPage(mnGeneralPageId) )->GetFilterConfigItem( this ); pPage->GetFilterConfigItem(this);
if( GetTabPage(mnInterfacePageId) ) if (ImpPDFTabViewerPage* pPage = static_cast<ImpPDFTabViewerPage*>(GetTabPage("userinterface")))
static_cast<ImpPDFTabViewerPage*>( GetTabPage(mnInterfacePageId) )->GetFilterConfigItem( this ); pPage->GetFilterConfigItem(this);
if( GetTabPage(mnViewPageId) ) if (ImpPDFTabOpnFtrPage* pPage = static_cast<ImpPDFTabOpnFtrPage*>(GetTabPage("initialview")))
static_cast<ImpPDFTabOpnFtrPage*>( GetTabPage(mnViewPageId) )->GetFilterConfigItem( this ); pPage->GetFilterConfigItem(this);
if( GetTabPage(mnLinksPage) ) if (ImpPDFTabLinksPage* pPage = static_cast<ImpPDFTabLinksPage*>(GetTabPage("links")))
static_cast<ImpPDFTabLinksPage*>( GetTabPage(mnLinksPage) )->GetFilterConfigItem( this ); pPage->GetFilterConfigItem(this);
if( GetTabPage(mnSecurityPageId) ) if (ImpPDFTabSecurityPage* pPage = static_cast<ImpPDFTabSecurityPage*>( GetTabPage("security")))
static_cast<ImpPDFTabSecurityPage*>( GetTabPage(mnSecurityPageId) )->GetFilterConfigItem( this ); pPage->GetFilterConfigItem(this);
if( GetTabPage(mnSigningPageId) ) if (ImpPDFTabSigningPage* pPage = static_cast<ImpPDFTabSigningPage*>(GetTabPage("digitalsignatures")))
static_cast<ImpPDFTabSigningPage*>( GetTabPage(mnSigningPageId) )->GetFilterConfigItem( this ); pPage->GetFilterConfigItem(this);
// prepare the items to be returned // prepare the items to be returned
maConfigItem.WriteBool( "UseLosslessCompression", mbUseLosslessCompression ); maConfigItem.WriteBool( "UseLosslessCompression", mbUseLosslessCompression );
...@@ -480,7 +449,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemS ...@@ -480,7 +449,7 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemS
, mbIsPresentation(false) , mbIsPresentation(false)
, mbIsSpreadsheet(false) , mbIsSpreadsheet(false)
, mbIsWriter(false) , mbIsWriter(false)
, mpaParent(nullptr) , mpParent(nullptr)
, mxRbAll(m_xBuilder->weld_radio_button("all")) , mxRbAll(m_xBuilder->weld_radio_button("all"))
, mxRbRange(m_xBuilder->weld_radio_button("range")) , mxRbRange(m_xBuilder->weld_radio_button("range"))
, mxRbSelection(m_xBuilder->weld_radio_button("selection")) , mxRbSelection(m_xBuilder->weld_radio_button("selection"))
...@@ -518,18 +487,11 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemS ...@@ -518,18 +487,11 @@ ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemS
ImpPDFTabGeneralPage::~ImpPDFTabGeneralPage() ImpPDFTabGeneralPage::~ImpPDFTabGeneralPage()
{ {
disposeOnce();
}
void ImpPDFTabGeneralPage::dispose()
{
mpaParent.clear();
SfxTabPage::dispose();
} }
void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
{ {
mpaParent = paParent; mpParent = pParent;
// init this class data // init this class data
mxRbRange->connect_toggled( LINK( this, ImpPDFTabGeneralPage, TogglePagesHdl ) ); mxRbRange->connect_toggled( LINK( this, ImpPDFTabGeneralPage, TogglePagesHdl ) );
...@@ -538,37 +500,37 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) ...@@ -538,37 +500,37 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
mxRbAll->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleAllHdl ) ); mxRbAll->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleAllHdl ) );
TogglePagesHdl(); TogglePagesHdl();
mxRbSelection->set_sensitive( paParent->mbSelectionPresent ); mxRbSelection->set_sensitive( pParent->mbSelectionPresent );
if ( paParent->mbSelectionPresent ) if ( pParent->mbSelectionPresent )
mxRbSelection->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleSelectionHdl ) ); mxRbSelection->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleSelectionHdl ) );
mbIsPresentation = paParent->mbIsPresentation; mbIsPresentation = pParent->mbIsPresentation;
mbIsWriter = paParent->mbIsWriter; mbIsWriter = pParent->mbIsWriter;
mbIsSpreadsheet = paParent->mbIsSpreadsheet; mbIsSpreadsheet = pParent->mbIsSpreadsheet;
mxCbExportEmptyPages->set_sensitive( mbIsWriter ); mxCbExportEmptyPages->set_sensitive( mbIsWriter );
mxCbExportPlaceholders->set_sensitive( mbIsWriter ); mxCbExportPlaceholders->set_sensitive( mbIsWriter );
mxRbLosslessCompression->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleCompressionHdl ) ); mxRbLosslessCompression->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleCompressionHdl ) );
const bool bUseLosslessCompression = paParent->mbUseLosslessCompression; const bool bUseLosslessCompression = pParent->mbUseLosslessCompression;
if ( bUseLosslessCompression ) if ( bUseLosslessCompression )
mxRbLosslessCompression->set_active(true); mxRbLosslessCompression->set_active(true);
else else
mxRbJPEGCompression->set_active(true); mxRbJPEGCompression->set_active(true);
mxNfQuality->set_value( paParent->mnQuality, FUNIT_PERCENT ); mxNfQuality->set_value( pParent->mnQuality, FUNIT_PERCENT );
mxQualityFrame->set_sensitive(!bUseLosslessCompression); mxQualityFrame->set_sensitive(!bUseLosslessCompression);
mxCbReduceImageResolution->connect_toggled(LINK(this, ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl)); mxCbReduceImageResolution->connect_toggled(LINK(this, ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl));
const bool bReduceImageResolution = paParent->mbReduceImageResolution; const bool bReduceImageResolution = pParent->mbReduceImageResolution;
mxCbReduceImageResolution->set_active( bReduceImageResolution ); mxCbReduceImageResolution->set_active( bReduceImageResolution );
OUString aStrRes = OUString::number( paParent->mnMaxImageResolution ) + " DPI"; OUString aStrRes = OUString::number( pParent->mnMaxImageResolution ) + " DPI";
mxCoReduceImageResolution->set_entry_text(aStrRes); mxCoReduceImageResolution->set_entry_text(aStrRes);
mxCoReduceImageResolution->set_sensitive( bReduceImageResolution ); mxCoReduceImageResolution->set_sensitive( bReduceImageResolution );
mxCbWatermark->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleWatermarkHdl ) ); mxCbWatermark->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleWatermarkHdl ) );
mxFtWatermark->set_sensitive(false ); mxFtWatermark->set_sensitive(false );
mxEdWatermark->set_sensitive( false ); mxEdWatermark->set_sensitive( false );
mxCbPDFA1b->connect_toggled(LINK(this, ImpPDFTabGeneralPage, ToggleExportPDFAHdl)); mxCbPDFA1b->connect_toggled(LINK(this, ImpPDFTabGeneralPage, ToggleExportPDFAHdl));
switch( paParent->mnPDFTypeSelection ) switch( pParent->mnPDFTypeSelection )
{ {
default: default:
case 0: mxCbPDFA1b->set_active( false ); // PDF 1.5 case 0: mxCbPDFA1b->set_active( false ); // PDF 1.5
...@@ -581,8 +543,8 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) ...@@ -581,8 +543,8 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
mxCbExportFormFields->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl ) ); mxCbExportFormFields->connect_toggled( LINK( this, ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl ) );
// get the form values, for use with PDF/A-1 selection interface // get the form values, for use with PDF/A-1 selection interface
mbTaggedPDFUserSelection = paParent->mbUseTaggedPDF; mbTaggedPDFUserSelection = pParent->mbUseTaggedPDF;
mbExportFormFieldsUserSelection = paParent->mbExportFormFields; mbExportFormFieldsUserSelection = pParent->mbExportFormFields;
if( !mxCbPDFA1b->get_active() ) if( !mxCbPDFA1b->get_active() )
{ {
...@@ -591,27 +553,27 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) ...@@ -591,27 +553,27 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
mxCbExportFormFields->set_active( mbExportFormFieldsUserSelection ); mxCbExportFormFields->set_active( mbExportFormFieldsUserSelection );
} }
mxLbFormsFormat->set_active(static_cast<sal_uInt16>(paParent->mnFormsType)); mxLbFormsFormat->set_active(static_cast<sal_uInt16>(pParent->mnFormsType));
mxCbAllowDuplicateFieldNames->set_active( paParent->mbAllowDuplicateFieldNames ); mxCbAllowDuplicateFieldNames->set_active( pParent->mbAllowDuplicateFieldNames );
mxFormsFrame->set_sensitive( paParent->mbExportFormFields ); mxFormsFrame->set_sensitive( pParent->mbExportFormFields );
mxCbExportBookmarks->set_active( paParent->mbExportBookmarks ); mxCbExportBookmarks->set_active( pParent->mbExportBookmarks );
mxCbExportNotes->set_active( paParent->mbExportNotes ); mxCbExportNotes->set_active( pParent->mbExportNotes );
mxCbViewPDF->set_active( paParent->mbViewPDF); mxCbViewPDF->set_active( pParent->mbViewPDF);
if ( mbIsPresentation ) if ( mbIsPresentation )
{ {
mxRbRange->set_label(mxSlidesFt->get_label()); mxRbRange->set_label(mxSlidesFt->get_label());
mxCbExportNotesPages->show(); mxCbExportNotesPages->show();
mxCbExportNotesPages->set_active(paParent->mbExportNotesPages); mxCbExportNotesPages->set_active(pParent->mbExportNotesPages);
mxCbExportNotesPages->connect_toggled( LINK(this, ImpPDFTabGeneralPage, ToggleExportNotesPagesHdl ) ); mxCbExportNotesPages->connect_toggled( LINK(this, ImpPDFTabGeneralPage, ToggleExportNotesPagesHdl ) );
mxCbExportOnlyNotesPages->show(); mxCbExportOnlyNotesPages->show();
mxCbExportOnlyNotesPages->set_active(paParent->mbExportOnlyNotesPages); mxCbExportOnlyNotesPages->set_active(pParent->mbExportOnlyNotesPages);
// tdf#116473 Initially enable Export only note pages option depending on the checked state of Export notes pages option // tdf#116473 Initially enable Export only note pages option depending on the checked state of Export notes pages option
mxCbExportOnlyNotesPages->set_sensitive(mxCbExportNotesPages->get_active()); mxCbExportOnlyNotesPages->set_sensitive(mxCbExportNotesPages->get_active());
mxCbExportHiddenSlides->show(); mxCbExportHiddenSlides->show();
mxCbExportHiddenSlides->set_active(paParent->mbExportHiddenSlides); mxCbExportHiddenSlides->set_active(pParent->mbExportHiddenSlides);
} }
else else
{ {
...@@ -635,72 +597,72 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent ) ...@@ -635,72 +597,72 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem( ImpPDFTabDialog* paParent )
{ {
mxCbExportPlaceholders->set_active(false); mxCbExportPlaceholders->set_active(false);
} }
mxCbExportEmptyPages->set_active(!paParent->mbIsSkipEmptyPages); mxCbExportEmptyPages->set_active(!pParent->mbIsSkipEmptyPages);
mxCbExportPlaceholders->set_active(paParent->mbIsExportPlaceholders); mxCbExportPlaceholders->set_active(pParent->mbIsExportPlaceholders);
mxCbAddStream->show(); mxCbAddStream->show();
mxCbAddStream->set_active(paParent->mbAddStream); mxCbAddStream->set_active(pParent->mbAddStream);
mxCbAddStream->connect_toggled(LINK(this, ImpPDFTabGeneralPage, ToggleAddStreamHdl)); mxCbAddStream->connect_toggled(LINK(this, ImpPDFTabGeneralPage, ToggleAddStreamHdl));
ToggleAddStreamHdl(*mxCbAddStream); // init addstream dependencies ToggleAddStreamHdl(*mxCbAddStream); // init addstream dependencies
} }
void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
{ {
// updating the FilterData sequence and storing FilterData to configuration // updating the FilterData sequence and storing FilterData to configuration
paParent->mbUseLosslessCompression = mxRbLosslessCompression->get_active(); pParent->mbUseLosslessCompression = mxRbLosslessCompression->get_active();
paParent->mnQuality = static_cast<sal_Int32>(mxNfQuality->get_value(FUNIT_PERCENT)); pParent->mnQuality = static_cast<sal_Int32>(mxNfQuality->get_value(FUNIT_PERCENT));
paParent->mbReduceImageResolution = mxCbReduceImageResolution->get_active(); pParent->mbReduceImageResolution = mxCbReduceImageResolution->get_active();
paParent->mnMaxImageResolution = mxCoReduceImageResolution->get_active_text().toInt32(); pParent->mnMaxImageResolution = mxCoReduceImageResolution->get_active_text().toInt32();
paParent->mbExportNotes = mxCbExportNotes->get_active(); pParent->mbExportNotes = mxCbExportNotes->get_active();
paParent->mbViewPDF = mxCbViewPDF->get_active(); pParent->mbViewPDF = mxCbViewPDF->get_active();
paParent->mbUseReferenceXObject = mxCbUseReferenceXObject->get_active(); pParent->mbUseReferenceXObject = mxCbUseReferenceXObject->get_active();
if ( mbIsPresentation ) if ( mbIsPresentation )
{ {
paParent->mbExportNotesPages = mxCbExportNotesPages->get_active(); pParent->mbExportNotesPages = mxCbExportNotesPages->get_active();
paParent->mbExportOnlyNotesPages = mxCbExportOnlyNotesPages->get_active(); pParent->mbExportOnlyNotesPages = mxCbExportOnlyNotesPages->get_active();
} }
paParent->mbExportBookmarks = mxCbExportBookmarks->get_active(); pParent->mbExportBookmarks = mxCbExportBookmarks->get_active();
if ( mbIsPresentation ) if ( mbIsPresentation )
paParent->mbExportHiddenSlides = mxCbExportHiddenSlides->get_active(); pParent->mbExportHiddenSlides = mxCbExportHiddenSlides->get_active();
paParent->mbIsSkipEmptyPages = !mxCbExportEmptyPages->get_active(); pParent->mbIsSkipEmptyPages = !mxCbExportEmptyPages->get_active();
paParent->mbIsExportPlaceholders = mxCbExportPlaceholders->get_active(); pParent->mbIsExportPlaceholders = mxCbExportPlaceholders->get_active();
paParent->mbAddStream = mxCbAddStream->get_visible() && mxCbAddStream->get_active(); pParent->mbAddStream = mxCbAddStream->get_visible() && mxCbAddStream->get_active();
paParent->mbIsRangeChecked = false; pParent->mbIsRangeChecked = false;
if( mxRbRange->get_active() ) if( mxRbRange->get_active() )
{ {
paParent->mbIsRangeChecked = true; pParent->mbIsRangeChecked = true;
paParent->msPageRange = mxEdPages->get_text(); //FIXME all right on other languages ? pParent->msPageRange = mxEdPages->get_text(); //FIXME all right on other languages ?
} }
else if( mxRbSelection->get_active() ) else if( mxRbSelection->get_active() )
{ {
paParent->mbSelectionIsChecked = mxRbSelection->get_active(); pParent->mbSelectionIsChecked = mxRbSelection->get_active();
} }
paParent->mnPDFTypeSelection = 0; pParent->mnPDFTypeSelection = 0;
if( mxCbPDFA1b->get_active() ) if( mxCbPDFA1b->get_active() )
{ {
paParent->mnPDFTypeSelection = 1; pParent->mnPDFTypeSelection = 1;
paParent->mbUseTaggedPDF = mbTaggedPDFUserSelection; pParent->mbUseTaggedPDF = mbTaggedPDFUserSelection;
paParent->mbExportFormFields = mbExportFormFieldsUserSelection; pParent->mbExportFormFields = mbExportFormFieldsUserSelection;
} }
else else
{ {
paParent->mbUseTaggedPDF = mxCbTaggedPDF->get_active(); pParent->mbUseTaggedPDF = mxCbTaggedPDF->get_active();
paParent->mbExportFormFields = mxCbExportFormFields->get_active(); pParent->mbExportFormFields = mxCbExportFormFields->get_active();
} }
if( mxCbWatermark->get_active() ) if( mxCbWatermark->get_active() )
paParent->maWatermarkText = mxEdWatermark->get_text(); pParent->maWatermarkText = mxEdWatermark->get_text();
/* /*
* FIXME: the entries are only implicitly defined by the resource file. Should there * FIXME: the entries are only implicitly defined by the resource file. Should there
* ever be an additional form submit format this could get invalid. * ever be an additional form submit format this could get invalid.
*/ */
paParent->mnFormsType = mxLbFormsFormat->get_active(); pParent->mnFormsType = mxLbFormsFormat->get_active();
paParent->mbAllowDuplicateFieldNames = mxCbAllowDuplicateFieldNames->get_active(); pParent->mbAllowDuplicateFieldNames = mxCbAllowDuplicateFieldNames->get_active();
} }
VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( TabPageParent pParent, VclPtr<SfxTabPage> ImpPDFTabGeneralPage::Create( TabPageParent pParent,
...@@ -793,7 +755,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl, weld::ToggleButton&, v ...@@ -793,7 +755,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl, weld::ToggleButton&, v
IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, weld::ToggleButton&, void) IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, weld::ToggleButton&, void)
{ {
// set the security page status (and its controls as well) // set the security page status (and its controls as well)
ImpPDFTabSecurityPage* pSecPage = mpaParent ? mpaParent->getSecurityPage() : nullptr; ImpPDFTabSecurityPage* pSecPage = mpParent ? mpParent->getSecurityPage() : nullptr;
if (pSecPage) if (pSecPage)
{ {
pSecPage->ImplPDFASecurityControl(!mxCbPDFA1b->get_active()); pSecPage->ImplPDFASecurityControl(!mxCbPDFA1b->get_active());
...@@ -823,7 +785,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, weld::ToggleButton&, ...@@ -823,7 +785,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, weld::ToggleButton&,
// PDF/A-1 doesn't allow launch action, so enable/disable the selection on // PDF/A-1 doesn't allow launch action, so enable/disable the selection on
// Link page // Link page
ImpPDFTabLinksPage* pLinksPage = mpaParent ? mpaParent->getLinksPage() : nullptr; ImpPDFTabLinksPage* pLinksPage = mpParent ? mpParent->getLinksPage() : nullptr;
if (pLinksPage) if (pLinksPage)
pLinksPage->ImplPDFALinkControl(!mxCbPDFA1b->get_active()); pLinksPage->ImplPDFALinkControl(!mxCbPDFA1b->get_active());
...@@ -873,44 +835,44 @@ VclPtr<SfxTabPage> ImpPDFTabOpnFtrPage::Create(TabPageParent pParent, const SfxI ...@@ -873,44 +835,44 @@ VclPtr<SfxTabPage> ImpPDFTabOpnFtrPage::Create(TabPageParent pParent, const SfxI
return VclPtr<ImpPDFTabOpnFtrPage>::Create(pParent, *rAttrSet); return VclPtr<ImpPDFTabOpnFtrPage>::Create(pParent, *rAttrSet);
} }
void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
{ {
paParent->mnInitialView = 0; pParent->mnInitialView = 0;
if( mxRbOpnOutline->get_active() ) if( mxRbOpnOutline->get_active() )
paParent->mnInitialView = 1; pParent->mnInitialView = 1;
else if( mxRbOpnThumbs->get_active() ) else if( mxRbOpnThumbs->get_active() )
paParent->mnInitialView = 2; pParent->mnInitialView = 2;
paParent->mnMagnification = 0; pParent->mnMagnification = 0;
if( mxRbMagnFitWin->get_active() ) if( mxRbMagnFitWin->get_active() )
paParent->mnMagnification = 1; pParent->mnMagnification = 1;
else if( mxRbMagnFitWidth->get_active() ) else if( mxRbMagnFitWidth->get_active() )
paParent->mnMagnification = 2; pParent->mnMagnification = 2;
else if( mxRbMagnFitVisible->get_active() ) else if( mxRbMagnFitVisible->get_active() )
paParent->mnMagnification = 3; pParent->mnMagnification = 3;
else if( mxRbMagnZoom->get_active() ) else if( mxRbMagnZoom->get_active() )
{ {
paParent->mnMagnification = 4; pParent->mnMagnification = 4;
paParent->mnZoom = mxNumZoom->get_value(); pParent->mnZoom = mxNumZoom->get_value();
} }
paParent->mnInitialPage = mxNumInitialPage->get_value(); pParent->mnInitialPage = mxNumInitialPage->get_value();
paParent->mnPageLayout = 0; pParent->mnPageLayout = 0;
if( mxRbPgLySinglePage->get_active() ) if( mxRbPgLySinglePage->get_active() )
paParent->mnPageLayout = 1; pParent->mnPageLayout = 1;
else if( mxRbPgLyContinue->get_active() ) else if( mxRbPgLyContinue->get_active() )
paParent->mnPageLayout = 2; pParent->mnPageLayout = 2;
else if( mxRbPgLyContinueFacing->get_active() ) else if( mxRbPgLyContinueFacing->get_active() )
paParent->mnPageLayout = 3; pParent->mnPageLayout = 3;
paParent->mbFirstPageLeft = mbUseCTLFont && mxCbPgLyFirstOnLeft->get_active(); pParent->mbFirstPageLeft = mbUseCTLFont && mxCbPgLyFirstOnLeft->get_active();
} }
void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent )
{ {
mbUseCTLFont = paParent->mbUseCTLFont; mbUseCTLFont = pParent->mbUseCTLFont;
switch( paParent->mnPageLayout ) switch( pParent->mnPageLayout )
{ {
default: default:
case 0: case 0:
...@@ -927,7 +889,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ...@@ -927,7 +889,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
break; break;
} }
switch( paParent->mnInitialView ) switch( pParent->mnInitialView )
{ {
default: default:
case 0: case 0:
...@@ -941,7 +903,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ...@@ -941,7 +903,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
break; break;
} }
switch( paParent->mnMagnification ) switch( pParent->mnMagnification )
{ {
default: default:
case 0: case 0:
...@@ -966,15 +928,15 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ...@@ -966,15 +928,15 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
break; break;
} }
mxNumZoom->set_value(paParent->mnZoom); mxNumZoom->set_value(pParent->mnZoom);
mxNumInitialPage->set_value(paParent->mnInitialPage); mxNumInitialPage->set_value(pParent->mnInitialPage);
if (!mbUseCTLFont) if (!mbUseCTLFont)
mxCbPgLyFirstOnLeft->hide(); mxCbPgLyFirstOnLeft->hide();
else else
{ {
mxRbPgLyContinueFacing->connect_toggled(LINK(this, ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl)); mxRbPgLyContinueFacing->connect_toggled(LINK(this, ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl));
mxCbPgLyFirstOnLeft->set_active(paParent->mbFirstPageLeft); mxCbPgLyFirstOnLeft->set_active(pParent->mbFirstPageLeft);
ToggleRbPgLyContinueFacingHdl(); ToggleRbPgLyContinueFacingHdl();
} }
} }
...@@ -1029,34 +991,34 @@ VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( TabPageParent pParent, ...@@ -1029,34 +991,34 @@ VclPtr<SfxTabPage> ImpPDFTabViewerPage::Create( TabPageParent pParent,
return VclPtr<ImpPDFTabViewerPage>::Create(pParent, *rAttrSet); return VclPtr<ImpPDFTabViewerPage>::Create(pParent, *rAttrSet);
} }
void ImpPDFTabViewerPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) void ImpPDFTabViewerPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
{ {
paParent->mbHideViewerMenubar = m_xCbHideViewerMenubar->get_active(); pParent->mbHideViewerMenubar = m_xCbHideViewerMenubar->get_active();
paParent->mbHideViewerToolbar = m_xCbHideViewerToolbar->get_active(); pParent->mbHideViewerToolbar = m_xCbHideViewerToolbar->get_active();
paParent->mbHideViewerWindowControls = m_xCbHideViewerWindowControls->get_active(); pParent->mbHideViewerWindowControls = m_xCbHideViewerWindowControls->get_active();
paParent->mbResizeWinToInit = m_xCbResWinInit->get_active(); pParent->mbResizeWinToInit = m_xCbResWinInit->get_active();
paParent->mbOpenInFullScreenMode = m_xCbOpenFullScreen->get_active(); pParent->mbOpenInFullScreenMode = m_xCbOpenFullScreen->get_active();
paParent->mbCenterWindow = m_xCbCenterWindow->get_active(); pParent->mbCenterWindow = m_xCbCenterWindow->get_active();
paParent->mbDisplayPDFDocumentTitle = m_xCbDispDocTitle->get_active(); pParent->mbDisplayPDFDocumentTitle = m_xCbDispDocTitle->get_active();
paParent->mbUseTransitionEffects = m_xCbTransitionEffects->get_active(); pParent->mbUseTransitionEffects = m_xCbTransitionEffects->get_active();
paParent->mnOpenBookmarkLevels = m_xRbAllBookmarkLevels->get_active() ? pParent->mnOpenBookmarkLevels = m_xRbAllBookmarkLevels->get_active() ?
-1 : static_cast<sal_Int32>(m_xNumBookmarkLevels->get_value()); -1 : static_cast<sal_Int32>(m_xNumBookmarkLevels->get_value());
} }
void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent )
{ {
m_xCbHideViewerMenubar->set_active( paParent->mbHideViewerMenubar ); m_xCbHideViewerMenubar->set_active( pParent->mbHideViewerMenubar );
m_xCbHideViewerToolbar->set_active( paParent->mbHideViewerToolbar ); m_xCbHideViewerToolbar->set_active( pParent->mbHideViewerToolbar );
m_xCbHideViewerWindowControls->set_active( paParent->mbHideViewerWindowControls ); m_xCbHideViewerWindowControls->set_active( pParent->mbHideViewerWindowControls );
m_xCbResWinInit->set_active( paParent->mbResizeWinToInit ); m_xCbResWinInit->set_active( pParent->mbResizeWinToInit );
m_xCbOpenFullScreen->set_active( paParent->mbOpenInFullScreenMode ); m_xCbOpenFullScreen->set_active( pParent->mbOpenInFullScreenMode );
m_xCbCenterWindow->set_active( paParent->mbCenterWindow ); m_xCbCenterWindow->set_active( pParent->mbCenterWindow );
m_xCbDispDocTitle->set_active( paParent->mbDisplayPDFDocumentTitle ); m_xCbDispDocTitle->set_active( pParent->mbDisplayPDFDocumentTitle );
mbIsPresentation = paParent->mbIsPresentation; mbIsPresentation = pParent->mbIsPresentation;
m_xCbTransitionEffects->set_active( paParent->mbUseTransitionEffects ); m_xCbTransitionEffects->set_active( pParent->mbUseTransitionEffects );
m_xCbTransitionEffects->set_sensitive( mbIsPresentation ); m_xCbTransitionEffects->set_sensitive( mbIsPresentation );
if( paParent->mnOpenBookmarkLevels < 0 ) if( pParent->mnOpenBookmarkLevels < 0 )
{ {
m_xRbAllBookmarkLevels->set_active(true); m_xRbAllBookmarkLevels->set_active(true);
m_xNumBookmarkLevels->set_sensitive( false ); m_xNumBookmarkLevels->set_sensitive( false );
...@@ -1065,7 +1027,7 @@ void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ...@@ -1065,7 +1027,7 @@ void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
{ {
m_xRbVisibleBookmarkLevels->set_active(true); m_xRbVisibleBookmarkLevels->set_active(true);
m_xNumBookmarkLevels->set_sensitive(true); m_xNumBookmarkLevels->set_sensitive(true);
m_xNumBookmarkLevels->set_value(paParent->mnOpenBookmarkLevels); m_xNumBookmarkLevels->set_value(pParent->mnOpenBookmarkLevels);
} }
} }
...@@ -1111,42 +1073,42 @@ VclPtr<SfxTabPage> ImpPDFTabSecurityPage::Create(TabPageParent pParent, const Sf ...@@ -1111,42 +1073,42 @@ VclPtr<SfxTabPage> ImpPDFTabSecurityPage::Create(TabPageParent pParent, const Sf
return VclPtr<ImpPDFTabSecurityPage>::Create(pParent, *rAttrSet); return VclPtr<ImpPDFTabSecurityPage>::Create(pParent, *rAttrSet);
} }
void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
{ {
// please note that in PDF/A-1a mode even if this are copied back, // please note that in PDF/A-1a mode even if this are copied back,
// the security settings are forced disabled in PDFExport::Export // the security settings are forced disabled in PDFExport::Export
paParent->mbEncrypt = mbHaveUserPassword; pParent->mbEncrypt = mbHaveUserPassword;
paParent->mxPreparedPasswords = mxPreparedPasswords; pParent->mxPreparedPasswords = mxPreparedPasswords;
paParent->mbRestrictPermissions = mbHaveOwnerPassword; pParent->mbRestrictPermissions = mbHaveOwnerPassword;
paParent->maPreparedOwnerPassword = maPreparedOwnerPassword; pParent->maPreparedOwnerPassword = maPreparedOwnerPassword;
// verify print status // verify print status
paParent->mnPrint = 0; pParent->mnPrint = 0;
if (mxRbPrintLowRes->get_active()) if (mxRbPrintLowRes->get_active())
paParent->mnPrint = 1; pParent->mnPrint = 1;
else if (mxRbPrintHighRes->get_active()) else if (mxRbPrintHighRes->get_active())
paParent->mnPrint = 2; pParent->mnPrint = 2;
// verify changes permitted // verify changes permitted
paParent->mnChangesAllowed = 0; pParent->mnChangesAllowed = 0;
if( mxRbChangesInsDel->get_active() ) if( mxRbChangesInsDel->get_active() )
paParent->mnChangesAllowed = 1; pParent->mnChangesAllowed = 1;
else if( mxRbChangesFillForm->get_active() ) else if( mxRbChangesFillForm->get_active() )
paParent->mnChangesAllowed = 2; pParent->mnChangesAllowed = 2;
else if( mxRbChangesComment->get_active() ) else if( mxRbChangesComment->get_active() )
paParent->mnChangesAllowed = 3; pParent->mnChangesAllowed = 3;
else if( mxRbChangesAnyNoCopy->get_active() ) else if( mxRbChangesAnyNoCopy->get_active() )
paParent->mnChangesAllowed = 4; pParent->mnChangesAllowed = 4;
paParent->mbCanCopyOrExtract = mxCbEnableCopy->get_active(); pParent->mbCanCopyOrExtract = mxCbEnableCopy->get_active();
paParent->mbCanExtractForAccessibility = mxCbEnableAccessibility->get_active(); pParent->mbCanExtractForAccessibility = mxCbEnableAccessibility->get_active();
} }
void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent )
{ {
switch( paParent->mnPrint ) switch( pParent->mnPrint )
{ {
default: default:
case 0: case 0:
...@@ -1160,7 +1122,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen ...@@ -1160,7 +1122,7 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen
break; break;
} }
switch( paParent->mnChangesAllowed ) switch( pParent->mnChangesAllowed )
{ {
default: default:
case 0: case 0:
...@@ -1180,13 +1142,13 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen ...@@ -1180,13 +1142,13 @@ void ImpPDFTabSecurityPage::SetFilterConfigItem( const ImpPDFTabDialog* paParen
break; break;
} }
mxCbEnableCopy->set_active(paParent->mbCanCopyOrExtract); mxCbEnableCopy->set_active(pParent->mbCanCopyOrExtract);
mxCbEnableAccessibility->set_active(paParent->mbCanExtractForAccessibility); mxCbEnableAccessibility->set_active(pParent->mbCanExtractForAccessibility);
// set the status of this windows, according to the PDFA selection // set the status of this windows, according to the PDFA selection
enablePermissionControls(); enablePermissionControls();
ImpPDFTabGeneralPage* pGeneralPage = paParent->getGeneralPage(); ImpPDFTabGeneralPage* pGeneralPage = pParent->getGeneralPage();
if (pGeneralPage) if (pGeneralPage)
ImplPDFASecurityControl(!pGeneralPage->IsPdfaSelected()); ImplPDFASecurityControl(!pGeneralPage->IsPdfaSelected());
...@@ -1224,7 +1186,7 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, weld::Button&, void) ...@@ -1224,7 +1186,7 @@ IMPL_LINK_NOARG(ImpPDFTabSecurityPage, ClickmaPbSetPwdHdl, weld::Button&, void)
void ImpPDFTabSecurityPage::enablePermissionControls() void ImpPDFTabSecurityPage::enablePermissionControls()
{ {
bool bIsPDFASel = false; bool bIsPDFASel = false;
ImpPDFTabDialog* pParent = static_cast<ImpPDFTabDialog*>(GetTabDialog()); ImpPDFTabDialog* pParent = static_cast<ImpPDFTabDialog*>(GetDialogController());
ImpPDFTabGeneralPage* pGeneralPage = pParent ? pParent->getGeneralPage() : nullptr; ImpPDFTabGeneralPage* pGeneralPage = pParent ? pParent->getGeneralPage() : nullptr;
if (pGeneralPage) if (pGeneralPage)
{ {
...@@ -1319,12 +1281,12 @@ VclPtr<SfxTabPage> ImpPDFTabLinksPage::Create(TabPageParent pParent, const SfxIt ...@@ -1319,12 +1281,12 @@ VclPtr<SfxTabPage> ImpPDFTabLinksPage::Create(TabPageParent pParent, const SfxIt
return VclPtr<ImpPDFTabLinksPage>::Create(pParent, *rAttrSet); return VclPtr<ImpPDFTabLinksPage>::Create(pParent, *rAttrSet);
} }
void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
{ {
paParent->mbExportRelativeFsysLinks = m_xCbExportRelativeFsysLinks->get_active(); pParent->mbExportRelativeFsysLinks = m_xCbExportRelativeFsysLinks->get_active();
bool bIsPDFASel = false; bool bIsPDFASel = false;
ImpPDFTabGeneralPage* pGeneralPage = paParent->getGeneralPage(); ImpPDFTabGeneralPage* pGeneralPage = pParent->getGeneralPage();
if (pGeneralPage) if (pGeneralPage)
bIsPDFASel = pGeneralPage->IsPdfaSelected(); bIsPDFASel = pGeneralPage->IsPdfaSelected();
// if PDF/A-1 was not selected while exiting dialog... // if PDF/A-1 was not selected while exiting dialog...
...@@ -1337,26 +1299,26 @@ void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) ...@@ -1337,26 +1299,26 @@ void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* paParent )
} }
// the control states, or the saved is used // the control states, or the saved is used
// to form the stored selection // to form the stored selection
paParent->mnViewPDFMode = 0; pParent->mnViewPDFMode = 0;
if( mbOpnLnksBrowserUserState ) if( mbOpnLnksBrowserUserState )
paParent->mnViewPDFMode = 2; pParent->mnViewPDFMode = 2;
else if( mbOpnLnksLaunchUserState ) else if( mbOpnLnksLaunchUserState )
paParent->mnViewPDFMode = 1; pParent->mnViewPDFMode = 1;
paParent->mbConvertOOoTargets = m_xCbOOoToPDFTargets->get_active(); pParent->mbConvertOOoTargets = m_xCbOOoToPDFTargets->get_active();
paParent->mbExportBmkToPDFDestination = m_xCbExprtBmkrToNmDst->get_active(); pParent->mbExportBmkToPDFDestination = m_xCbExprtBmkrToNmDst->get_active();
} }
void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent )
{ {
m_xCbOOoToPDFTargets->set_active(paParent->mbConvertOOoTargets); m_xCbOOoToPDFTargets->set_active(pParent->mbConvertOOoTargets);
m_xCbExprtBmkrToNmDst->set_active(paParent->mbExportBmkToPDFDestination); m_xCbExprtBmkrToNmDst->set_active(pParent->mbExportBmkToPDFDestination);
m_xRbOpnLnksDefault->connect_toggled(LINK(this, ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl)); m_xRbOpnLnksDefault->connect_toggled(LINK(this, ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl));
m_xRbOpnLnksBrowser->connect_toggled(LINK(this, ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl)); m_xRbOpnLnksBrowser->connect_toggled(LINK(this, ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl));
m_xCbExportRelativeFsysLinks->set_active(paParent->mbExportRelativeFsysLinks); m_xCbExportRelativeFsysLinks->set_active(pParent->mbExportRelativeFsysLinks);
switch( paParent->mnViewPDFMode ) switch( pParent->mnViewPDFMode )
{ {
default: default:
case 0: case 0:
...@@ -1377,7 +1339,7 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) ...@@ -1377,7 +1339,7 @@ void ImpPDFTabLinksPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent )
// and set the link action accordingly // and set the link action accordingly
// PDF/A-1 doesn't allow launch action on links // PDF/A-1 doesn't allow launch action on links
ImpPDFTabGeneralPage* pGeneralPage = paParent->getGeneralPage(); ImpPDFTabGeneralPage* pGeneralPage = pParent->getGeneralPage();
if (pGeneralPage) if (pGeneralPage)
ImplPDFALinkControl(!pGeneralPage->mxCbPDFA1b->get_active()); ImplPDFALinkControl(!pGeneralPage->mxCbPDFA1b->get_active());
} }
...@@ -1487,7 +1449,7 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage(TabPageParent pParent, const SfxItemS ...@@ -1487,7 +1449,7 @@ ImpPDFTabSigningPage::ImpPDFTabSigningPage(TabPageParent pParent, const SfxItemS
, mxEdSignReason(m_xBuilder->weld_entry("reason")) , mxEdSignReason(m_xBuilder->weld_entry("reason"))
, mxLBSignTSA(m_xBuilder->weld_combo_box_text("tsa")) , mxLBSignTSA(m_xBuilder->weld_combo_box_text("tsa"))
{ {
mxPbSignCertSelect->set_sensitive(false); mxPbSignCertSelect->set_sensitive(true);
mxPbSignCertSelect->connect_clicked(LINK(this, ImpPDFTabSigningPage, ClickmaPbSignCertSelect)); mxPbSignCertSelect->connect_clicked(LINK(this, ImpPDFTabSigningPage, ClickmaPbSignCertSelect));
mxPbSignCertClear->connect_clicked(LINK(this, ImpPDFTabSigningPage, ClickmaPbSignCertClear)); mxPbSignCertClear->connect_clicked(LINK(this, ImpPDFTabSigningPage, ClickmaPbSignCertClear));
} }
...@@ -1557,20 +1519,20 @@ VclPtr<SfxTabPage> ImpPDFTabSigningPage::Create( TabPageParent pParent, ...@@ -1557,20 +1519,20 @@ VclPtr<SfxTabPage> ImpPDFTabSigningPage::Create( TabPageParent pParent,
return VclPtr<ImpPDFTabSigningPage>::Create(pParent, *rAttrSet); return VclPtr<ImpPDFTabSigningPage>::Create(pParent, *rAttrSet);
} }
void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
{ {
paParent->mbSignPDF = maSignCertificate.is(); pParent->mbSignPDF = maSignCertificate.is();
paParent->maSignCertificate = maSignCertificate; pParent->maSignCertificate = maSignCertificate;
paParent->msSignLocation = mxEdSignLocation->get_text(); pParent->msSignLocation = mxEdSignLocation->get_text();
paParent->msSignPassword = mxEdSignPassword->get_text(); pParent->msSignPassword = mxEdSignPassword->get_text();
paParent->msSignContact = mxEdSignContactInfo->get_text(); pParent->msSignContact = mxEdSignContactInfo->get_text();
paParent->msSignReason = mxEdSignReason->get_text(); pParent->msSignReason = mxEdSignReason->get_text();
// Entry 0 is 'None' // Entry 0 is 'None'
if (mxLBSignTSA->get_active() >= 1) if (mxLBSignTSA->get_active() >= 1)
paParent->msSignTSA = mxLBSignTSA->get_active_text(); pParent->msSignTSA = mxLBSignTSA->get_active_text();
} }
void ImpPDFTabSigningPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ) void ImpPDFTabSigningPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent )
{ {
mxEdSignLocation->set_sensitive(false); mxEdSignLocation->set_sensitive(false);
mxEdSignPassword->set_sensitive(false); mxEdSignPassword->set_sensitive(false);
...@@ -1579,13 +1541,13 @@ void ImpPDFTabSigningPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent ...@@ -1579,13 +1541,13 @@ void ImpPDFTabSigningPage::SetFilterConfigItem( const ImpPDFTabDialog* paParent
mxLBSignTSA->set_sensitive(false); mxLBSignTSA->set_sensitive(false);
mxPbSignCertClear->set_sensitive(false); mxPbSignCertClear->set_sensitive(false);
if (paParent->mbSignPDF) if (pParent->mbSignPDF)
{ {
mxEdSignPassword->set_text(paParent->msSignPassword); mxEdSignPassword->set_text(pParent->msSignPassword);
mxEdSignLocation->set_text(paParent->msSignLocation); mxEdSignLocation->set_text(pParent->msSignLocation);
mxEdSignContactInfo->set_text(paParent->msSignContact); mxEdSignContactInfo->set_text(pParent->msSignContact);
mxEdSignReason->set_text(paParent->msSignReason); mxEdSignReason->set_text(pParent->msSignReason);
maSignCertificate = paParent->maSignCertificate; maSignCertificate = pParent->maSignCertificate;
} }
} }
......
filter/source/pdf/impdialog.hxx
Dosyayı görüntüle @ 3d46ec6f
...@@ -61,21 +61,14 @@ class ImpPDFTabLinksPage; ...@@ -61,21 +61,14 @@ class ImpPDFTabLinksPage;
/// Class tabbed dialog /// Class tabbed dialog
class ImpPDFTabDialog final : public SfxTabDialog class ImpPDFTabDialog final : public SfxTabDialogController
{ {
FilterConfigItem maConfigItem; FilterConfigItem maConfigItem;
FilterConfigItem maConfigI18N; FilterConfigItem maConfigI18N;
Any maSelection; Any maSelection;
DECL_LINK(CancelHdl, Button*, void); DECL_LINK(CancelHdl, weld::Button&, void);
sal_uInt16 mnSigningPageId;
sal_uInt16 mnSecurityPageId;
sal_uInt16 mnLinksPage;
sal_uInt16 mnInterfacePageId;
sal_uInt16 mnViewPageId;
sal_uInt16 mnGeneralPageId;
// the following data are the configuration used throughout the dialog and pages // the following data are the configuration used throughout the dialog and pages
bool mbIsPresentation; bool mbIsPresentation;
...@@ -158,13 +151,10 @@ public: ...@@ -158,13 +151,10 @@ public:
friend class ImpPDFTabLinksPage; friend class ImpPDFTabLinksPage;
friend class ImpPDFTabSigningPage; friend class ImpPDFTabSigningPage;
ImpPDFTabDialog( vcl::Window* pParent, ImpPDFTabDialog(weld::Window* pParent, Sequence< PropertyValue >& rFilterData,
Sequence< PropertyValue >& rFilterData,
const css::uno::Reference< XComponent >& rDoc); const css::uno::Reference< XComponent >& rDoc);
virtual ~ImpPDFTabDialog() override; virtual ~ImpPDFTabDialog() override;
virtual void dispose() override;
Sequence< PropertyValue > GetFilterData(); Sequence< PropertyValue > GetFilterData();
ImpPDFTabSecurityPage* getSecurityPage() const; ImpPDFTabSecurityPage* getSecurityPage() const;
...@@ -172,7 +162,7 @@ public: ...@@ -172,7 +162,7 @@ public:
ImpPDFTabGeneralPage* getGeneralPage() const; ImpPDFTabGeneralPage* getGeneralPage() const;
private: private:
virtual void PageCreated( sal_uInt16 _nId, SfxTabPage& _rPage ) override; virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
virtual short Ok() override; virtual short Ok() override;
}; };
...@@ -187,9 +177,7 @@ class ImpPDFTabGeneralPage : public SfxTabPage ...@@ -187,9 +177,7 @@ class ImpPDFTabGeneralPage : public SfxTabPage
bool mbIsPresentation; bool mbIsPresentation;
bool mbIsSpreadsheet; bool mbIsSpreadsheet;
bool mbIsWriter; bool mbIsWriter;
ImpPDFTabDialog* mpParent;
VclPtr<ImpPDFTabDialog> mpaParent;
std::unique_ptr<weld::RadioButton> mxRbAll; std::unique_ptr<weld::RadioButton> mxRbAll;
std::unique_ptr<weld::RadioButton> mxRbRange; std::unique_ptr<weld::RadioButton> mxRbRange;
...@@ -242,7 +230,6 @@ public: ...@@ -242,7 +230,6 @@ public:
ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemSet& rSet); ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~ImpPDFTabGeneralPage() override; virtual ~ImpPDFTabGeneralPage() override;
virtual void dispose() override;
static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
......
filter/source/pdf/pdfdialog.cxx
Dosyayı görüntüle @ 3d46ec6f
...@@ -83,21 +83,20 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames() ...@@ -83,21 +83,20 @@ Sequence< OUString > SAL_CALL PDFDialog::getSupportedServiceNames()
return PDFDialog_getSupportedServiceNames(); return PDFDialog_getSupportedServiceNames();
} }
svt::OGenericUnoDialog::Dialog PDFDialog::createDialog( vcl::Window* pParent ) svt::OGenericUnoDialog::Dialog PDFDialog::createDialog(vcl::Window* pParent)
{ {
if( mxSrcDoc.is() ) if( mxSrcDoc.is() )
return svt::OGenericUnoDialog::Dialog(VclPtr<ImpPDFTabDialog>::Create(pParent, maFilterData, mxSrcDoc)); return svt::OGenericUnoDialog::Dialog(new ImpPDFTabDialog(pParent ? pParent->GetFrameWeld() : nullptr, maFilterData, mxSrcDoc));
return svt::OGenericUnoDialog::Dialog(VclPtr<::Dialog>()); return svt::OGenericUnoDialog::Dialog(static_cast<weld::DialogController*>(nullptr));
} }
void PDFDialog::executedDialog( sal_Int16 nExecutionResult ) void PDFDialog::executedDialog( sal_Int16 nExecutionResult )
{ {
if (nExecutionResult && m_aDialog) if (nExecutionResult && m_aDialog)
maFilterData = static_cast< ImpPDFTabDialog* >( m_aDialog.m_xVclDialog.get() )->GetFilterData(); maFilterData = static_cast<ImpPDFTabDialog*>(m_aDialog.m_xWeldDialog.get())->GetFilterData();
destroyDialog(); destroyDialog();
} }
Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo() Reference< XPropertySetInfo > SAL_CALL PDFDialog::getPropertySetInfo()
{ {
Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); Reference< XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) );
......
filter/uiconfig/ui/pdfgeneralpage.ui
Dosyayı görüntüle @ 3d46ec6f
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<object class="GtkGrid" id="PdfGeneralPage"> <object class="GtkGrid" id="PdfGeneralPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>
<child> <child>
......
filter/uiconfig/ui/pdflinkspage.ui
Dosyayı görüntüle @ 3d46ec6f
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<object class="GtkBox" id="PdfLinksPage"> <object class="GtkBox" id="PdfLinksPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">12</property> <property name="spacing">12</property>
......
filter/uiconfig/ui/pdfoptionsdialog.ui
Dosyayı görüntüle @ 3d46ec6f
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.20.0 --> <!-- Generated with glade 3.22.1 -->
<interface domain="flt"> <interface domain="flt">
<requires lib="gtk+" version="3.18"/> <requires lib="gtk+" version="3.18"/>
<object class="GtkDialog" id="PdfOptionsDialog"> <object class="GtkDialog" id="PdfOptionsDialog">
...@@ -7,7 +7,13 @@ ...@@ -7,7 +7,13 @@
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="title" translatable="yes" context="pdfoptionsdialog|PdfOptionsDialog">PDF Options</property> <property name="title" translatable="yes" context="pdfoptionsdialog|PdfOptionsDialog">PDF Options</property>
<property name="resizable">False</property> <property name="resizable">False</property>
<property name="modal">True</property>
<property name="default_width">0</property>
<property name="default_height">0</property>
<property name="type_hint">dialog</property> <property name="type_hint">dialog</property>
<child>
<placeholder/>
</child>
<child internal-child="vbox"> <child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1"> <object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
...@@ -17,6 +23,19 @@ ...@@ -17,6 +23,19 @@
<object class="GtkButtonBox" id="dialog-action_area1"> <object class="GtkButtonBox" id="dialog-action_area1">
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="layout_style">end</property> <property name="layout_style">end</property>
<child>
<object class="GtkButton" id="reset">
<property name="label">gtk-revert-to-saved</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="ok"> <object class="GtkButton" id="ok">
<property name="label" translatable="yes" context="pdfoptionsdialog|ok">E_xport</property> <property name="label" translatable="yes" context="pdfoptionsdialog|ok">E_xport</property>
...@@ -30,7 +49,7 @@ ...@@ -30,7 +49,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">1</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -44,7 +63,7 @@ ...@@ -44,7 +63,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">1</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child> <child>
...@@ -58,7 +77,7 @@ ...@@ -58,7 +77,7 @@
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">2</property> <property name="position">3</property>
<property name="secondary">True</property> <property name="secondary">True</property>
</packing> </packing>
</child> </child>
...@@ -83,6 +102,30 @@ ...@@ -83,6 +102,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
</child> </child>
<child type="tab"> <child type="tab">
...@@ -102,6 +145,30 @@ ...@@ -102,6 +145,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="position">1</property> <property name="position">1</property>
...@@ -125,6 +192,30 @@ ...@@ -125,6 +192,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="position">2</property> <property name="position">2</property>
...@@ -148,6 +239,30 @@ ...@@ -148,6 +239,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="position">3</property> <property name="position">3</property>
...@@ -171,6 +286,30 @@ ...@@ -171,6 +286,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="position">4</property> <property name="position">4</property>
...@@ -194,6 +333,30 @@ ...@@ -194,6 +333,30 @@
<child> <child>
<placeholder/> <placeholder/>
</child> </child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
<child>
<placeholder/>
</child>
</object> </object>
<packing> <packing>
<property name="position">5</property> <property name="position">5</property>
......
filter/uiconfig/ui/pdfsecuritypage.ui
Dosyayı görüntüle @ 3d46ec6f
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<object class="GtkBox" id="PdfSecurityPage"> <object class="GtkBox" id="PdfSecurityPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
...@@ -29,7 +31,6 @@ ...@@ -29,7 +31,6 @@
<object class="GtkButton" id="setpassword"> <object class="GtkButton" id="setpassword">
<property name="label" translatable="yes" context="pdfsecuritypage|setpassword">Set _Passwords…</property> <property name="label" translatable="yes" context="pdfsecuritypage|setpassword">Set _Passwords…</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="receives_default">True</property> <property name="receives_default">True</property>
<property name="halign">start</property> <property name="halign">start</property>
...@@ -295,6 +296,7 @@ ...@@ -295,6 +296,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">printhigh</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -310,7 +312,7 @@ ...@@ -310,7 +312,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">printnone</property> <property name="group">printhigh</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -327,7 +329,6 @@ ...@@ -327,7 +329,6 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">printnone</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -381,6 +382,7 @@ ...@@ -381,6 +382,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">changeany</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -396,7 +398,7 @@ ...@@ -396,7 +398,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">changenone</property> <property name="group">changeany</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -412,7 +414,7 @@ ...@@ -412,7 +414,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">changenone</property> <property name="group">changeany</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -428,7 +430,7 @@ ...@@ -428,7 +430,7 @@
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">changenone</property> <property name="group">changeany</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
...@@ -445,7 +447,6 @@ ...@@ -445,7 +447,6 @@
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="active">True</property> <property name="active">True</property>
<property name="draw_indicator">True</property> <property name="draw_indicator">True</property>
<property name="group">changenone</property>
</object> </object>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
......
filter/uiconfig/ui/pdfsignpage.ui
Dosyayı görüntüle @ 3d46ec6f
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
<object class="GtkFrame" id="PdfSignPage"> <object class="GtkFrame" id="PdfSignPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="label_xalign">0</property> <property name="label_xalign">0</property>
<property name="shadow_type">none</property> <property name="shadow_type">none</property>
...@@ -154,6 +156,7 @@ ...@@ -154,6 +156,7 @@
<object class="GtkComboBoxText" id="tsa"> <object class="GtkComboBoxText" id="tsa">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="active">0</property>
<items> <items>
<item translatable="yes" context="pdfsignpage|tsa">None</item> <item translatable="yes" context="pdfsignpage|tsa">None</item>
</items> </items>
......
filter/uiconfig/ui/pdfuserinterfacepage.ui
Dosyayı görüntüle @ 3d46ec6f
...@@ -12,6 +12,8 @@ ...@@ -12,6 +12,8 @@
<object class="GtkBox" id="PdfUserInterfacePage"> <object class="GtkBox" id="PdfUserInterfacePage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">6</property> <property name="spacing">6</property>
......
filter/uiconfig/ui/pdfviewpage.ui
Dosyayı görüntüle @ 3d46ec6f
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
<object class="GtkBox" id="PdfViewPage"> <object class="GtkBox" id="PdfViewPage">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border_width">6</property> <property name="border_width">6</property>
<property name="spacing">12</property> <property name="spacing">12</property>
<child> <child>
......
include/sfx2/tabdlg.hxx
Dosyayı görüntüle @ 3d46ec6f
...@@ -272,6 +272,7 @@ protected: ...@@ -272,6 +272,7 @@ protected:
*/ */
void SavePosAndId(); void SavePosAndId();
void Start_Impl();
public: public:
SfxTabDialogController(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, SfxTabDialogController(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID,
const SfxItemSet * = nullptr); const SfxItemSet * = nullptr);
...@@ -305,8 +306,6 @@ public: ...@@ -305,8 +306,6 @@ public:
const std::function<void(sal_Int32)>&); const std::function<void(sal_Int32)>&);
const SfxItemSet* GetExampleSet() const { return m_xExampleSet.get(); } const SfxItemSet* GetExampleSet() const { return m_xExampleSet.get(); }
SAL_DLLPRIVATE void Start_Impl();
}; };
namespace sfx { class ItemConnectionBase; } namespace sfx { class ItemConnectionBase; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment