summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2015-12-29 10:22:13 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2016-01-04 16:48:29 +0000
commitd373cb7e15ceca249c33be39583a0515b413e417 (patch)
treea08af41bb4ff0021af1cf628eab06f0552c717d0
parent7ea839ae3904d96dcea35a0339f3e6ee7d58bbaa (diff)
Related tdf#96833: fix behaviour of 'Remote Files' edit dialog.
Fixed: - TCP port got lost/reset when editing a server; - in Gtk widget disabled comma; - secure protocol checkbox always unchecked when editing a server. Change-Id: I358fc7375552b29e4840a3616e4e47b95b88ed2c Reviewed-on: https://gerrit.libreoffice.org/21039 Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de> Tested-by: Jan-Marek Glogowski <glogow@fbihome.de>
-rw-r--r--svtools/source/dialogs/ServerDetailsControls.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 3529de24fbd7..99eb2f54e81c 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -42,6 +42,7 @@ DetailsContainer::DetailsContainer( VclBuilderContainer* pBuilder ) :
pBuilder->get( m_pFTPort, "portLabel" );
pBuilder->get( m_pEDRoot, "path" );
pBuilder->get( m_pFTRoot, "pathLabel" );
+ m_pEDPort->SetUseThousandSep( false );
}
DetailsContainer::~DetailsContainer( )
@@ -104,9 +105,12 @@ void HostDetailsContainer::show( bool bShow )
if ( bShow )
{
- m_pEDPort->SetValue( m_nDefaultPort );
+ if ( m_pEDPort->GetValue( ) == 0 )
+ m_pEDPort->SetValue( m_nDefaultPort );
m_pEDHost->SetText( m_sHost );
}
+ else
+ m_pEDPort->SetValue( 0 );
}
INetURLObject HostDetailsContainer::getUrl( )
@@ -163,10 +167,10 @@ void DavDetailsContainer::show( bool bShow )
{
HostDetailsContainer::show( bShow );
- m_pCBDavs->Show( bShow );
-
- if ( bShow )
+ if ( !bShow )
m_pCBDavs->Check( false );
+
+ m_pCBDavs->Show( bShow );
}
bool DavDetailsContainer::verifyScheme( const OUString& rScheme )