summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorGiuseppe Castagno <giuseppe.castagno@acca-esse.eu>2016-01-02 16:03:20 +0100
committerKatarina Behrens <Katarina.Behrens@cib.de>2016-01-07 13:28:38 +0000
commit8369e7d511d5cc07b8fac31a05a5897f58b46740 (patch)
treedfb62f92650081ca573858fa00ec54443939150c /svtools
parentd44e7d7181dc5d107ea54de36fbecd4e1b03e606 (diff)
Related tdf#96833: breadcrumb: setting URL, host port gets lost.
At the same time added a log in WebDAV, useful to discover the issue. Change-Id: I3435f8d3da28f7d6b4c2e154cf2bb5ee33a9a690 Reviewed-on: https://gerrit.libreoffice.org/21047 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Stephan Bergmann <sbergman@redhat.com> (cherry picked from commit 5c4de8f1991f1a9964e661717dc6b46f6a6a3608) Reviewed-on: https://gerrit.libreoffice.org/21172 Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/control/breadcrumb.cxx11
1 files changed, 10 insertions, 1 deletions
diff --git a/svtools/source/control/breadcrumb.cxx b/svtools/source/control/breadcrumb.cxx
index 2f7766ec3e9b..b611a42e5c52 100644
--- a/svtools/source/control/breadcrumb.cxx
+++ b/svtools/source/control/breadcrumb.cxx
@@ -105,13 +105,22 @@ void Breadcrumb::SetURL( const OUString& rURL )
m_aCurrentURL = rURL;
INetURLObject aURL( rURL );
aURL.setFinalSlash();
+ //prepare the Host port
+ OUString sHostPort;
+
+ if( aURL.HasPort() )
+ {
+ sHostPort += ":";
+ sHostPort += sHostPort.number( aURL.GetPort() );
+ }
OUString sUser = aURL.GetUser( INetURLObject::NO_DECODE );
OUString sPath = aURL.GetURLPath(INetURLObject::DECODE_WITH_CHARSET);
OUString sRootPath = INetURLObject::GetScheme( aURL.GetProtocol() )
+ sUser
+ ( sUser.isEmpty() ? OUString() : "@" )
- + aURL.GetHost();
+ + aURL.GetHost()
+ + sHostPort;
int nSegments = aURL.getSegmentCount();
unsigned int nPos = 0;