From b82489382e18494694530874480774e2bb29830e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 28 Aug 2019 15:28:17 +0200 Subject: INetURLObject::setFSysPath is unused now ...after 056e1fff2ed232f2a50db933fbade1c71c0c2a65 "Simplify code removing the last segment from a URL" Change-Id: I3abe84ada119356191d8df9c0a8ee62dcf18d108 Reviewed-on: https://gerrit.libreoffice.org/78228 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- tools/qa/cppunit/test_urlobj.cxx | 62 -------------- tools/source/fsys/urlobj.cxx | 171 --------------------------------------- 2 files changed, 233 deletions(-) (limited to 'tools') diff --git a/tools/qa/cppunit/test_urlobj.cxx b/tools/qa/cppunit/test_urlobj.cxx index 87ce9aa77758..0e25decab713 100644 --- a/tools/qa/cppunit/test_urlobj.cxx +++ b/tools/qa/cppunit/test_urlobj.cxx @@ -60,36 +60,6 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(OUString("file"), aUrl.getExtension()); } - void urlobjTest_002( ) - { - INetURLObject aUrl; - aUrl. - setFSysPath( "\\\\137.65.170.24\\c$\\Img0001.jpg", - FSysStyle::Detect ); - 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"), - aUrl.GetURLPath(INetURLObject::DecodeMechanism::NONE)); - CPPUNIT_ASSERT_EQUAL(OUString("Img0001.jpg"), aUrl.getName()); - CPPUNIT_ASSERT_EQUAL(OUString("Img0001"), aUrl.getBase()); - CPPUNIT_ASSERT_EQUAL(OUString("jpg"), aUrl.getExtension()); - } - - - void urlobjTest_003( ) - { - INetURLObject aUrl; - aUrl. - setFSysPath( "\\\\hive-winxp-x86\\pmladek\\test2.odt", - FSysStyle::Detect ); - 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"), - aUrl.GetURLPath(INetURLObject::DecodeMechanism::NONE)); - } - void urlobjTest_004( ) { INetURLObject aUrl( OUString( "smb://10.10.1.1/sampledir/sample.file" ) ); @@ -103,34 +73,6 @@ namespace tools_urlobj CPPUNIT_ASSERT_EQUAL(OUString("file"), aUrl.getExtension()); } - void urlobjTest_005( ) - { - INetURLObject aUrl; - aUrl.setFSysPath( "//137.65.170.24/c$/Img0001.jpg", - FSysStyle::Detect ); - 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"), - aUrl.GetURLPath(INetURLObject::DecodeMechanism::NONE)); - CPPUNIT_ASSERT_EQUAL(OUString("Img0001.jpg"), aUrl.getName( )); - CPPUNIT_ASSERT_EQUAL(OUString("Img0001"), aUrl.getBase( )); - CPPUNIT_ASSERT_EQUAL(OUString("jpg"), aUrl.getExtension( )); - } - - - void urlobjTest_006( ) - { - INetURLObject aUrl; - aUrl.setFSysPath( "//hive-winxp-x86/pmladek/test2.odt", - FSysStyle::Detect ); - 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"), - aUrl.GetURLPath( INetURLObject::DecodeMechanism::NONE)); - } - void urlobjCmisTest( ) { // Test with a username part @@ -358,11 +300,7 @@ namespace tools_urlobj CPPUNIT_TEST_SUITE( urlobjTest ); CPPUNIT_TEST( urlobjTest_001 ); - CPPUNIT_TEST( urlobjTest_002 ); - CPPUNIT_TEST( urlobjTest_003 ); CPPUNIT_TEST( urlobjTest_004 ); - CPPUNIT_TEST( urlobjTest_005 ); - CPPUNIT_TEST( urlobjTest_006 ); CPPUNIT_TEST( urlobjCmisTest ); CPPUNIT_TEST( urlobjTest_emptyPath ); CPPUNIT_TEST( urlobjTest_data ); diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 980619ea5d26..37f3791a4d30 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -4250,177 +4250,6 @@ bool INetURLObject::removeFinalSlash() return setPath(aNewPath, EncodeMechanism::NotCanonical, RTL_TEXTENCODING_UTF8); } -bool INetURLObject::setFSysPath(OUString const & rFSysPath, - FSysStyle eStyle) -{ - sal_Unicode const * pFSysBegin = rFSysPath.getStr(); - sal_Unicode const * pFSysEnd = pFSysBegin + rFSysPath.getLength(); - - switch (((eStyle & FSysStyle::Vos) ? 1 : 0) - + ((eStyle & FSysStyle::Unix) ? 1 : 0) - + ((eStyle & FSysStyle::Dos) ? 1 : 0)) - { - case 0: - return false; - - case 1: - break; - - default: - if (eStyle & FSysStyle::Vos - && pFSysEnd - pFSysBegin >= 2 - && pFSysBegin[0] == '/' - && pFSysBegin[1] == '/') - { - if (pFSysEnd - pFSysBegin >= 3 - && pFSysBegin[2] == '.' - && (pFSysEnd - pFSysBegin == 3 || pFSysBegin[3] == '/')) - { - eStyle = FSysStyle::Vos; // Production T1 - break; - } - - sal_Unicode const * p = pFSysBegin + 2; - OUString aHost; - if (parseHost(p, pFSysEnd, aHost) - && (p == pFSysEnd || *p == '/')) - { - eStyle = FSysStyle::Vos; // Production T2 - break; - } - } - - if (eStyle & FSysStyle::Dos - && pFSysEnd - pFSysBegin >= 2 - && pFSysBegin[0] == '\\' - && pFSysBegin[1] == '\\') - { - sal_Unicode const * p = pFSysBegin + 2; - OUString aHost; - if (parseHost(p, pFSysEnd, aHost) - && (p == pFSysEnd || *p == '\\')) - { - eStyle = FSysStyle::Dos; // Production T3 - break; - } - } - - if (eStyle & FSysStyle::Dos - && pFSysEnd - pFSysBegin >= 2 - && rtl::isAsciiAlpha(pFSysBegin[0]) - && pFSysBegin[1] == ':' - && (pFSysEnd - pFSysBegin == 2 - || pFSysBegin[2] == '/' - || pFSysBegin[2] == '\\')) - { - eStyle = FSysStyle::Dos; // Productions T4, T5 - break; - } - - if (!(eStyle & (FSysStyle::Unix | FSysStyle::Dos))) - return false; - - eStyle = guessFSysStyleByCounting(pFSysBegin, pFSysEnd, eStyle); - // Production T6 - break; - } - - OUStringBuffer aSynAbsURIRef("file://"); - - switch (eStyle) - { - case FSysStyle::Vos: - { - sal_Unicode const * p = pFSysBegin; - if (pFSysEnd - p < 2 || *p++ != '/' || *p++ != '/') - return false; - if (p != pFSysEnd && *p == '.' - && (pFSysEnd - p == 1 || p[1] == '/')) - ++p; - for (; p != pFSysEnd; ++p) - switch (*p) - { - case '#': - case '%': - appendEscape(aSynAbsURIRef, *p); - break; - - default: - aSynAbsURIRef.append(*p); - break; - } - break; - } - - case FSysStyle::Unix: - { - sal_Unicode const * p = pFSysBegin; - if (p != pFSysEnd && *p != '/') - return false; - for (; p != pFSysEnd; ++p) - switch (*p) - { - case '|': - case '#': - case '%': - appendEscape(aSynAbsURIRef, *p); - break; - - default: - aSynAbsURIRef.append(*p); - break; - } - break; - } - - case FSysStyle::Dos: - { - sal_uInt32 nAltDelimiter = 0x80000000; - sal_Unicode const * p = pFSysBegin; - if (pFSysEnd - p >= 3 && p[0] == '\\' && p[1] == '\\') - p += 2; - else - { - aSynAbsURIRef.append('/'); - if (pFSysEnd - p >= 2 - && rtl::isAsciiAlpha(p[0]) - && p[1] == ':' - && (pFSysEnd - p == 2 || p[2] == '\\' || p[2] == '/')) - nAltDelimiter = '/'; - } - for (; p != pFSysEnd; ++p) - if (*p == '\\' || *p == nAltDelimiter) - aSynAbsURIRef.append('/'); - else - switch (*p) - { - case '/': - case '#': - case '%': - appendEscape(aSynAbsURIRef, *p); - break; - - default: - aSynAbsURIRef.append(*p); - break; - } - break; - } - - default: - OSL_ASSERT(false); - break; - } - - INetURLObject aTemp(aSynAbsURIRef.makeStringAndClear(), EncodeMechanism::WasEncoded, - RTL_TEXTENCODING_UTF8); - if (aTemp.HasError()) - return false; - - *this = aTemp; - return true; -} - OUString INetURLObject::getFSysPath(FSysStyle eStyle, sal_Unicode * pDelimiter) const { -- cgit v1.2.3