diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-08-21 16:23:17 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-22 09:32:48 +0200 |
| commit | d7f2ee85300b9e1666020e74f03744a3a7c103ed (patch) | |
| tree | ab375812e37965b6bbedd026a5c1fc7bbf9cc8c8 /tools/source/fsys/urlobj.cxx | |
| parent | 1e918814aa4aa6d88c5426e9b28b1aea385d9a57 (diff) | |
tdf#119326 crash when adding "Windows Share" File resource
this was a regression from
commit ce43d0ae9279edbf1ad108fe0d8325327a038d49
use consistent #define checks for the Windows platform
where I converted
#ifdef WIN
to
#ifdef _WIN32
But that was already dead code at that point since we did not define
that preprocessor constant anywhere.
Change-Id: Ieadafd61fada05fc19d04d83992fba7c42969daa
Reviewed-on: https://gerrit.libreoffice.org/59402
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 82034b04e81b74a048595b0eac0f73581ecbc9e4)
Reviewed-on: https://gerrit.libreoffice.org/59422
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'tools/source/fsys/urlobj.cxx')
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index eee91285258e..73708132ada1 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1454,15 +1454,6 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, } #endif -#ifdef _WIN32 - if (m_eScheme==INetProtocol::Smb) { - // Change "smb://server/path" URIs to "file://server/path" - // URIs on Windows, since Windows doesn't understand the - // SMB scheme. - changeScheme(INetProtocol::File); - } -#endif - return true; } |