Kaydet (Commit) f9ccf621 authored tarafından Caolán McNamara's avatar Caolán McNamara

rework to check cPath against nullptr only on !WNT

Change-Id: Iaca0d47b07f4b31b70ddeccb87f0f84019be81cd
Reviewed-on: https://gerrit.libreoffice.org/62055
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 83c82bbb
...@@ -501,10 +501,10 @@ IMPL_STATIC_LINK(DigitalSignaturesDialog, CertMgrButtonHdl, Button*, pButton, vo ...@@ -501,10 +501,10 @@ IMPL_STATIC_LINK(DigitalSignaturesDialog, CertMgrButtonHdl, Button*, pButton, vo
#else #else
const OUString aGUIServers[] = { OUString("kleopatra"), OUString("seahorse"), OUString("gpa"), OUString("kgpg") }; const OUString aGUIServers[] = { OUString("kleopatra"), OUString("seahorse"), OUString("gpa"), OUString("kgpg") };
const char* cPath = getenv("PATH"); const char* cPath = getenv("PATH");
if (!cPath)
return;
#endif #endif
if (cPath)
{
OUString aPath(cPath, strlen(cPath), osl_getThreadTextEncoding()); OUString aPath(cPath, strlen(cPath), osl_getThreadTextEncoding());
OUString sFoundGUIServer, sExecutable; OUString sFoundGUIServer, sExecutable;
...@@ -536,7 +536,6 @@ IMPL_STATIC_LINK(DigitalSignaturesDialog, CertMgrButtonHdl, Button*, pButton, vo ...@@ -536,7 +536,6 @@ IMPL_STATIC_LINK(DigitalSignaturesDialog, CertMgrButtonHdl, Button*, pButton, vo
XsResId(STR_XMLSECDLG_NO_CERT_MANAGER))); XsResId(STR_XMLSECDLG_NO_CERT_MANAGER)));
xInfoBox->run(); xInfoBox->run();
} }
}
} }
IMPL_LINK_NOARG(DigitalSignaturesDialog, StartVerifySignatureHdl, LinkParamNone*, bool) IMPL_LINK_NOARG(DigitalSignaturesDialog, StartVerifySignatureHdl, LinkParamNone*, bool)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment