[Libreoffice-commits] core.git: xmlsecurity/source

[Arnaud VERSINI (via logerrit)]

 xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit f57bb8bbadf086873155401445b03bdb971ecc6f
Author:     Arnaud VERSINI <arnaud.vers...@libreoffice.org>
AuthorDate: Sun Jul 2 22:07:15 2023 +0200
Commit:     Arnaud Versini <arnaud.vers...@libreoffice.org>
CommitDate: Fri Jul 7 07:59:51 2023 +0200

    xmlsecurity : remove deadcode and usage of array template
    
    Change-Id: I282e2af395471aa4818bfb4586ac06c7850c8a61
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153862
    Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
    Reviewed-by: Arnaud Versini <arnaud.vers...@libreoffice.org>
    Tested-by: Arnaud Versini <arnaud.vers...@libreoffice.org>

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 <sal/config.h>
 
-#include <array>
 #include <string_view>
 
 #include <digitalsignaturesdialog.hxx>
@@ -117,7 +116,7 @@ namespace
         m_nODF = nTmp;
     }
 #ifdef _WIN32
-    constexpr std::array<std::u16string_view, 9> 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<std::u16string_view, 4> 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)