filter/source/pdf/impdialog.cxx | 6 +++++- sfx2/source/doc/guisaveas.cxx | 17 +++++++++++++++-- 2 files changed, 20 insertions(+), 3 deletions(-)
New commits: commit 8c2b60e05c0baa0c833290362ae4593a48b6341b Author: Szymon Kłos <[email protected]> AuthorDate: Wed Dec 14 09:18:11 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Wed Dec 14 12:45:08 2022 +0000 lok: hide signatures in PDF export dialog Change-Id: Idd67e7ffe4dffc89555d75773501908165cbdd7b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144149 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index e00c6e33209a..c1150acfd7e5 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -29,6 +29,7 @@ #include <sfx2/objsh.hxx> #include <svx/AccessibilityCheckDialog.hxx> +#include <comphelper/lok.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> #include <comphelper/storagehelper.hxx> @@ -254,7 +255,10 @@ ImpPDFTabDialog::ImpPDFTabDialog(weld::Window* pParent, const Sequence< Property // queue the tab pages for later creation (created when first shown) AddTabPage("general", ImpPDFTabGeneralPage::Create, nullptr ); - AddTabPage("digitalsignatures", ImpPDFTabSigningPage::Create, nullptr); + if (comphelper::LibreOfficeKit::isActive()) + m_xTabCtrl->remove_page("digitalsignatures"); + else + AddTabPage("digitalsignatures", ImpPDFTabSigningPage::Create, nullptr); AddTabPage("security", ImpPDFTabSecurityPage::Create, nullptr); AddTabPage("links", ImpPDFTabLinksPage::Create, nullptr); AddTabPage("userinterface", ImpPDFTabViewerPage::Create, nullptr); commit 8b133e833b06cdf5bd4b55110ed1dcdb82522bb6 Author: Szymon Kłos <[email protected]> AuthorDate: Mon Dec 12 15:27:26 2022 +0100 Commit: Andras Timar <[email protected]> CommitDate: Wed Dec 14 12:44:57 2022 +0000 lok: export PDF/EPUB with extension Change-Id: Ib266814d88a4f121959cb21f40293d671f242448 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143989 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Andras Timar <[email protected]> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index 491354a29f3b..7a831f07a857 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -1091,8 +1091,21 @@ bool ModelData_Impl::OutputFileDialog( sal_Int16 nStoreMode, // get the path from the dialog INetURLObject aURL( pFileDlg->GetPath() ); - // the path should be provided outside since it might be used for further calls to the dialog - aSuggestedName = aURL.GetLastName(INetURLObject::DecodeMechanism::WithCharset); + + if (comphelper::LibreOfficeKit::isActive()) + { + // keep name with extension + aSuggestedName = aRecommendedName; + OUString aExtension; + if (size_t nPos = aSuggestedName.lastIndexOf('.') + 1) + aExtension = aSuggestedName.copy(nPos, aSuggestedName.getLength() - nPos); + aURL.SetExtension(aExtension); + } + else + { + // the path should be provided outside since it might be used for further calls to the dialog + aSuggestedName = aURL.GetLastName(INetURLObject::DecodeMechanism::WithCharset); + } aSuggestedDir = pFileDlg->GetDisplayDirectory(); // old filter options should be cleared in case different filter is used
