remove uses of COMPARE_*

Change-Id: Icdc36b4b24d2f399f481065df3200feb98025135

5 files changed, 13 insertions, 13 deletions

diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 7dbf55092221..0705a1c25604 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -512,7 +512,7 @@ sal_uInt16  SwXServiceProvider::GetProviderType(const OUString& rServiceName)
     sal_uInt16 nEntries = sizeof(aProvNamesId) / sizeof(aProvNamesId[0]);
     for(sal_uInt16 i = 0; i < nEntries; i++ )
     {
-        if( COMPARE_EQUAL == rServiceName.compareToAscii(aProvNamesId[i].pName))
+        if (rServiceName.equalsAscii(aProvNamesId[i].pName))
             return aProvNamesId[i].nType;
     }
     return SW_SERVICE_INVALID;
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index b382b2e75518..a76c20d03183 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -2132,7 +2132,7 @@ OUString SwXShape::getImplementationName(void) throw( uno::RuntimeException )
 sal_Bool SwXShape::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
 {
     sal_Bool bRet = sal_False;
-    if(COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.drawing.Shape"))
+    if (rServiceName == "com.sun.star.drawing.Shape")
         bRet = sal_True;
     else if(xShapeAgg.is())
     {
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 7af7f7ccb6da..713f299c64f7 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -2755,9 +2755,9 @@ OUString SwXTextFrame::getImplementationName(void) throw( uno::RuntimeException
 
 sal_Bool SwXTextFrame::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
 {
-    return COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.text.Text")||
-            COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.text.TextFrame")||
-                    SwXFrame::supportsService(rServiceName);
+    return rServiceName == "com.sun.star.text.Text" ||
+           rServiceName == "com.sun.star.text.TextFrame" ||
+           SwXFrame::supportsService(rServiceName);
 }
 
 uno::Sequence< OUString > SwXTextFrame::getSupportedServiceNames(void) throw( uno::RuntimeException )
@@ -2917,8 +2917,8 @@ OUString SwXTextGraphicObject::getImplementationName(void) throw( uno::RuntimeEx
 
 sal_Bool SwXTextGraphicObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
 {
-    return COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.text.TextGraphicObject") ||
-                    SwXFrame::supportsService(rServiceName);
+    return rServiceName == "com.sun.star.text.TextGraphicObject" ||
+           SwXFrame::supportsService(rServiceName);
 }
 
 uno::Sequence< OUString > SwXTextGraphicObject::getSupportedServiceNames(void)
@@ -3178,8 +3178,8 @@ OUString SwXTextEmbeddedObject::getImplementationName(void) throw( uno::RuntimeE
 
 sal_Bool SwXTextEmbeddedObject::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
 {
-    return  COMPARE_EQUAL == rServiceName.compareToAscii("com.sun.star.text.TextEmbeddedObject")||
-                    SwXFrame::supportsService(rServiceName);
+    return rServiceName == "com.sun.star.text.TextEmbeddedObject" ||
+           SwXFrame::supportsService(rServiceName);
 }
 
 uno::Sequence< OUString > SwXTextEmbeddedObject::getSupportedServiceNames(void)
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index e5d532472abd..cea2d9e26b84 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1655,11 +1655,11 @@ void SwXNumberingRules::SetNumberingRuleByIndex(
         bExcept = true;
         for(sal_uInt16 j = 0; j < SAL_N_ELEMENTS( aNumPropertyNames ); j++)
         {
-            if( pDocShell && j >= NotInChapterFirst && j <= NotInChapterLast )
+            if (pDocShell && j >= NotInChapterFirst && j <= NotInChapterLast)
                 continue;
-            if( !pDocShell && j >= InChapterFirst && j <= InChapterLast )
+            if (!pDocShell && j >= InChapterFirst && j <= InChapterLast)
                 continue;
-            if(COMPARE_EQUAL == rProp.Name.compareToAscii(aNumPropertyNames[j]))
+            if (rProp.Name.equalsAscii(aNumPropertyNames[j]))
             {
                 bExcept = false;
                 break;
diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx
index dbe1365abc43..f31c3dd1d21a 100644
--- a/sw/source/ui/dbui/dbtree.cxx
+++ b/sw/source/ui/dbui/dbtree.cxx
@@ -404,7 +404,7 @@ IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData )
     SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight );
 
     if (GetParent(pRight) && GetParent(GetParent(pRight)))
-        return COMPARE_GREATER; // don't sort column names
+        return 1; // don't sort column names
 
     return DefaultCompare(pData);   // otherwise call base class
 }