mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Gracefully handle URLs INetURLObject refuses to parse

Browse Source 
Change-Id: Id4d09dd32a1faa76b1be70c0478e0e76aa16b05e
This commit is contained in:
Stephan Bergmann
2015-10-20 14:46:56 +02:00
parent ac4cfb4cf7
commit 9bcc09dcb9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
uui/source/passworddlg.cxx
View File

@@ -73,7 +73,9 @@ PasswordDialog::PasswordDialog(vcl::Window* _pParent,
sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN; sal_uInt16 nStrId = bOpenToModify ? STR_ENTER_PASSWORD_TO_MODIFY : STR_ENTER_PASSWORD_TO_OPEN;
OUString aMessage(ResId(nStrId, *pResourceMgr).toString()); 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); m_pFTPassword->SetText(aMessage);
if (bIsSimplePasswordRequest) if (bIsSimplePasswordRequest)