Kaydet (Commit) dd479947 authored tarafından Sameer Deshmukh's avatar Sameer Deshmukh Kaydeden (comit) Fridrich Strba

fdo#62096: Replaced some compareTo with ==

Change-Id: I1151dafcef91abdb2ce08abe3547a49fe3f4a67c
Reviewed-on: https://gerrit.libreoffice.org/3509Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst ca54015d
...@@ -782,25 +782,25 @@ public: ...@@ -782,25 +782,25 @@ public:
template< typename T > template< typename T >
friend typename internal::CharPtrDetector< T, bool >::Type operator==( const OString& rStr1, const T& value ) SAL_THROW(()) friend typename internal::CharPtrDetector< T, bool >::Type operator==( const OString& rStr1, const T& value ) SAL_THROW(())
{ {
return rStr1.compareTo( value ) == 0; return (rStr1 == value);
} }
template< typename T > template< typename T >
friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr1, T& value ) SAL_THROW(()) friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr1, T& value ) SAL_THROW(())
{ {
return rStr1.compareTo( value ) == 0; return (rStr1 == value);
} }
template< typename T > template< typename T >
friend typename internal::CharPtrDetector< T, bool >::Type operator==( const T& value, const OString& rStr2 ) SAL_THROW(()) friend typename internal::CharPtrDetector< T, bool >::Type operator==( const T& value, const OString& rStr2 ) SAL_THROW(())
{ {
return rStr2.compareTo( value ) == 0; return (rStr2 == value);
} }
template< typename T > template< typename T >
friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator==( T& value, const OString& rStr2 ) SAL_THROW(()) friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator==( T& value, const OString& rStr2 ) SAL_THROW(())
{ {
return rStr2.compareTo( value ) == 0; return (rStr2 == value);
} }
/** /**
......
...@@ -1929,7 +1929,7 @@ sal_Bool test_valueOf( const char** resArray, int n, sal_Int16 radix, ...@@ -1929,7 +1929,7 @@ sal_Bool test_valueOf( const char** resArray, int n, sal_Int16 radix,
bRes &= c_rtl_tres_state bRes &= c_rtl_tres_state
( (
hRtlTestResult, hRtlTestResult,
aStr2.compareTo(aStr1) == 0, aStr2 == aStr1,
(sal_Char*)resArray[i], (sal_Char*)resArray[i],
createName( pMeth, "valueOf", i ) createName( pMeth, "valueOf", i )
); );
...@@ -2163,7 +2163,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int32_WrongRadix( ...@@ -2163,7 +2163,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int32_WrongRadix(
bRes = c_rtl_tres_state bRes = c_rtl_tres_state
( (
hRtlTestResult, hRtlTestResult,
aStr2.compareTo( aStr1 ) == 0, aStr2 == aStr1,
"if radix not valid then radix must be 10", "if radix not valid then radix must be 10",
"valueOf(sal_Int32, sal_Int32 radix): radix = -5" "valueOf(sal_Int32, sal_Int32 radix): radix = -5"
); );
...@@ -2411,7 +2411,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_WrongRadix( ...@@ -2411,7 +2411,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_WrongRadix(
bRes = c_rtl_tres_state bRes = c_rtl_tres_state
( (
hRtlTestResult, hRtlTestResult,
aStr2.compareTo(aStr1) == 0, aStr2 == aStr1,
"if radix not valid then radix must be 10", "if radix not valid then radix must be 10",
"valueOf(sal_Int64, sal_Int32 radix): radix = -5" "valueOf(sal_Int64, sal_Int32 radix): radix = -5"
); );
......
...@@ -169,16 +169,16 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess> ...@@ -169,16 +169,16 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
{ {
beans::StringPair aPair = aSeq[i]; beans::StringPair aPair = aSeq[i];
if (aPair.First.compareTo(sType) == 0 && if (aPair.First == sType &&
aPair.Second.compareTo(sStreamType) == 0) aPair.Second == sStreamType)
bFound = true; bFound = true;
else if (aPair.First.compareTo(sId) == 0 && else if (aPair.First == sId &&
aPair.Second.compareTo(rId) == 0) aPair.Second == rId)
bFound = true; bFound = true;
else if (aPair.First.compareTo(sTarget) == 0) else if (aPair.First == sTarget)
sMyTarget = aPair.Second; sMyTarget = aPair.Second;
else if (aPair.First.compareTo(sTargetMode) == 0 && else if (aPair.First == sTargetMode &&
aPair.Second.compareTo(sExternal) == 0) aPair.Second == sExternal)
bExternalTarget = true; bExternalTarget = true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment