From 49e522f3d6c6045710ecb2d233a07880ac9c6c7d Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 21 Aug 2018 16:23:17 +0200 Subject: tdf#119326 crash when adding "Windows Share" File resource MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Noel Grandin (cherry picked from commit 82034b04e81b74a048595b0eac0f73581ecbc9e4) Reviewed-on: https://gerrit.libreoffice.org/59415 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- tools/qa/cppunit/test_urlobj.cxx | 30 ------------------------------ tools/source/fsys/urlobj.cxx | 9 --------- 2 files changed, 39 deletions(-) (limited to 'tools') diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index f9996172a863..581a19478e67 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -53,11 +53,6 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(OUString("smb://10.10.1.1/sampledir/sample.file"), 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)); @@ -79,11 +74,6 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(OUString("smb://137.65.170.24/c$/Img0001.jpg"), 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)); @@ -105,11 +95,6 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(OUString("smb://hive-winxp-x86/pmladek/test2.odt"), 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)); @@ -124,11 +109,6 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(OUString("smb://10.10.1.1/sampledir/sample.file"), 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)); @@ -148,11 +128,6 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(OUString("smb://137.65.170.24/c$/Img0001.jpg"), 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)); @@ -173,11 +148,6 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(OUString("smb://hive-winxp-x86/pmladek/test2.odt"), 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)); diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index c8719b6732b3..efa4c48d5a94 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1455,15 +1455,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; } -- cgit v1.2.3