diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qa/cppunit/test_urlobj.cxx | 34 | ||||
| -rw-r--r-- | tools/source/fsys/urlobj.cxx | 11 |
2 files changed, 5 insertions, 40 deletions
diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index 581a19478e67..2c391fbf513d 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -49,11 +49,7 @@ namespace tools_urlobj void urlobjTest_001( ) { INetURLObject aUrl( OUString( "file://10.10.1.1/sampledir/sample.file" ) ); -#ifdef LINUX - 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 + CPPUNIT_ASSERT_EQUAL(INetProtocol::File, aUrl.GetProtocol()); CPPUNIT_ASSERT_EQUAL(OUString("10.10.1.1"), aUrl.GetHost(INetURLObject::DecodeMechanism::NONE)); CPPUNIT_ASSERT_EQUAL(OUString("/sampledir/sample.file"), @@ -70,11 +66,7 @@ namespace tools_urlobj aUrl. setFSysPath( "\\\\137.65.170.24\\c$\\Img0001.jpg", FSysStyle::Detect ); -#ifdef LINUX - 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 + CPPUNIT_ASSERT_EQUAL(INetProtocol::File, aUrl.GetProtocol()); CPPUNIT_ASSERT_EQUAL(OUString("137.65.170.24"), aUrl.GetHost(INetURLObject::DecodeMechanism::NONE)); CPPUNIT_ASSERT_EQUAL(OUString("/c$/Img0001.jpg"), @@ -91,11 +83,7 @@ namespace tools_urlobj aUrl. setFSysPath( "\\\\hive-winxp-x86\\pmladek\\test2.odt", FSysStyle::Detect ); -#ifdef LINUX - CPPUNIT_ASSERT_EQUAL(OUString("smb://hive-winxp-x86/pmladek/test2.odt"), - aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE)); - CPPUNIT_ASSERT_EQUAL(INetProtocol::Smb, aUrl.GetProtocol()); -#endif + CPPUNIT_ASSERT_EQUAL(INetProtocol::File, aUrl.GetProtocol()); CPPUNIT_ASSERT_EQUAL(OUString("hive-winxp-x86"), aUrl.GetHost(INetURLObject::DecodeMechanism::NONE)); CPPUNIT_ASSERT_EQUAL(OUString("/pmladek/test2.odt"), @@ -105,11 +93,7 @@ namespace tools_urlobj void urlobjTest_004( ) { INetURLObject aUrl( OUString( "smb://10.10.1.1/sampledir/sample.file" ) ); -#ifdef LINUX - 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 CPPUNIT_ASSERT_EQUAL(OUString("10.10.1.1"), aUrl.GetHost(INetURLObject::DecodeMechanism::NONE)); CPPUNIT_ASSERT_EQUAL(OUString("/sampledir/sample.file"), @@ -124,11 +108,7 @@ namespace tools_urlobj INetURLObject aUrl; aUrl.setFSysPath( "//137.65.170.24/c$/Img0001.jpg", FSysStyle::Detect ); -#ifdef LINUX - 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 + CPPUNIT_ASSERT_EQUAL(INetProtocol::File, aUrl.GetProtocol()); CPPUNIT_ASSERT_EQUAL(OUString("137.65.170.24"), aUrl.GetHost(INetURLObject::DecodeMechanism::NONE)); CPPUNIT_ASSERT_EQUAL(OUString("/c$/Img0001.jpg"), @@ -144,11 +124,7 @@ namespace tools_urlobj INetURLObject aUrl; aUrl.setFSysPath( "//hive-winxp-x86/pmladek/test2.odt", FSysStyle::Detect ); -#ifdef LINUX - CPPUNIT_ASSERT_EQUAL(OUString("smb://hive-winxp-x86/pmladek/test2.odt"), - aUrl.GetMainURL(INetURLObject::DecodeMechanism::NONE)); - CPPUNIT_ASSERT_EQUAL(INetProtocol::Smb, aUrl.GetProtocol()); -#endif + CPPUNIT_ASSERT_EQUAL(INetProtocol::File, aUrl.GetProtocol()); 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 45bd5a0d283f..445e27772955 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -1444,17 +1444,6 @@ bool INetURLObject::setAbsURIRef(OUString const & rTheAbsURIRef, m_aAbsURIRef = aSynAbsURIRef; - // At this point references of type "\\server\paths" have - // been converted to file:://server/path". -#ifdef LINUX - if (m_eScheme==INetProtocol::File && !m_aHost.isEmpty()) { - // Change "file:://server/path" URIs to "smb:://server/path" on - // Linux - // Leave "file::path" URIs unchanged. - changeScheme(INetProtocol::Smb); - } -#endif - return true; } |