diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-01-16 15:46:57 -0200 |
---|---|---|
committer | Olivier Hallot <olivier.hallot@alta.org.br> | 2012-01-16 18:49:04 -0200 |
commit | 81e50fb2e378120d05f7ffdee216ce6e248e189b (patch) | |
tree | 0fa6f4779bb3b4970e4720bef4ac36c90514b45c /tools/source/fsys/urlobj.cxx | |
parent | 69d91300547f6ed45a9a499ffae71c2c0f91c441 (diff) |
Fix for fdo43460 Part XXXIX getLength() to isEmpty()
Part XXXIX
Modules
testtools, toolkit, tools
Diffstat (limited to 'tools/source/fsys/urlobj.cxx')
-rw-r--r-- | tools/source/fsys/urlobj.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 9e3567e6701d..ffbdaa88893c 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -843,7 +843,7 @@ bool INetURLObject::setAbsURIRef(rtl::OUString const & rTheAbsURIRef, if (m_eScheme == INET_PROT_NOT_VALID) { sal_Unicode const * p1 = pPos; aSynScheme = parseScheme(&p1, pEnd, nFragmentDelimiter); - if (aSynScheme.getLength() > 0) + if (!aSynScheme.isEmpty()) { m_eScheme = INET_PROT_GENERIC; pPos = p1; @@ -1509,7 +1509,7 @@ bool INetURLObject::convertRelToAbs(rtl::OUString const & rTheRelURIRef, bool hasScheme = pPrefix != 0; if (!hasScheme) { pPrefixBegin = p; - hasScheme = parseScheme(&pPrefixBegin, pEnd, '#').getLength() > 0; + hasScheme = !parseScheme(&pPrefixBegin, pEnd, '#').isEmpty(); } sal_uInt32 nSegmentDelimiter = '/'; @@ -2299,7 +2299,7 @@ bool INetURLObject::setUser(rtl::OUString const & rTheUser, { if ( !getSchemeInfo().m_bUser || - (m_eScheme == INET_PROT_IMAP && rTheUser.getLength() == 0) + (m_eScheme == INET_PROT_IMAP && rTheUser.isEmpty()) ) { return false; @@ -4112,12 +4112,12 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, bool bUserInfo = false; if (getSchemeInfo().m_bUser) { - if (m_eScheme == INET_PROT_IMAP && rTheUser.getLength() == 0) + if (m_eScheme == INET_PROT_IMAP && rTheUser.isEmpty()) { setInvalid(); return false; } - if (rTheUser.getLength() != 0) + if (!rTheUser.isEmpty()) { m_aUser.set(m_aAbsURIRef, encodeText(rTheUser, false, @@ -4132,12 +4132,12 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, bUserInfo = true; } } - else if (rTheUser.getLength() != 0) + else if (!rTheUser.isEmpty()) { setInvalid(); return false; } - if (rThePassword.getLength() != 0) + if (!rThePassword.isEmpty()) { if (getSchemeInfo().m_bPassword) { @@ -4218,7 +4218,7 @@ bool INetURLObject::ConcatData(INetProtocol eTheScheme, } } } - else if (rTheHost.getLength() != 0 || nThePort != 0) + else if (!rTheHost.isEmpty() || nThePort != 0) { setInvalid(); return false; @@ -4250,7 +4250,7 @@ rtl::OUString INetURLObject::GetAbsURL(rtl::OUString const & rTheBaseURIRef, FSysStyle eStyle) { // Backwards compatibility: - if (rTheRelURIRef.getLength() == 0 || rTheRelURIRef[0] == '#') + if (rTheRelURIRef.isEmpty() || rTheRelURIRef[0] == '#') return rTheRelURIRef; INetURLObject aTheAbsURIRef; |