diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2019-08-14 13:18:05 +0200 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2019-08-14 18:31:39 +0200 |
| commit | 7001ddff6303734f0276b863c9fd8908443f05da (patch) | |
| tree | 1de53991a4b987adffd6bbffe8f3b04ad8f6d56b /xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | |
| parent | a1140054b4031fe64e073bb4a5c443018c8532c2 (diff) | |
Simplify OUString array initialization
Change-Id: I54945ed1ea2292ecc02ff988c4ecf310a9c4b87a
Reviewed-on: https://gerrit.libreoffice.org/77451
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx')
| -rw-r--r-- | xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 67545e3bb561..6f0407433f2f 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -454,15 +454,16 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, weld::Button&, void) // FIXME: call GpgME::dirInfo("bindir") somewhere in // SecurityEnvironmentGpg or whatnot // FIXME: perhaps poke GpgME for uiserver, and hope it returns something useful? - const OUString aGUIServers[] = { OUString("Gpg4win\\kleopatra.exe"), - OUString("Gpg4win\\bin\\kleopatra.exe"), - OUString("GNU\\GnuPG\\kleopatra.exe"), - OUString("GNU\\GnuPG\\launch-gpa.exe"), - OUString("GNU\\GnuPG\\gpa.exe"), - OUString("GnuPG\\bin\\gpa.exe"), - OUString("GNU\\GnuPG\\bin\\kleopatra.exe"), - OUString("GNU\\GnuPG\\bin\\launch-gpa.exe"), - OUString("GNU\\GnuPG\\bin\\gpa.exe") }; + static const OUStringLiteral aGUIServers[] = { "Gpg4win\\kleopatra.exe", + "Gpg4win\\bin\\kleopatra.exe", + "GNU\\GnuPG\\kleopatra.exe", + "GNU\\GnuPG\\launch-gpa.exe", + "GNU\\GnuPG\\gpa.exe", + "GnuPG\\bin\\gpa.exe", + "GNU\\GnuPG\\bin\\kleopatra.exe", + "GNU\\GnuPG\\bin\\launch-gpa.exe", + "GNU\\GnuPG\\bin\\gpa.exe", + }; static const OUString aPath = [] { OUString sRet; PWSTR sPath = nullptr; @@ -478,7 +479,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, CertMgrButtonHdl, weld::Button&, void) if (aPath.isEmpty()) return; #else - const OUString aGUIServers[] = { OUString("kleopatra"), OUString("seahorse"), OUString("gpa"), OUString("kgpg") }; + static const OUStringLiteral aGUIServers[] = { "kleopatra", "seahorse", "gpa", "kgpg" }; const char* cPath = getenv("PATH"); if (!cPath) return; |