diff options
| author | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-02-12 16:09:20 +0100 |
|---|---|---|
| committer | Cédric Bosdonnat <cedric.bosdonnat@free.fr> | 2013-02-12 16:12:47 +0100 |
| commit | 12ea70362f9b1234b4b1613872c8f07735dd386b (patch) | |
| tree | 1ca253a91378e473e36f5e8bf4fa15812ce6099e /ucb | |
| parent | 0c1a37e60393504b38990d1f0a95239bf6749766 (diff) | |
CMIS: proxy was setin to ":-1" is no proxy is defined in the UI
Don't output the port number if that one is not valid.
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_content.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/cmis/cmis_repo_content.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index a8b1c8643c59..5f94d7a8d51e 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -262,7 +262,9 @@ namespace cmis INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) ); const ucbhelper::InternetProxyServer& rProxy = aProxyDecider.getProxy( INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() ); - rtl::OUString sProxy = rProxy.aName + ":" + rtl::OUString::valueOf( rProxy.nPort ); + rtl::OUString sProxy = rProxy.aName; + if ( rProxy.nPort > 0 ) + sProxy += ":" + rtl::OUString::valueOf( rProxy.nPort ); libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() ); // Look for a cached session, key is binding url + repo id diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index afd503c2e011..b76514c0b79a 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -144,7 +144,9 @@ namespace cmis INetURLObject aBindingUrl( m_aURL.getBindingUrl( ) ); const ucbhelper::InternetProxyServer& rProxy = aProxyDecider.getProxy( INetURLObject::GetScheme( aBindingUrl.GetProtocol( ) ), aBindingUrl.GetHost(), aBindingUrl.GetPort() ); - rtl::OUString sProxy = rProxy.aName + ":" + rtl::OUString::valueOf( rProxy.nPort ); + rtl::OUString sProxy = rProxy.aName; + if ( rProxy.nPort > 0 ) + sProxy += ":" + rtl::OUString::valueOf( rProxy.nPort ); libcmis::SessionFactory::setProxySettings( OUSTR_TO_STDSTR( sProxy ), string(), string(), string() ); if ( m_aRepositories.empty() ) |