[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - svtools/source
Giuseppe Castagno
giuseppe.castagno at acca-esse.eu
Wed Jan 6 02:02:31 PST 2016
svtools/source/dialogs/ServerDetailsControls.cxx | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 2c6e8e4142493dd135003aff16a1709d6e3a29d0
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date: Tue Dec 29 10:22:13 2015 +0100
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 at fbihome.de>
Tested-by: Jan-Marek Glogowski <glogow at fbihome.de>
(cherry picked from commit d373cb7e15ceca249c33be39583a0515b413e417)
Reviewed-on: https://gerrit.libreoffice.org/21143
Reviewed-by: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 3529de2..99eb2f5 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 )
More information about the Libreoffice-commits
mailing list