fpicker/source/office/RemoteFilesDialog.cxx | 11 +++++++++-- svtools/source/dialogs/ServerDetailsControls.cxx | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit 45817662f3f7a77433d6ee57f2c8926e3db3e675 Author: Szymon KÅos <[email protected]> Date: Sun Oct 4 13:20:42 2015 +0200 Remember password after setting new service Change-Id: I14ba319307f74b24fa474e742504b70c46539a08 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 7ee410e..0761888 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -697,8 +697,10 @@ void RemoteFilesDialog::SavePassword( const OUString& rURL, const OUString& rUse try { - if( m_xMasterPasswd->isPersistentStoringAllowed() && - ( !bPersistent || m_xMasterPasswd->authorizateWithMasterPassword( Reference< XInteractionHandler>() ) ) ) + if( !bPersistent || + ( m_xMasterPasswd->isPersistentStoringAllowed() + && m_xMasterPasswd->authorizateWithMasterPassword( Reference< XInteractionHandler>() ) ) + ) { Reference< XInteractionHandler > xInteractionHandler( InteractionHandler::createWithParent( m_xContext, 0 ), commit 3ff764c9f441c13330881520147b63bee23627b6 Author: Szymon KÅos <[email protected]> Date: Sat Oct 3 21:43:52 2015 +0200 Focus for file list after opening folder Change-Id: Ibac322b873315fd8a0ec63c930f4c76562a5e704 diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index d7b32f4..7ee410e 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -576,6 +576,8 @@ FileViewResult RemoteFilesDialog::OpenURL( OUString const & sURL ) if( m_eMode != REMOTEDLG_MODE_SAVE ) m_pName_ed->SetText( "" ); + + m_pFileView->GrabFocus(); } else { commit 227aa18e234ec2ea31c8cfd639cb1a1e9b464435 Author: Szymon KÅos <[email protected]> Date: Sat Oct 3 21:36:42 2015 +0200 Focus for file name field after using it to open folder Change-Id: Ic3ae0c899c5feea659d22100f98dbeca4df217eb diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 83cd52c..d7b32f4 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -1142,6 +1142,9 @@ IMPL_LINK_NOARG_TYPED ( RemoteFilesDialog, OkHdl, Button*, void ) OpenURL( sPathNoExt ); m_pName_ed->SetText( "" ); + if( !bSelected ) + m_pName_ed->GrabFocus(); + return; } commit 8e8247975ea37b3c335b1346c258b4d6260e1c39 Author: Szymon KÅos <[email protected]> Date: Sat Oct 3 21:15:13 2015 +0200 Temporary remember password even if persistent password storing is disabled Change-Id: I2ca98889b2c31c40a84348a55d85750f7c031a92 diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 22edbf2..26fe15f 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -434,7 +434,7 @@ IMPL_LINK_NOARG_TYPED( CmisDetailsContainer, RefreshReposHdl, Button*, void ) // temporary remember the password try { - if( xMasterPasswd->isPersistentStoringAllowed() && !sUrl.isEmpty() && !m_sUsername.isEmpty() && !m_sPassword.isEmpty() ) + if( !sUrl.isEmpty() && !m_sUsername.isEmpty() && !m_sPassword.isEmpty() ) { Reference< XInteractionHandler > xInteractionHandler( InteractionHandler::createWithParent( xContext, 0 ),
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
