Caolán McNamara
4ba5567cc4
IsExoticProtocol used GetHost() to recover the nested package url of a vnd.sun.star.pkg url, but the package content provider in ucb/source/ucp/package/pkguri.cxx uses the whole authority between "://" and the next '/', which GetHost() truncates at '@'. Check the same substring the provider does. The vnd.sun.star.zip branch below already did the equivalent extraction, so pull the shared parts into a helper that both branches call. Signed-off-by: Caolán McNamara <caolan.mcnamara@collabora.com> Change-Id: I27be6a839108f2e58d62baefc1a71dcbfc9a4568 Reviewed-on: https://gerrit.collaboraoffice.com/c/online/+/4410 Tested-by: Jenkins CPCI <releng@collaboraoffice.com> Reviewed-by: Stephan Bergmann <stephan.bergmann@collabora.com> (cherry picked from commit ce436efb34d2e0e90ee2cdb450da285530c562f7) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/206681 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> Tested-by: Jenkins