summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2015-12-31 12:04:13 +0100
committerjan iversen <jani@documentfoundation.org>2016-01-08 12:52:17 +0000
commit3113ecb2fcb6d868a213c5dc978159e18f4e2efa (patch)
tree565c7d9c4e36b410a3b0dede410ae43a80e83451
parentd74161f238efc6ee189b705f21143cddb318a4bb (diff)
Related tdf#96833: hide user and password for WebDAV servers...
...because they are asked for and stored in a successive user interaction. Change-Id: I09a3a1e59fe3819a28d7565e83b0db968dfee74b Reviewed-on: https://gerrit.libreoffice.org/21040 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: jan iversen <jani@documentfoundation.org> Tested-by: jan iversen <jani@documentfoundation.org>
-rw-r--r--include/svtools/PlaceEditDialog.hxx1
-rw-r--r--include/svtools/ServerDetailsControls.hxx3
-rw-r--r--svtools/source/dialogs/PlaceEditDialog.cxx11
3 files changed, 12 insertions, 3 deletions
diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx
index f6825808b6de..2c274c4b861f 100644
--- a/include/svtools/PlaceEditDialog.hxx
+++ b/include/svtools/PlaceEditDialog.hxx
@@ -34,6 +34,7 @@ private:
std::shared_ptr< DetailsContainer > m_xCurrentDetails;
VclPtr<Edit> m_pEDUsername;
+ VclPtr<FixedText> m_pFTUsernameLabel;
VclPtr<CheckBox> m_pCBPassword;
VclPtr<Edit> m_pEDPassword;
VclPtr<FixedText> m_pFTPasswordLabel;
diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 8a2289e4f59c..e9f4d4c488e3 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -57,6 +57,8 @@ class DetailsContainer
virtual void setUsername( const OUString& /*rUsername*/ ) { };
virtual void setPassword( const OUString& ) { };
+ virtual bool enableUserCredentials( ) { return true; };
+
void setActive( bool bActive = true );
protected:
@@ -98,6 +100,7 @@ class DavDetailsContainer : public HostDetailsContainer
virtual ~DavDetailsContainer( ) { };
virtual void show( bool bShow = true ) override;
+ virtual bool enableUserCredentials( ) override { return false; };
protected:
virtual bool verifyScheme( const OUString& rScheme ) override;
diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx
index 19634b7990b3..b062b934e375 100644
--- a/svtools/source/dialogs/PlaceEditDialog.cxx
+++ b/svtools/source/dialogs/PlaceEditDialog.cxx
@@ -28,6 +28,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent)
get( m_pEDServerName, "name" );
get( m_pLBServerType, "type" );
get( m_pEDUsername, "login" );
+ get( m_pFTUsernameLabel, "loginLabel" );
get( m_pBTOk, "ok" );
get( m_pBTCancel, "cancel" );
get( m_pBTDelete, "delete" );
@@ -61,6 +62,7 @@ PlaceEditDialog::PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Pla
get( m_pEDServerName, "name" );
get( m_pLBServerType, "type" );
get( m_pEDUsername, "login" );
+ get( m_pFTUsernameLabel, "loginLabel" );
get( m_pBTOk, "ok" );
get( m_pBTCancel, "cancel" );
get( m_pBTDelete, "delete" );
@@ -120,6 +122,7 @@ void PlaceEditDialog::dispose()
m_pEDServerName.clear();
m_pLBServerType.clear();
m_pEDUsername.clear();
+ m_pFTUsernameLabel.clear();
m_pBTOk.clear();
m_pBTCancel.clear();
m_pBTDelete.clear();
@@ -333,9 +336,11 @@ IMPL_LINK_NOARG_TYPED( PlaceEditDialog, SelectTypeHdl, ListBox&, void )
m_xCurrentDetails->show();
- m_pCBPassword->Show( m_bShowPassword );
- m_pEDPassword->Show( m_bShowPassword );
- m_pFTPasswordLabel->Show( m_bShowPassword );
+ m_pCBPassword->Show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
+ m_pEDPassword->Show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
+ m_pFTPasswordLabel->Show( m_bShowPassword && m_xCurrentDetails->enableUserCredentials() );
+ m_pEDUsername->Show( m_xCurrentDetails->enableUserCredentials() );
+ m_pFTUsernameLabel->Show( m_xCurrentDetails->enableUserCredentials() );
SetSizePixel(GetOptimalSize());