uui/source/passworddlg.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 9bcc09dcb9a17404fd4852c61b47247886dfda0c Author: Stephan Bergmann <sberg...@redhat.com> Date: Tue Oct 20 14:46:56 2015 +0200 Gracefully handle URLs INetURLObject refuses to parse Change-Id: Id4d09dd32a1faa76b1be70c0478e0e76aa16b05e diff --git a/uui/source/passworddlg.cxx b/uui/source/passworddlg.cxx index 4831bd3..bcba73e 100644 --- a/uui/source/passworddlg.cxx +++ b/uui/source/passworddlg.cxx @@ -73,7 +73,9 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent, sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN; OUString aMessage(ResId(nStrId, *pResourceMgr).toString()); - aMessage += INetURLObject(aDocURL).GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); + INetURLObject url(aDocURL); + aMessage += url.HasError() + ? aDocURL : url.GetMainURL(INetURLObject::DECODE_UNAMBIGUOUS); m_pFTPassword->SetText(aMessage); if (bIsSimplePasswordRequest) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits