From f57bb8bbadf086873155401445b03bdb971ecc6f Mon Sep 17 00:00:00 2001 From: Arnaud VERSINI Date: Sun, 2 Jul 2023 22:07:15 +0200 Subject: xmlsecurity : remove deadcode and usage of array template Change-Id: I282e2af395471aa4818bfb4586ac06c7850c8a61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153862 Reviewed-by: Mike Kaganski Reviewed-by: Arnaud Versini Tested-by: Arnaud Versini --- xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'xmlsecurity/source') diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 2a3cd3049a13..921dedbca49d 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -19,7 +19,6 @@ #include -#include #include #include @@ -117,7 +116,7 @@ namespace m_nODF = nTmp; } #ifdef _WIN32 - constexpr std::array aGUIServers = { u"Gpg4win\\kleopatra.exe", + constexpr std::u16string_view aGUIServers[] = { u"Gpg4win\\kleopatra.exe", u"Gpg4win\\bin\\kleopatra.exe", u"GNU\\GnuPG\\kleopatra.exe", u"GNU\\GnuPG\\launch-gpa.exe", @@ -127,7 +126,7 @@ namespace u"GNU\\GnuPG\\bin\\launch-gpa.exe", u"GNU\\GnuPG\\bin\\gpa.exe"}; #else - constexpr std::array aGUIServers = { u"kleopatra", u"seahorse", u"gpa", u"kgpg" }; + constexpr std::u16string_view aGUIServers[] = { u"kleopatra", u"seahorse", u"gpa", u"kgpg" }; #endif } @@ -551,9 +550,6 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, weld::Button&, void) OUString aPath(cPath, strlen(cPath), osl_getThreadTextEncoding()); #endif - if (aGUIServers.empty()) - return; - OUString sFoundGUIServer, sExecutable; for ( auto const &rServer : aGUIServers) -- cgit