[Libreoffice-commits] core.git: sal/inc sal/qa writerfilter/source

[Fridrich Å trba]

 sal/inc/rtl/string.hxx                        |    8 ++++----
 sal/qa/rtl_strings/rtl_OString.cxx            |    6 +++---
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx |   14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit ff4464659ec54732c45729ace964d60e77d19eb2
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Mon Apr 22 09:53:49 2013 +0200

    Revert "fdo#62096: Replaced some compareTo with =="
    
    This reverts commit dd47994722eaead16099145e593fbf878072d52b.

diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx
index 8151262..e3d5afb 100644
--- a/sal/inc/rtl/string.hxx
+++ b/sal/inc/rtl/string.hxx
@@ -782,25 +782,25 @@ public:
     template< typename T >
     friend typename internal::CharPtrDetector< T, bool >::Type operator==( const OString& rStr1, const T& value ) SAL_THROW(())
     {
-        return (rStr1 == value);
+        return rStr1.compareTo( value ) == 0;
     }
 
     template< typename T >
     friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator==( const OString& rStr1, T& value ) SAL_THROW(())
     {
-        return (rStr1 == value);
+        return rStr1.compareTo( value ) == 0;
     }
 
     template< typename T >
     friend typename internal::CharPtrDetector< T, bool >::Type operator==( const T& value, const OString& rStr2 ) SAL_THROW(())
     {
-        return (rStr2 == value);
+        return rStr2.compareTo( value ) == 0;
     }
 
     template< typename T >
     friend typename internal::NonConstCharArrayDetector< T, bool >::Type operator==( T& value, const OString& rStr2 ) SAL_THROW(())
     {
-        return (rStr2 == value);
+        return rStr2.compareTo( value ) == 0;
     }
 
     /**
diff --git a/sal/qa/rtl_strings/rtl_OString.cxx b/sal/qa/rtl_strings/rtl_OString.cxx
index 293381c..1934f06 100644
--- a/sal/qa/rtl_strings/rtl_OString.cxx
+++ b/sal/qa/rtl_strings/rtl_OString.cxx
@@ -1929,7 +1929,7 @@ sal_Bool test_valueOf( const char** resArray, int n, sal_Int16 radix,
         bRes &= c_rtl_tres_state
                 (
                     hRtlTestResult,
-                    aStr2 == aStr1,
+                    aStr2.compareTo(aStr1) == 0,
                     (sal_Char*)resArray[i],
                     createName( pMeth, "valueOf", i )
                 );
@@ -2163,7 +2163,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int32_WrongRadix(
     bRes = c_rtl_tres_state
             (
                 hRtlTestResult,
-                aStr2 ==  aStr1,
+                aStr2.compareTo( aStr1 ) == 0,
                 "if radix not valid then radix must be 10",
                 "valueOf(sal_Int32, sal_Int32 radix): radix = -5"
             );
@@ -2411,7 +2411,7 @@ sal_Bool SAL_CALL test_rtl_OString_valueOf_Int64_WrongRadix(
     bRes = c_rtl_tres_state
             (
                 hRtlTestResult,
-                aStr2 == aStr1,
+                aStr2.compareTo(aStr1) == 0,
                 "if radix not valid then radix must be 10",
                 "valueOf(sal_Int64, sal_Int32 radix): radix = -5"
             );
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index 3305e7c..96f37bd 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -169,16 +169,16 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
             {
                 beans::StringPair aPair = aSeq[i];
 
-                if (aPair.First == sType &&
-                    aPair.Second == sStreamType)
+                if (aPair.First.compareTo(sType) == 0 &&
+                    aPair.Second.compareTo(sStreamType) == 0)
                     bFound = true;
-                else if (aPair.First == sId &&
-                         aPair.Second == rId)
+                else if (aPair.First.compareTo(sId) == 0 &&
+                         aPair.Second.compareTo(rId) == 0)
                     bFound = true;
-                else if (aPair.First == sTarget)
+                else if (aPair.First.compareTo(sTarget) == 0)
                     sMyTarget = aPair.Second;
-                else if (aPair.First == sTargetMode &&
-                         aPair.Second == sExternal)
+                else if (aPair.First.compareTo(sTargetMode) == 0 &&
+                         aPair.Second.compareTo(sExternal) == 0)
                     bExternalTarget = true;
 
             }