diff options
50 files changed, 130 insertions, 132 deletions
diff --git a/basegfx/test/basegfx2d.cxx b/basegfx/test/basegfx2d.cxx index 15446780d6d6..e5087b42068d 100644 --- a/basegfx/test/basegfx2d.cxx +++ b/basegfx/test/basegfx2d.cxx @@ -146,12 +146,12 @@ public: aExport = tools::exportToSvgD( aPoly, true, true, false ); const char* sExportString = "m10 10h-20v-20h20z"; CPPUNIT_ASSERT_MESSAGE("exporting rectangle to SVG-D", - !aExport.compareToAscii(sExportString) ); + aExport.equalsAscii(sExportString) ); CPPUNIT_ASSERT_MESSAGE("importing simple rectangle from SVG-D (round-trip", tools::importFromSvgD( aPoly, aExport, false, 0 )); aExport = tools::exportToSvgD( aPoly, true, true, false ); CPPUNIT_ASSERT_MESSAGE("exporting rectangle to SVG-D (round-trip)", - !aExport.compareToAscii(sExportString)); + aExport.equalsAscii(sExportString)); CPPUNIT_ASSERT_MESSAGE("importing simple bezier polygon from SVG-D", tools::importFromSvgD( aPoly, aPath1, false, 0 )); @@ -175,7 +175,7 @@ public: "m11430 0c-8890 3810 5715 6985 5715 6985" "l-17145-1905c0 0 22860-10160 16510 6350" "s-3810-11430-3810-11430z"; - CPPUNIT_ASSERT_MESSAGE("exporting bezier polygon to SVG-D", !aExport.compareToAscii(sExportStringSimpleBezier)); + CPPUNIT_ASSERT_MESSAGE("exporting bezier polygon to SVG-D", aExport.equalsAscii(sExportStringSimpleBezier)); // Adaptions for B2DPolygon bezier change (see #i77162#): // @@ -205,12 +205,12 @@ public: CPPUNIT_ASSERT_MESSAGE("re-importing '@' from SVG-D", tools::importFromSvgD( aReImport, aExport, false, 0)); CPPUNIT_ASSERT_MESSAGE("re-imported '@' needs to be identical", aReImport == aPoly); - CPPUNIT_ASSERT_MESSAGE("exporting '@' to SVG-D", !aExport.compareToAscii(sExportString1)); + CPPUNIT_ASSERT_MESSAGE("exporting '@' to SVG-D", aExport.equalsAscii(sExportString1)); CPPUNIT_ASSERT_MESSAGE("importing '@' from SVG-D (round-trip", tools::importFromSvgD( aPoly, aExport, false, 0 )); aExport = tools::exportToSvgD( aPoly, true, true, false ); CPPUNIT_ASSERT_MESSAGE("exporting '@' to SVG-D (round-trip)", - !aExport.compareToAscii(sExportString1)); + aExport.equalsAscii(sExportString1)); CPPUNIT_ASSERT_MESSAGE("importing complex polygon from SVG-D", @@ -238,12 +238,12 @@ public: "11-95-3-100 3-101 11-95 17-90 24-85 30-79 38-75 21-35 23-35 25-32 26-32 28-30 29" "-28 30-26 31-24 33-22 34-20 35-18 36-16 37-15 39-12 40-11z"; CPPUNIT_ASSERT_MESSAGE("exporting complex polygon to SVG-D", - !aExport.compareToAscii(sExportString2)); + aExport.equalsAscii(sExportString2)); CPPUNIT_ASSERT_MESSAGE("importing complex polygon from SVG-D (round-trip", tools::importFromSvgD( aPoly, aExport, false, 0 )); aExport = tools::exportToSvgD( aPoly, true, true, false ); CPPUNIT_ASSERT_MESSAGE("exporting complex polygon to SVG-D (round-trip)", - !aExport.compareToAscii(sExportString2)); + aExport.equalsAscii(sExportString2)); const B2DPolygon aRect( tools::createPolygonFromRect( B2DRange(0.0,0.0,4000.0,4000.0) )); @@ -251,7 +251,7 @@ public: const char* sExportStringRect = "M0 0H4000V4000H0Z"; CPPUNIT_ASSERT_MESSAGE("exporting to rectangle svg-d string", - !aExport.compareToAscii(sExportStringRect)); + aExport.equalsAscii(sExportStringRect)); } // Change the following lines only, if you add, remove or rename diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index c70f9256df12..3c39006d413b 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -115,13 +115,13 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& const PropertyValue *pEnd = pIter + info.getLength(); for(;pIter != pEnd;++pIter) { - if(!pIter->Name.compareToAscii("Timeout")) + if(pIter->Name.equalsAscii("Timeout")) pIter->Value >>= nTimeout; - else if(!pIter->Name.compareToAscii("Silent")) + else if(pIter->Name.equalsAscii("Silent")) pIter->Value >>= bSilent; - else if(!pIter->Name.compareToAscii("user")) + else if(pIter->Name.equalsAscii("user")) pIter->Value >>= aUID; - else if(!pIter->Name.compareToAscii("password")) + else if(pIter->Name.equalsAscii("password")) pIter->Value >>= aPWD; } try diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index 39ada1a70ac5..dc2f25b7fdea 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -94,7 +94,7 @@ void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValu const PropertyValue *pEnd = pIter + info.getLength(); for(;pIter != pEnd;++pIter) { - if(!pIter->Name.compareToAscii(pPwd)) + if(pIter->Name.equalsAscii(pPwd)) { pIter->Value >>= m_sPassword; break; diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index 2f3309ec9378..d06613304489 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -105,7 +105,7 @@ void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyVa const PropertyValue *pEnd = pIter + info.getLength(); for(;pIter != pEnd;++pIter) { - if(!pIter->Name.compareToAscii(pPwd)) + if(pIter->Name.equalsAscii(pPwd)) { pIter->Value >>= sPassword; break; diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index c76d2d6751ae..3ed139065eca 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.cxx @@ -67,33 +67,33 @@ void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValu const PropertyValue *pEnd = pBegin + info.getLength(); for(;pBegin != pEnd;++pBegin) { - if(!pBegin->Name.compareToAscii("HeaderLine")) + if(pBegin->Name.equalsAscii("HeaderLine")) OSL_VERIFY( pBegin->Value >>= m_bHeaderLine ); - else if(!pBegin->Name.compareToAscii("FieldDelimiter")) + else if(pBegin->Name.equalsAscii("FieldDelimiter")) { OUString aVal; OSL_VERIFY( pBegin->Value >>= aVal ); m_cFieldDelimiter = aVal.toChar(); } - else if(!pBegin->Name.compareToAscii("StringDelimiter")) + else if(pBegin->Name.equalsAscii("StringDelimiter")) { OUString aVal; OSL_VERIFY( pBegin->Value >>= aVal ); m_cStringDelimiter = aVal.toChar(); } - else if(!pBegin->Name.compareToAscii("DecimalDelimiter")) + else if(pBegin->Name.equalsAscii("DecimalDelimiter")) { OUString aVal; OSL_VERIFY( pBegin->Value >>= aVal ); m_cDecimalDelimiter = aVal.toChar(); } - else if(!pBegin->Name.compareToAscii("ThousandDelimiter")) + else if(pBegin->Name.equalsAscii("ThousandDelimiter")) { OUString aVal; OSL_VERIFY( pBegin->Value >>= aVal ); m_cThousandDelimiter = aVal.toChar(); } - else if ( !pBegin->Name.compareToAscii("MaxRowScan") ) + else if ( pBegin->Name.equalsAscii("MaxRowScan") ) { pBegin->Value >>= m_nMaxRowsToScan; } diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index cd9e06ac810e..79edbf500078 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -342,7 +342,7 @@ void OHSQLTable::executeStatement(const OUString& _rStatement ) // ----------------------------------------------------------------------------- Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException) { - if ( ! m_Type.compareToAscii("VIEW") ) + if ( m_Type.equalsAscii("VIEW") ) { Sequence< Type > aTypes = OTableHelper::getTypes(); ::std::vector<Type> aOwnTypes; @@ -401,7 +401,7 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, // ------------------------------------------------------------------------- Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException) { - if( !m_Type.compareToAscii("VIEW") && rType == ::getCppuType((const Reference<XRename>*)0) ) + if( m_Type.equalsAscii("VIEW") && rType == ::getCppuType((const Reference<XRename>*)0) ) return Any(); return OTableHelper::queryInterface(rType); diff --git a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx index fec93c5b8955..2e772fc17f00 100644 --- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx @@ -1205,13 +1205,13 @@ void ODatabaseMetaDataResultSet::openImportedKeys(const Any& catalog, const OUSt const OUString& table) throw(SQLException, RuntimeException) { - openForeignKeys(Any(),NULL,NULL,catalog,!schema.compareToAscii("%") ? &schema : NULL,&table); + openForeignKeys(Any(),NULL,NULL,catalog, schema.equalsAscii("%") ? &schema : NULL, &table); } // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::openExportedKeys(const Any& catalog, const OUString& schema, const OUString& table) throw(SQLException, RuntimeException) { - openForeignKeys(catalog,!schema.compareToAscii("%") ? &schema : NULL,&table,Any(),NULL,NULL); + openForeignKeys(catalog, schema.equalsAscii("%") ? &schema : NULL, &table,Any(),NULL,NULL); } // ------------------------------------------------------------------------- void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUString& schema, diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index adfe1f97138d..94cd6da18a1d 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -423,14 +423,14 @@ namespace const AsciiPropertyValue* pSetting = _pKnownSettings; for ( ; pSetting->AsciiName; ++pSetting ) { - if ( !pDataSourceSetting->Name.compareToAscii( pSetting->AsciiName ) ) + if ( pDataSourceSetting->Name.equalsAscii( pSetting->AsciiName ) ) { // the particular data source setting is known const DriverPropertyInfo* pAllowedDriverSetting = aDriverInfo.getConstArray(); const DriverPropertyInfo* pDriverSettingsEnd = pAllowedDriverSetting + aDriverInfo.getLength(); for ( ; pAllowedDriverSetting != pDriverSettingsEnd; ++pAllowedDriverSetting ) { - if ( !pAllowedDriverSetting->Name.compareToAscii( pSetting->AsciiName ) ) + if ( pAllowedDriverSetting->Name.equalsAscii( pSetting->AsciiName ) ) { // the driver also allows this setting bAllowSetting = sal_True; break; diff --git a/extensions/source/bibliography/bibload.cxx b/extensions/source/bibliography/bibload.cxx index 590ee389de63..94e5e0ad92cc 100644 --- a/extensions/source/bibliography/bibload.cxx +++ b/extensions/source/bibliography/bibload.cxx @@ -196,7 +196,7 @@ extern "C" const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * /*pRegistryKey*/ ) { void * pRet = 0; - if (!BibliographyLoader::getImplementationName_Static().compareToAscii( pImplName ) ) + if (BibliographyLoader::getImplementationName_Static().equalsAscii( pImplName ) ) { // create the factory Reference< XSingleServiceFactory > xFactory = diff --git a/extensions/source/plugin/base/xplugin.cxx b/extensions/source/plugin/base/xplugin.cxx index 1f9fd137ff02..18e62a59d235 100644 --- a/extensions/source/plugin/base/xplugin.cxx +++ b/extensions/source/plugin/base/xplugin.cxx @@ -311,7 +311,7 @@ void XPlugin_Impl::handleSpecialArgs() { // special handling for real audio which needs a lot of parameters // or won't function at all - if( ! m_aDescription.Mimetype.compareToAscii( "audio/x-pn-realaudio-plugin" ) && m_nArgs < 1 ) + if( m_aDescription.Mimetype.equalsAscii( "audio/x-pn-realaudio-plugin" ) && m_nArgs < 1 ) { OUString aURL; if( m_xModel.is() ) @@ -355,7 +355,7 @@ void XPlugin_Impl::handleSpecialArgs() } } // #69333# special for pdf - else if( ! m_aDescription.Mimetype.compareToAscii( "application/pdf" ) ) + else if( m_aDescription.Mimetype.equalsAscii( "application/pdf" ) ) m_aPluginMode = PluginMode::FULL; // see if we have a TYPE tag @@ -839,7 +839,7 @@ void XPlugin_Impl::propertyChange( const com::sun::star::beans::PropertyChangeEv { Guard< Mutex > aGuard( m_aMutex ); - if( ! rEvent.PropertyName.compareToAscii( "URL" ) ) + if( rEvent.PropertyName.equalsAscii( "URL" ) ) { OUString aStr; rEvent.NewValue >>= aStr; diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index d4f677531245..2473f8e76090 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -1257,7 +1257,7 @@ void Binding::handleEvent( const XEvent_t& xEvent ) OUString sType(xEvent->getType()); //OUString sEventMIPChanged("xforms-generic"); //if(sType.equals(sEventMIPChanged)) { - if(!sType.compareToAscii("xforms-generic")) { + if(sType.equalsAscii("xforms-generic")) { // the modification of the 'mnDeferModifyNotifications'-member // is necessary to prevent infinite notication looping. diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx b/i18npool/source/breakiterator/breakiteratorImpl.cxx index f969e7f82814..b5e4331768cb 100644 --- a/i18npool/source/breakiterator/breakiteratorImpl.cxx +++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx @@ -616,7 +616,7 @@ BreakIteratorImpl::getImplementationName(void) throw( RuntimeException ) sal_Bool SAL_CALL BreakIteratorImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(cBreakIterator); + return rServiceName.equalsAscii(cBreakIterator); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 5c7d588e5f4e..f85c1099ea88 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -450,7 +450,7 @@ BreakIterator_Unicode::getImplementationName(void) throw( uno::RuntimeException sal_Bool SAL_CALL BreakIterator_Unicode::supportsService(const OUString& rServiceName) throw( uno::RuntimeException ) { - return !rServiceName.compareToAscii(cBreakIterator); + return rServiceName.equalsAscii(cBreakIterator); } uno::Sequence< OUString > SAL_CALL diff --git a/i18npool/source/calendar/calendarImpl.cxx b/i18npool/source/calendar/calendarImpl.cxx index e88427d014f5..5f9396b130c6 100644 --- a/i18npool/source/calendar/calendarImpl.cxx +++ b/i18npool/source/calendar/calendarImpl.cxx @@ -349,7 +349,7 @@ const sal_Char cCalendar[] = "com.sun.star.i18n.LocaleCalendar"; sal_Bool SAL_CALL CalendarImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(cCalendar); + return rServiceName.equalsAscii(cCalendar); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index b99df6a90a25..d547134fd538 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -1174,7 +1174,7 @@ Calendar_gregorian::getImplementationName(void) throw( RuntimeException ) sal_Bool SAL_CALL Calendar_gregorian::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(cCalendar); + return rServiceName.equalsAscii(cCalendar); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/characterclassification/cclass_unicode.cxx b/i18npool/source/characterclassification/cclass_unicode.cxx index a729ca8f4c3b..d5ce0b77d1ae 100644 --- a/i18npool/source/characterclassification/cclass_unicode.cxx +++ b/i18npool/source/characterclassification/cclass_unicode.cxx @@ -270,7 +270,7 @@ OUString SAL_CALL cclass_Unicode::getImplementationName() throw( RuntimeExceptio sal_Bool SAL_CALL cclass_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(cClass); + return rServiceName.equalsAscii(cClass); } Sequence< OUString > SAL_CALL cclass_Unicode::getSupportedServiceNames() throw( RuntimeException ) diff --git a/i18npool/source/characterclassification/characterclassificationImpl.cxx b/i18npool/source/characterclassification/characterclassificationImpl.cxx index e7fe8e692958..d65b5a5e8018 100644 --- a/i18npool/source/characterclassification/characterclassificationImpl.cxx +++ b/i18npool/source/characterclassification/characterclassificationImpl.cxx @@ -205,7 +205,7 @@ sal_Bool SAL_CALL CharacterClassificationImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(cClass); + return rServiceName.equalsAscii(cClass); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/collator/chaptercollator.cxx b/i18npool/source/collator/chaptercollator.cxx index a4630fa363b7..5193b73c4299 100644 --- a/i18npool/source/collator/chaptercollator.cxx +++ b/i18npool/source/collator/chaptercollator.cxx @@ -85,7 +85,7 @@ ChapterCollator::getImplementationName() throw( RuntimeException ) sal_Bool SAL_CALL ChapterCollator::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(cChapCollator); + return rServiceName.equalsAscii(cChapCollator); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/collator/collator_unicode.cxx b/i18npool/source/collator/collator_unicode.cxx index 7eaba045c572..cca247764ed9 100644 --- a/i18npool/source/collator/collator_unicode.cxx +++ b/i18npool/source/collator/collator_unicode.cxx @@ -250,7 +250,7 @@ Collator_Unicode::getImplementationName() throw( RuntimeException ) sal_Bool SAL_CALL Collator_Unicode::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(implementationName); + return rServiceName.equalsAscii(implementationName); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/inputchecker/inputsequencechecker.cxx b/i18npool/source/inputchecker/inputsequencechecker.cxx index d1a6e881683a..5d41620fceab 100644 --- a/i18npool/source/inputchecker/inputsequencechecker.cxx +++ b/i18npool/source/inputchecker/inputsequencechecker.cxx @@ -142,7 +142,7 @@ InputSequenceCheckerImpl::getImplementationName(void) throw( RuntimeException ) sal_Bool SAL_CALL InputSequenceCheckerImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(serviceName); + return rServiceName.equalsAscii(serviceName); } Sequence< OUString > SAL_CALL diff --git a/i18npool/source/numberformatcode/numberformatcode.cxx b/i18npool/source/numberformatcode/numberformatcode.cxx index 9c3cae7987a4..6359a43f1fa2 100644 --- a/i18npool/source/numberformatcode/numberformatcode.cxx +++ b/i18npool/source/numberformatcode/numberformatcode.cxx @@ -275,7 +275,7 @@ sal_Bool SAL_CALL NumberFormatCodeMapper::supportsService(const OUString& rServiceName) throw( ::com::sun::star::uno::RuntimeException ) { - return !rServiceName.compareToAscii(cNumFormat); + return rServiceName.equalsAscii(cNumFormat); } ::com::sun::star::uno::Sequence< OUString > SAL_CALL diff --git a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx index f9491b2b3318..8693fb3a42cd 100644 --- a/i18npool/source/ordinalsuffix/ordinalsuffix.cxx +++ b/i18npool/source/ordinalsuffix/ordinalsuffix.cxx @@ -142,7 +142,7 @@ OUString SAL_CALL OrdinalSuffix::getImplementationName(void) throw( RuntimeExcep sal_Bool SAL_CALL OrdinalSuffix::supportsService( const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(cOrdinalSuffix); + return rServiceName.equalsAscii(cOrdinalSuffix); } Sequence< OUString > SAL_CALL OrdinalSuffix::getSupportedServiceNames(void) throw( RuntimeException ) diff --git a/i18npool/source/transliteration/transliterationImpl.cxx b/i18npool/source/transliteration/transliterationImpl.cxx index 6713dd802966..2af62a742269 100644 --- a/i18npool/source/transliteration/transliterationImpl.cxx +++ b/i18npool/source/transliteration/transliterationImpl.cxx @@ -643,7 +643,7 @@ TransliterationImpl::getImplementationName() throw( RuntimeException ) sal_Bool SAL_CALL TransliterationImpl::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii(cTrans); + return rServiceName.equalsAscii(cTrans); } Sequence< OUString > SAL_CALL diff --git a/i18nutil/source/utility/paper.cxx b/i18nutil/source/utility/paper.cxx index 00dec24fbfe1..2447bfc7813b 100644 --- a/i18nutil/source/utility/paper.cxx +++ b/i18nutil/source/utility/paper.cxx @@ -408,58 +408,58 @@ PaperInfo PaperInfo::getDefaultPaperForLocale( if ( //United States, Letter - !rLocale.Country.compareToAscii("US") || + rLocale.Country.equalsAscii("US") || //Puerto Rico: // http://unicode.org/cldr/trac/ticket/1710 // http://sources.redhat.com/ml/libc-hacker/2001-07/msg00046.html - !rLocale.Country.compareToAscii("PR") || + rLocale.Country.equalsAscii("PR") || //Canada: // http://sources.redhat.com/ml/libc-hacker/2001-07/msg00053.html - !rLocale.Country.compareToAscii("CA") || + rLocale.Country.equalsAscii("CA") || //Venuzuela: // http://unicode.org/cldr/trac/ticket/1710 // https://www.redhat.com/archives/fedora-devel-list/2008-August/msg00019.html - !rLocale.Country.compareToAscii("VE") || + rLocale.Country.equalsAscii("VE") || //Chile: // http://unicode.org/cldr/trac/ticket/1710 // https://www.redhat.com/archives/fedora-devel-list/2008-August/msg00240.html - !rLocale.Country.compareToAscii("CL") || + rLocale.Country.equalsAscii("CL") || //Mexico: // http://unicode.org/cldr/trac/ticket/1710 // http://qa.openoffice.org/issues/show_bug.cgi?id=49739 - !rLocale.Country.compareToAscii("MX") || + rLocale.Country.equalsAscii("MX") || //Colombia: // http://unicode.org/cldr/trac/ticket/1710 // http://qa.openoffice.org/issues/show_bug.cgi?id=69703 - !rLocale.Country.compareToAscii("CO") || + rLocale.Country.equalsAscii("CO") || //Philippines: // http://unicode.org/cldr/trac/ticket/1710 // http://ubuntuliving.blogspot.com/2008/07/default-paper-size-in-evince.html // http://www.gov.ph/faqs/driverslicense.asp - !rLocale.Country.compareToAscii("PH") || + rLocale.Country.equalsAscii("PH") || //Belize: // http://unicode.org/cldr/trac/ticket/2585 // http://www.belize.gov.bz/ct.asp?xItem=1666&ctNode=486&mp=27 - !rLocale.Country.compareToAscii("BZ") || + rLocale.Country.equalsAscii("BZ") || //Costa Rica: // http://unicode.org/cldr/trac/ticket/2585 // http://sources.redhat.com/bugzilla/show_bug.cgi?id=11258 - !rLocale.Country.compareToAscii("CR") || + rLocale.Country.equalsAscii("CR") || //Guatemala: // http://unicode.org/cldr/trac/ticket/2585 // http://sources.redhat.com/bugzilla/show_bug.cgi?id=10936 - !rLocale.Country.compareToAscii("GT") || + rLocale.Country.equalsAscii("GT") || //Nicaragua: // http://unicode.org/cldr/trac/ticket/2585 - !rLocale.Country.compareToAscii("NI") || + rLocale.Country.equalsAscii("NI") || //Panama: // http://unicode.org/cldr/trac/ticket/2585 // http://www.minsa.gob.pa/minsa/tl_files/documents/baner_informativo/INSTRUMENTO%20DE%20INVESTIGACION%20DE%20RAAV%202009.pdf - !rLocale.Country.compareToAscii("PA") || + rLocale.Country.equalsAscii("PA") || //El Salvador: // http://unicode.org/cldr/trac/ticket/2585 // http://www.tse.gob.sv - !rLocale.Country.compareToAscii("SV") + rLocale.Country.equalsAscii("SV") ) { eType = PAPER_LETTER; diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx index 60f428f39581..c9428f13286a 100644 --- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx +++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx @@ -885,7 +885,7 @@ void * SAL_CALL Hyphenator_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { void * pRet = 0; - if ( !Hyphenator::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( Hyphenator::getImplementationName_Static().equalsAscii( pImplName ) ) { Reference< XSingleServiceFactory > xFactory = cppu::createOneInstanceFactory( diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx b/lingucomponent/source/spellcheck/spell/sspellimp.cxx index cec853547039..e3a79df0fe66 100644 --- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx +++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx @@ -668,7 +668,7 @@ void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { void * pRet = 0; - if ( !SpellChecker::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( SpellChecker::getImplementationName_Static().equalsAscii( pImplName ) ) { Reference< XSingleServiceFactory > xFactory = cppu::createOneInstanceFactory( diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx index e549e45847af..f22286f8a4b9 100644 --- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx +++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx @@ -682,7 +682,7 @@ void * SAL_CALL Thesaurus_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { void * pRet = 0; - if ( !Thesaurus::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( Thesaurus::getImplementationName_Static().equalsAscii( pImplName ) ) { Reference< XSingleServiceFactory > xFactory = diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index c924cc3da5d8..b6d65fa2b4fb 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -670,7 +670,7 @@ void * SAL_CALL ConvDicList_getFactory( XMultiServiceFactory * pServiceManager, void * ) { void * pRet = 0; - if ( !ConvDicList::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( ConvDicList::getImplementationName_Static().equalsAscii( pImplName ) ) { uno::Reference< XSingleServiceFactory > xFactory = cppu::createOneInstanceFactory( diff --git a/linguistic/source/dlistimp.cxx b/linguistic/source/dlistimp.cxx index 9d8661515a3c..77ebcea62de7 100644 --- a/linguistic/source/dlistimp.cxx +++ b/linguistic/source/dlistimp.cxx @@ -764,7 +764,7 @@ void * SAL_CALL DicList_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { void * pRet = 0; - if ( !DicList::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( DicList::getImplementationName_Static().equalsAscii( pImplName ) ) { uno::Reference< XSingleServiceFactory > xFactory = cppu::createOneInstanceFactory( diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 5f2c51f658b5..430749ed2b51 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -1144,7 +1144,7 @@ void * SAL_CALL GrammarCheckingIterator_getFactory( void * /*pRegistryKey*/ ) { void * pRet = 0; - if ( !GrammarCheckingIterator_getImplementationName().compareToAscii( pImplName ) ) + if ( GrammarCheckingIterator_getImplementationName().equalsAscii( pImplName ) ) { uno::Reference< lang::XSingleServiceFactory > xFactory = cppu::createOneInstanceFactory( diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 924531b02d64..800ed673994e 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -484,7 +484,7 @@ void * SAL_CALL LinguProps_getFactory( const sal_Char * pImplName, XMultiServiceFactory *pServiceManager, void * ) { void * pRet = 0; - if ( !LinguProps::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( LinguProps::getImplementationName_Static().equalsAscii( pImplName ) ) { Reference< XSingleServiceFactory > xFactory = cppu::createOneInstanceFactory( diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index ff8837ae97e8..77c8820d3634 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -466,7 +466,7 @@ void * SAL_CALL SpellChecker_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { void * pRet = 0; - if ( !SpellChecker::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( SpellChecker::getImplementationName_Static().equalsAscii( pImplName ) ) { Reference< XSingleServiceFactory > xFactory = cppu::createOneInstanceFactory( diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index bd9b1591209c..ede0a638d26f 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -152,19 +152,19 @@ void OConnection::construct(const OUString& url, const Sequence< PropertyValue > m_settings.connectionURL = url; for (;pIter != pEnd;++pIter) { - if (!pIter->Name.compareToAscii("user")) { + if (pIter->Name.equalsAscii("user")) { OSL_VERIFY( pIter->Value >>= aUser ); - } else if (!pIter->Name.compareToAscii("password")) { + } else if (pIter->Name.equalsAscii("password")) { OSL_VERIFY( pIter->Value >>= aPass ); - } else if (!pIter->Name.compareToAscii("LocalSocket")) { + } else if (pIter->Name.equalsAscii("LocalSocket")) { OSL_VERIFY( pIter->Value >>= sUnixSocket ); unixSocketPassed = true; - } else if (!pIter->Name.compareToAscii("NamedPipe")) { + } else if (pIter->Name.equalsAscii("NamedPipe")) { OSL_VERIFY( pIter->Value >>= sNamedPipe ); namedPipePassed = true; - } else if ( !pIter->Name.compareToAscii("PublicConnectionURL")) { + } else if ( pIter->Name.equalsAscii("PublicConnectionURL")) { OSL_VERIFY( pIter->Value >>= m_settings.connectionURL ); - } else if ( !pIter->Name.compareToAscii("NewURL")) { // legacy name for "PublicConnectionURL" + } else if ( pIter->Name.equalsAscii("NewURL")) { // legacy name for "PublicConnectionURL" OSL_VERIFY( pIter->Value >>= m_settings.connectionURL ); } } diff --git a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx index de7fbe29e7b6..3d6a5ef16d59 100644 --- a/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx +++ b/odk/examples/DevelopersGuide/Database/DriverSkeleton/SConnection.cxx @@ -102,28 +102,28 @@ void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyV const PropertyValue *pEnd = pBegin + info.getLength(); for(;pBegin != pEnd;++pBegin) { - if(!pBegin->Name.compareToAscii(pTimeout)) + if(pBegin->Name.equalsAscii(pTimeout)) pBegin->Value >>= nTimeout; - else if(!pBegin->Name.compareToAscii(pSilent)) + else if(pBegin->Name.equalsAscii(pSilent)) pBegin->Value >>= bSilent; - else if(!pBegin->Name.compareToAscii(pUser)) + else if(pBegin->Name.equalsAscii(pUser)) { pBegin->Value >>= aUID; - aDSN = aDSN + ::rtl::OUString(";UID=") + aUID; + aDSN = aDSN + ";UID=" + aUID; } - else if(!pBegin->Name.compareToAscii(pPwd)) + else if(pBegin->Name.equalsAscii(pPwd)) { pBegin->Value >>= aPWD; - aDSN = aDSN + ::rtl::OUString(";PWD=") + aPWD; + aDSN = aDSN + ";PWD=" + aPWD; } - else if(!pBegin->Name.compareToAscii(pUseCatalog)) + else if(pBegin->Name.equalsAscii(pUseCatalog)) { pBegin->Value >>= m_bUseCatalog; } - else if(!pBegin->Name.compareToAscii(pSysDrv)) + else if(pBegin->Name.equalsAscii(pSysDrv)) { pBegin->Value >>= aSysDrvSettings; - aDSN += ::rtl::OUString(";"); + aDSN += ";"; aDSN += aSysDrvSettings; } } diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index b617ac9dc90e..74b0b9111d31 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -146,7 +146,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32& sal_Bool CreateTableStyle(TableStyle* &pTableStyle , const OUString& styleId) { sal_Bool createdTblStyle = sal_False; - if(!styleId.compareToAscii("{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}")){ //Medium Style 2 Accenat 1 + if(styleId.equalsAscii("{5C22544A-7EE6-4342-B048-85BDC9FD1C3A}")){ //Medium Style 2 Accenat 1 pTableStyle = new TableStyle(); createdTblStyle = sal_True; //first row style @@ -182,7 +182,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32& SetTableStyleProperties(pTableStyle, XML_accent1, XML_dk1, XML_lt1); } - else if (!styleId.compareToAscii("{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}")) //Medium Style 2 Accent 2 + else if (styleId.equalsAscii("{21E4AEA4-8DFA-4A89-87EB-49C32662AFE0}")) //Medium Style 2 Accent 2 { pTableStyle = new TableStyle(); createdTblStyle = sal_True; @@ -214,7 +214,7 @@ static void SetTableStyleProperties(TableStyle* &pTableStyle , const sal_Int32& SetTableStyleProperties(pTableStyle, XML_accent2, XML_dk1, XML_lt1); } - else if (!styleId.compareToAscii("{C4B1156A-380E-4F78-BDF5-A606A8083BF9}")) //Medium Style 4 Accent 4 + else if (styleId.equalsAscii("{C4B1156A-380E-4F78-BDF5-A606A8083BF9}")) //Medium Style 4 Accent 4 { pTableStyle = new TableStyle(); createdTblStyle = sal_True; diff --git a/padmin/source/cmddlg.cxx b/padmin/source/cmddlg.cxx index 8756fa613690..8e57395432b2 100644 --- a/padmin/source/cmddlg.cxx +++ b/padmin/source/cmddlg.cxx @@ -292,7 +292,7 @@ RTSCommandPage::RTSCommandPage( RTSDialog* pParent ) : m_aPdfDirectoryText.Show( sal_True ); m_aConfigureBox.SelectEntryPos( m_nPdfEntry ); } - else if( ! aToken.compareToAscii( "external_dialog" ) ) + else if( aToken.equalsAscii( "external_dialog" ) ) { m_aExternalCB.Check(); m_bWasExternalDialog = true; diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx index 4f125516222c..6ee045a55c9c 100644 --- a/sc/source/ui/unoobj/dispuno.cxx +++ b/sc/source/ui/unoobj/dispuno.cxx @@ -107,8 +107,8 @@ uno::Reference<frame::XDispatch> SAL_CALL ScDispatchProviderInterceptor::queryDi uno::Reference<frame::XDispatch> xResult; // create some dispatch ... if ( pViewShell && ( - !aURL.Complete.compareToAscii(cURLInsertColumns) || - !aURL.Complete.compareToAscii(cURLDocDataSource) ) ) + aURL.Complete.equalsAscii(cURLInsertColumns) || + aURL.Complete.equalsAscii(cURLDocDataSource) ) ) { if (!m_xMyDispatch.is()) m_xMyDispatch = new ScDispatch( pViewShell ); @@ -233,7 +233,7 @@ void SAL_CALL ScDispatch::dispatch( const util::URL& aURL, SolarMutexGuard aGuard; sal_Bool bDone = false; - if ( pViewShell && !aURL.Complete.compareToAscii(cURLInsertColumns) ) + if ( pViewShell && aURL.Complete.equalsAscii(cURLInsertColumns) ) { ScViewData* pViewData = pViewShell->GetViewData(); ScAddress aPos( pViewData->GetCurX(), pViewData->GetCurY(), pViewData->GetTabNo() ); @@ -290,7 +290,7 @@ void SAL_CALL ScDispatch::addStatusListener( aEvent.Source.set(static_cast<cppu::OWeakObject*>(this)); aEvent.FeatureURL = aURL; - if ( !aURL.Complete.compareToAscii(cURLDocDataSource) ) + if ( aURL.Complete.equalsAscii(cURLDocDataSource) ) { uno::Reference<frame::XStatusListener>* pObj = new uno::Reference<frame::XStatusListener>( xListener ); @@ -321,7 +321,7 @@ void SAL_CALL ScDispatch::removeStatusListener( { SolarMutexGuard aGuard; - if ( !aURL.Complete.compareToAscii(cURLDocDataSource) ) + if ( aURL.Complete.equalsAscii(cURLDocDataSource) ) { sal_uInt16 nCount = aDataSourceListeners.size(); for ( sal_uInt16 n=nCount; n--; ) diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 2770ab1ea13b..69013f8c4deb 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -231,10 +231,9 @@ bool SwPaM::Find( const SearchOptions& rSearchOpt, bool bSearchInNotes , utl::Te const bool bRegSearch = SearchAlgorithms_REGEXP == rSearchOpt.algorithmType; const bool bChkEmptyPara = bRegSearch && 2 == rSearchOpt.searchString.getLength() && - ( !rSearchOpt.searchString.compareToAscii( "^$" ) || - !rSearchOpt.searchString.compareToAscii( "$^" ) ); - const bool bChkParaEnd = bRegSearch && 1 == rSearchOpt.searchString.getLength() && - !rSearchOpt.searchString.compareToAscii( "$" ); + ( rSearchOpt.searchString.equalsAscii( "^$" ) || + rSearchOpt.searchString.equalsAscii( "$^" ) ); + const bool bChkParaEnd = bRegSearch && rSearchOpt.searchString.equalsAscii( "$" ); // LanguageType eLastLang = 0; while( 0 != ( pNode = ::GetNode( *pPam, bFirst, fnMove, bInReadOnly ) )) diff --git a/sw/source/core/fields/authfld.cxx b/sw/source/core/fields/authfld.cxx index 3f3e1af3bc67..ff6ec0cad661 100644 --- a/sw/source/core/fields/authfld.cxx +++ b/sw/source/core/fields/authfld.cxx @@ -652,7 +652,7 @@ bool SwAuthorityField::QueryValue( Any& rAny, sal_uInt16 /*nWhichId*/ ) const static sal_Int16 lcl_Find(const OUString& rFieldName) { for(sal_Int16 i = 0; i < AUTH_FIELD_END; i++) - if(!rFieldName.compareToAscii(aFieldNames[i])) + if(rFieldName.equalsAscii(aFieldNames[i])) return i; return -1; } diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 35157a2bef29..9d8290189843 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -815,18 +815,17 @@ OUString SwXFrame::getImplementationName(void) throw( uno::RuntimeException ) sal_Bool SwXFrame::supportsService(const :: OUString& rServiceName) throw( uno::RuntimeException ) { - return !rServiceName.compareToAscii("com.sun.star.text.BaseFrame")|| - !rServiceName.compareToAscii("com.sun.star.text.TextContent") || - !rServiceName.compareToAscii("com.sun.star.document.LinkTarget"); + return rServiceName.equalsAscii("com.sun.star.text.BaseFrame") || + rServiceName.equalsAscii("com.sun.star.text.TextContent") || + rServiceName.equalsAscii("com.sun.star.document.LinkTarget"); } uno::Sequence< OUString > SwXFrame::getSupportedServiceNames(void) throw( uno::RuntimeException ) { uno::Sequence< OUString > aRet(3); - OUString* pArray = aRet.getArray(); - pArray[0] = "com.sun.star.text.BaseFrame"; - pArray[1] = "com.sun.star.text.TextContent"; - pArray[2] = "com.sun.star.document.LinkTarget"; + aRet[0] = "com.sun.star.text.BaseFrame"; + aRet[1] = "com.sun.star.text.TextContent"; + aRet[2] = "com.sun.star.document.LinkTarget"; return aRet; } diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 39230e634044..0cb63637327d 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -123,7 +123,7 @@ static OUString lcl_getFlatURL( uno::Reference<beans::XPropertySet>& xSourceProp else if(aInfo[nInfo].Name == "CharSet") aInfo[nInfo].Value >>= sCharSet; } - if(!sCharSet.compareToAscii( cUTF8 )) + if(sCharSet.equalsAscii( cUTF8 )) { sURL = sDBURL.copy(10); //#i97577# at this point the 'URL' can also be a file name! diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx index fb7646c68774..97200ec5edd7 100644 --- a/sw/source/ui/dbui/mailmergehelper.cxx +++ b/sw/source/ui/dbui/mailmergehelper.cxx @@ -657,11 +657,11 @@ uno::Any SwConnectionContext::getValueByName( const OUString& rName ) throw (uno::RuntimeException) { uno::Any aRet; - if( !rName.compareToAscii( "ServerName" )) + if( rName.equalsAscii( "ServerName" )) aRet <<= m_sMailServer; - else if( !rName.compareToAscii( "Port" )) + else if( rName.equalsAscii( "Port" )) aRet <<= (sal_Int32) m_nPort; - else if( !rName.compareToAscii( "ConnectionType" )) + else if( rName.equalsAscii( "ConnectionType" )) aRet <<= m_sConnectionType; return aRet; } diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx index 6af22e9a214e..0df0f8f8fcb3 100644 --- a/sw/source/ui/uno/unodispatch.cxx +++ b/sw/source/ui/uno/unodispatch.cxx @@ -71,10 +71,10 @@ uno::Reference< frame::XDispatch > SwXDispatchProviderInterceptor::queryDispatch // create some dispatch ... if(m_pView && aURL.Complete.startsWith(".uno:DataSourceBrowser/")) { - if(!aURL.Complete.compareToAscii(cURLFormLetter) || - !aURL.Complete.compareToAscii(cURLInsertContent) || - !aURL.Complete.compareToAscii(cURLInsertColumns)|| - !aURL.Complete.compareToAscii(cURLDocumentDataSource)) + if(aURL.Complete.equalsAscii(cURLFormLetter) || + aURL.Complete.equalsAscii(cURLInsertContent) || + aURL.Complete.equalsAscii(cURLInsertColumns)|| + aURL.Complete.equalsAscii(cURLDocumentDataSource)) { if(!m_xDispatch.is()) m_xDispatch = new SwXDispatch(*m_pView); @@ -209,17 +209,17 @@ void SwXDispatch::dispatch( throw uno::RuntimeException(); SwWrtShell& rSh = m_pView->GetWrtShell(); SwNewDBMgr* pNewDBMgr = rSh.GetNewDBMgr(); - if(!aURL.Complete.compareToAscii(cURLInsertContent)) + if(aURL.Complete.equalsAscii(cURLInsertContent)) { ::svx::ODataAccessDescriptor aDescriptor(aArgs); SwMergeDescriptor aMergeDesc( DBMGR_MERGE, rSh, aDescriptor ); pNewDBMgr->MergeNew(aMergeDesc); } - else if(!aURL.Complete.compareToAscii(cURLInsertColumns)) + else if(aURL.Complete.equalsAscii(cURLInsertColumns)) { pNewDBMgr->InsertText(rSh, aArgs); } - else if(!aURL.Complete.compareToAscii(cURLFormLetter)) + else if(aURL.Complete.equalsAscii(cURLFormLetter)) { SfxUsrAnyItem aDBProperties(FN_PARAM_DATABASE_PROPERTIES, uno::makeAny(aArgs)); m_pView->GetViewFrame()->GetDispatcher()->Execute( @@ -227,11 +227,11 @@ void SwXDispatch::dispatch( SFX_CALLMODE_ASYNCHRON, &aDBProperties, 0L); } - else if(!aURL.Complete.compareToAscii(cURLDocumentDataSource)) + else if(aURL.Complete.equalsAscii(cURLDocumentDataSource)) { OSL_FAIL("SwXDispatch::dispatch: this URL is not to be dispatched!"); } - else if(!aURL.Complete.compareToAscii(cInternalDBChangeNotification)) + else if(aURL.Complete.equalsAscii(cInternalDBChangeNotification)) { frame::FeatureStateEvent aEvent; aEvent.IsEnabled = sal_True; @@ -250,7 +250,7 @@ void SwXDispatch::dispatch( for(aListIter = m_aListenerList.begin(); aListIter != m_aListenerList.end(); ++aListIter) { StatusStruct_Impl aStatus = *aListIter; - if(!aStatus.aURL.Complete.compareToAscii(cURLDocumentDataSource)) + if(aStatus.aURL.Complete.equalsAscii(cURLDocumentDataSource)) { aEvent.FeatureURL = aStatus.aURL; aStatus.xListener->statusChanged( aEvent ); @@ -280,7 +280,7 @@ void SwXDispatch::addStatusListener( aEvent.FeatureURL = aURL; // one of the URLs requires a special state .... - if (!aURL.Complete.compareToAscii(cURLDocumentDataSource)) + if (aURL.Complete.equalsAscii(cURLDocumentDataSource)) { const SwDBData& rData = m_pView->GetWrtShell().GetDBDesc(); @@ -352,7 +352,7 @@ void SwXDispatch::selectionChanged( const lang::EventObject& ) throw(uno::Runti { StatusStruct_Impl aStatus = *aListIter; aEvent.FeatureURL = aStatus.aURL; - if (0 != aStatus.aURL.Complete.compareToAscii(cURLDocumentDataSource)) + if (!aStatus.aURL.Complete.equalsAscii(cURLDocumentDataSource)) // the document's data source does not depend on the selection, so it's state does not change here aStatus.xListener->statusChanged( aEvent ); } diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx index cdb761759147..f6565e76bb96 100644 --- a/sw/source/ui/uno/unotxvw.cxx +++ b/sw/source/ui/uno/unotxvw.cxx @@ -1698,13 +1698,13 @@ OUString SwXTextViewCursor::getImplementationName(void) throw( RuntimeException sal_Bool SwXTextViewCursor::supportsService(const OUString& rServiceName) throw( RuntimeException ) { - return !rServiceName.compareToAscii("com.sun.star.text.TextViewCursor") || - !rServiceName.compareToAscii("com.sun.star.style.CharacterProperties") || - !rServiceName.compareToAscii("com.sun.star.style.CharacterPropertiesAsian") || - !rServiceName.compareToAscii("com.sun.star.style.CharacterPropertiesComplex") || - !rServiceName.compareToAscii("com.sun.star.style.ParagraphProperties") || - !rServiceName.compareToAscii("com.sun.star.style.ParagraphPropertiesAsian") || - !rServiceName.compareToAscii("com.sun.star.style.ParagraphPropertiesComplex"); + return rServiceName.equalsAscii("com.sun.star.text.TextViewCursor") || + rServiceName.equalsAscii("com.sun.star.style.CharacterProperties") || + rServiceName.equalsAscii("com.sun.star.style.CharacterPropertiesAsian") || + rServiceName.equalsAscii("com.sun.star.style.CharacterPropertiesComplex") || + rServiceName.equalsAscii("com.sun.star.style.ParagraphProperties") || + rServiceName.equalsAscii("com.sun.star.style.ParagraphPropertiesAsian") || + rServiceName.equalsAscii("com.sun.star.style.ParagraphPropertiesComplex"); } Sequence< OUString > SwXTextViewCursor::getSupportedServiceNames(void) throw( RuntimeException ) diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 9938bb5875a8..dbf49d75f8f1 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -114,7 +114,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpcmis1_component_getFactory( c (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; - if ( !::cmis::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( ::cmis::ContentProvider::getImplementationName_Static().equalsAscii( pImplName ) ) xFactory = ::cmis::ContentProvider::createServiceFactory( xSMgr ); if ( xFactory.is() ) diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 6737417c9b9d..fa3c806a1b92 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -103,7 +103,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgio1_component_getFactory( co #if !GLIB_CHECK_VERSION(2,36,0) g_type_init(); #endif - if ( !::gio::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( ::gio::ContentProvider::getImplementationName_Static().equalsAscii( pImplName ) ) xFactory = ::gio::ContentProvider::createServiceFactory( xSMgr ); if ( xFactory.is() ) diff --git a/ucb/source/ucp/gvfs/gvfs_provider.cxx b/ucb/source/ucp/gvfs/gvfs_provider.cxx index ec15ae0abee0..2b528edfad08 100644 --- a/ucb/source/ucp/gvfs/gvfs_provider.cxx +++ b/ucb/source/ucp/gvfs/gvfs_provider.cxx @@ -152,7 +152,7 @@ extern "C" SAL_DLLPUBLIC_EXPORT void * SAL_CALL ucpgvfs1_component_getFactory( c (reinterpret_cast< lang::XMultiServiceFactory * >( pServiceManager ) ); uno::Reference< lang::XSingleServiceFactory > xFactory; - if ( !::gvfs::ContentProvider::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( ::gvfs::ContentProvider::getImplementationName_Static().equalsAscii( pImplName ) ) xFactory = ::gvfs::ContentProvider::createServiceFactory( xSMgr ); if ( xFactory.is() ) { diff --git a/vcl/generic/fontmanager/fontmanager.cxx b/vcl/generic/fontmanager/fontmanager.cxx index 945899763f21..57307c26a51d 100644 --- a/vcl/generic/fontmanager/fontmanager.cxx +++ b/vcl/generic/fontmanager/fontmanager.cxx @@ -405,8 +405,8 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, // try to parse the font name and decide whether it might be a // japanese font. Who invented this PITA ? OUString aPSNameLastToken( aPSName.copy( aPSName.lastIndexOf( '-' )+1 ) ); - if( ! aPSNameLastToken.compareToAscii( "H" ) || - ! aPSNameLastToken.compareToAscii( "V" ) ) + if( aPSNameLastToken.equalsAscii( "H" ) || + aPSNameLastToken.equalsAscii( "V" ) ) { static const char* pEncs[] = { @@ -430,7 +430,7 @@ bool PrintFontManager::PrintFont::readAfmMetrics( MultiAtomProvider* pProvider, if( nIndex == -1 ) break; nOffset = 0; - if( ! aToken.compareToAscii( pEncs[enc] ) ) + if( aToken.equalsAscii( pEncs[enc] ) ) { m_aEncoding = aEncs[ enc ]; m_bFontEncodingOnly = true; diff --git a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx index 90a25bb4da9a..487ebc67d42e 100644 --- a/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx +++ b/vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx @@ -1895,7 +1895,7 @@ GtkFileFilter* SalGtkFilePicker::implAddFilter( const OUString& rFilter, const O static const OUString aStarDot( "*." ); OUString aTokens; - bool bAllGlob = !rType.compareToAscii( "*.*" ) || !rType.compareToAscii( "*" ); + bool bAllGlob = rType.equalsAscii( "*.*" ) || rType.equalsAscii( "*" ); if (bAllGlob) gtk_file_filter_add_pattern( filter, "*" ); else diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 299acf555e2d..6eeb7068dbeb 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -391,7 +391,7 @@ namespace xmloff DBG_CHECK_PROPERTY( PROPERTY_TARGETFRAME, OUString ); OUString sTargetFrame = comphelper::getString(m_xProps->getPropertyValue(PROPERTY_TARGETFRAME)); - if (0 != sTargetFrame.compareToAscii("_blank")) + if( ! sTargetFrame.equalsAscii("_blank") ) { // an empty string and "_blank" have the same meaning and don't have to be written AddAttribute(OAttributeMetaData::getCommonControlAttributeNamespace(CCA_TARGET_FRAME) ,OAttributeMetaData::getCommonControlAttributeName(CCA_TARGET_FRAME) |