summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-08-21 16:23:17 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-08-22 09:32:48 +0200
commitd7f2ee85300b9e1666020e74f03744a3a7c103ed (patch)
treeab375812e37965b6bbedd026a5c1fc7bbf9cc8c8
parent1e918814aa4aa6d88c5426e9b28b1aea385d9a57 (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>
-rw-r--r--tools/qa/cppunit/test_urlobj.cxx30
-rw-r--r--tools/source/fsys/urlobj.cxx9
2 files changed, 0 insertions, 39 deletions
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx
index 71554d2d8a41..81f3f78d2315 100644
--- a/tools/qa/cppunit/test_urlobj.cxx
+++ b/tools/qa/cppunit/test_urlobj.cxx
@@ -54,11 +54,6 @@ namespace tools_urlobj
aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(INetProtocol::Smb, aUrl.GetProtocol());
#endif
-#ifdef _WIN32
- CPPUNIT_ASSERT_EQUAL( OUString("file://10.10.1.1/sampledir/sample.file"),
- aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
- CPPUNIT_ASSERT_EQUAL( INetProtocol::File, aUrl.GetProtocol( ) );
-#endif
CPPUNIT_ASSERT_EQUAL(OUString("10.10.1.1"),
aUrl.GetHost(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(OUString("/sampledir/sample.file"),
@@ -80,11 +75,6 @@ namespace tools_urlobj
aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(INetProtocol::Smb, aUrl.GetProtocol());
#endif
-#ifdef _WIN32
- CPPUNIT_ASSERT_EQUAL( OUString("file://137.65.170.24/c$/Img0001.jpg"),
- aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
- CPPUNIT_ASSERT_EQUAL( INetProtocol::File, aUrl.GetProtocol( ) );
-#endif
CPPUNIT_ASSERT_EQUAL(OUString("137.65.170.24"),
aUrl.GetHost(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(OUString("/c$/Img0001.jpg"),
@@ -106,11 +96,6 @@ namespace tools_urlobj
aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(INetProtocol::Smb, aUrl.GetProtocol());
#endif
-#ifdef _WIN32
- CPPUNIT_ASSERT_EQUAL( OUString("file://hive-winxp-x86/pmladek/test2.odt"),
- aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
- CPPUNIT_ASSERT_EQUAL( INetProtocol::File, aUrl.GetProtocol( ) );
-#endif
CPPUNIT_ASSERT_EQUAL(OUString("hive-winxp-x86"),
aUrl.GetHost(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(OUString("/pmladek/test2.odt"),
@@ -125,11 +110,6 @@ namespace tools_urlobj
aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL( INetProtocol::Smb, aUrl.GetProtocol( ) );
#endif
-#ifdef _WIN32
- CPPUNIT_ASSERT_EQUAL( OUString("file://10.10.1.1/sampledir/sample.file"),
- aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
- CPPUNIT_ASSERT_EQUAL( INetProtocol::File, aUrl.GetProtocol( ) );
-#endif
CPPUNIT_ASSERT_EQUAL(OUString("10.10.1.1"),
aUrl.GetHost(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(OUString("/sampledir/sample.file"),
@@ -149,11 +129,6 @@ namespace tools_urlobj
aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(INetProtocol::Smb, aUrl.GetProtocol());
#endif
-#ifdef _WIN32
- CPPUNIT_ASSERT_EQUAL( OUString("file://137.65.170.24/c$/Img0001.jpg"),
- aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
- CPPUNIT_ASSERT_EQUAL( INetProtocol::File, aUrl.GetProtocol( ) );
-#endif
CPPUNIT_ASSERT_EQUAL(OUString("137.65.170.24"),
aUrl.GetHost(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(OUString("/c$/Img0001.jpg"),
@@ -174,11 +149,6 @@ namespace tools_urlobj
aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(INetProtocol::Smb, aUrl.GetProtocol());
#endif
-#ifdef _WIN32
- CPPUNIT_ASSERT_EQUAL( OUString("file://hive-winxp-x86/pmladek/test2.odt"),
- aUrl.GetMainURL( INetURLObject::DecodeMechanism::NONE ) );
- CPPUNIT_ASSERT_EQUAL( INetProtocol::File, aUrl.GetProtocol( ) );
-#endif
CPPUNIT_ASSERT_EQUAL(OUString("hive-winxp-x86"),
aUrl.GetHost(INetURLObject::DecodeMechanism::NONE));
CPPUNIT_ASSERT_EQUAL(OUString("/pmladek/test2.odt"),
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;
}