[Libreoffice-commits] core.git: include/svtools svtools/source

[Libreoffice Gerrit user]

 include/svtools/ServerDetailsControls.hxx        |    3 +++
 svtools/source/dialogs/ServerDetailsControls.cxx |    6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 871089ecca78d818dee5c588f1a9a5e975816f7c
Author:     Xisco Fauli <xiscofauli at libreoffice.org>
AuthorDate: Wed Sep 19 00:58:59 2018 +0200
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sun Oct 28 02:10:55 2018 +0200

    tdf#119209: Windows share has inappropriate server suggestion
    
    Follow the same logic as HostDetailsContainer
    
    Change-Id: I3de8b2fc07b9caef6b4d20ab89242137d738c522
    Reviewed-on: https://gerrit.libreoffice.org/60732
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx
index 642f9d82e9b4..7e1a302c421b 100644
--- a/include/svtools/ServerDetailsControls.hxx
+++ b/include/svtools/ServerDetailsControls.hxx
@@ -93,6 +93,9 @@ class DavDetailsContainer : public HostDetailsContainer
 
 class SmbDetailsContainer : public DetailsContainer
 {
+    private:
+        OUString m_sHost;
+
     public:
         SmbDetailsContainer(PlaceEditDialog* pDialog);
 
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index fce35b75717b..2cc3d2ab4fe1 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -247,7 +247,8 @@ bool SmbDetailsContainer::setUrl( const INetURLObject& rUrl )
             sPath = sFullPath.copy( nPos );
         }
 
-        m_pDialog->m_xEDHost->set_text( rUrl.GetHost( ) );
+        m_sHost = rUrl.GetHost( );
+        m_pDialog->m_xEDHost->set_text( m_sHost );
         m_pDialog->m_xEDShare->set_text( sShare );
         m_pDialog->m_xEDRoot->set_text( sPath );
     }
@@ -266,6 +267,9 @@ void SmbDetailsContainer::show( bool bShow )
     m_pDialog->m_xHostBox->show( bShow );
     m_pDialog->m_xEDPort->set_sensitive( !bShow );
     m_pDialog->m_xFTPort->set_sensitive( !bShow );
+
+    if ( bShow )
+        m_pDialog->m_xEDHost->set_text( m_sHost );
 }
 
 CmisDetailsContainer::CmisDetailsContainer(PlaceEditDialog* pParentDialog, OUString const & sBinding) :