[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - filter/source
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Thu Dec 12 11:16:13 UTC 2019
filter/source/pdf/impdialog.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 0d1d0e1a68ce2a48efb7b318e8e01c92361d6b78
Author: Jan-Marek Glogowski <jan-marek.glogowski at extern.cib.de>
AuthorDate: Wed Dec 11 19:14:31 2019 +0100
Commit: Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Dec 12 12:15:21 2019 +0100
tdf#127493 store ExportFormFields checkbox value
... and also correctly set the initial frames sensitivity.
The commit removed the no longer needed UserSelection variant of
mbExportFormFields but forgit to actually set it now.
Regression from my commit 76fcd878da1624e73f1eb9d9405485d4faf66edf.
Change-Id: Ia5fcc1c37e2e4b4a330b59a492f817d2db8d7347
Reviewed-on: https://gerrit.libreoffice.org/84975
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
(cherry picked from commit b06cba8f13e0b71346cb884cf827751f2086fd8e)
Reviewed-on: https://gerrit.libreoffice.org/85036
Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 1b0e8c327964..60495f90ec65 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -574,6 +574,7 @@ void ImpPDFTabGeneralPage::SetFilterConfigItem(ImpPDFTabDialog* pParent)
mxLbFormsFormat->set_active(static_cast<sal_uInt16>(pParent->mnFormsType));
mxCbAllowDuplicateFieldNames->set_active( pParent->mbAllowDuplicateFieldNames );
+ mxFormsFrame->set_sensitive(pParent->mbExportFormFields);
mxCbExportBookmarks->set_active( pParent->mbExportBookmarks );
@@ -688,6 +689,7 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
else
mbUseTaggedPDFUserSelection = pParent->mbUseTaggedPDF;
pParent->mbUseTaggedPDFUserSelection = mbUseTaggedPDFUserSelection;
+ pParent->mbExportFormFields = mxCbExportFormFields->get_active();
if( mxCbWatermark->get_active() )
pParent->maWatermarkText = mxEdWatermark->get_text();
More information about the Libreoffice-commits
mailing list