diff options
-rw-r--r-- | extensions/source/dbpilots/unoautopilot.inl | 2 | ||||
-rw-r--r-- | include/connectivity/sqlnode.hxx | 2 | ||||
-rw-r--r-- | include/vbahelper/vbaaccesshelper.hxx | 2 | ||||
-rw-r--r-- | lingucomponent/source/spellcheck/macosxspell/macspellimp.mm | 2 | ||||
-rw-r--r-- | sc/source/ui/unoobj/eventuno.cxx | 2 | ||||
-rw-r--r-- | scaddins/source/analysis/analysis.cxx | 2 | ||||
-rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 2 | ||||
-rw-r--r-- | sw/source/filter/html/htmlforw.cxx | 2 | ||||
-rw-r--r-- | ucb/source/ucp/file/filrset.cxx | 3 | ||||
-rw-r--r-- | unotools/source/ucbhelper/ucblockbytes.cxx | 6 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/databases.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/provider.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 2 | ||||
-rw-r--r-- | xmlhelp/source/treeview/tvfactory.cxx | 2 |
14 files changed, 16 insertions, 17 deletions
diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index c79254bd377e..4796e23bf0cd 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -107,7 +107,7 @@ void OUnoAutoPilot<TYPE, SERVICEINFO>::implInitialize(const com::sun::star::uno: { ::com::sun::star::beans::PropertyValue aArgument; if (_rValue >>= aArgument) - if (0 == aArgument.Name.compareToAscii("ObjectModel")) + if (aArgument.Name.equals("ObjectModel")) { aArgument.Value >>= m_xObjectModel; return; diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index 31ceb290eb80..8b3f77265cf2 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -462,7 +462,7 @@ namespace connectivity #define SQL_ISTOKEN(pParseNode, token) ((pParseNode)->isToken() && (pParseNode)->getTokenID() == SQL_TOKEN_##token) #define SQL_ISTOKENOR2(pParseNode, tok0, tok1) ((pParseNode)->isToken() && ( (pParseNode)->getTokenID() == SQL_TOKEN_##tok0 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok1 )) #define SQL_ISTOKENOR3(pParseNode, tok0, tok1, tok2) ((pParseNode)->isToken() && ( (pParseNode)->getTokenID() == SQL_TOKEN_##tok0 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok1 || (pParseNode)->getTokenID() == SQL_TOKEN_##tok2 )) - #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && !(pParseNode)->getTokenValue().compareToAscii(aString)) + #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && (pParseNode)->getTokenValue().equalsAscii(aString)) } #endif // INCLUDED_CONNECTIVITY_SQLNODE_HXX diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx index 833cd9227887..362c2b277248 100644 --- a/include/vbahelper/vbaaccesshelper.hxx +++ b/include/vbahelper/vbaaccesshelper.hxx @@ -57,7 +57,7 @@ namespace ooo const SfxMedium *pMedium = rDocShell.GetMedium(); const SfxFilter *pFilt = pMedium ? pMedium->GetFilter() : NULL; if ( pFilt && pFilt->IsAlienFormat() ) - bRes = ( pFilt->GetMimeType().compareToAscii( pMimeType ) == 0 ); + bRes = pFilt->GetMimeType().equalsAscii( pMimeType ); return bRes; } VBAHELPER_DLLPRIVATE inline bool isAlienExcelDoc( SfxObjectShell& rDocShell ) { return isAlienDoc( rDocShell, "application/vnd.ms-excel" ); } diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm index 9294525e9af4..73f2be909e38 100644 --- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm +++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.mm @@ -557,7 +557,7 @@ void * SAL_CALL MacSpellChecker_getFactory( const sal_Char * pImplName, XMultiServiceFactory * pServiceManager, void * ) { void * pRet = 0; - if ( !MacSpellChecker::getImplementationName_Static().compareToAscii( pImplName ) ) + if ( MacSpellChecker::getImplementationName_Static().equalsAscii( pImplName ) ) { Reference< XSingleServiceFactory > xFactory = cppu::createOneInstanceFactory( diff --git a/sc/source/ui/unoobj/eventuno.cxx b/sc/source/ui/unoobj/eventuno.cxx index 969f680f955d..e72d8062324b 100644 --- a/sc/source/ui/unoobj/eventuno.cxx +++ b/sc/source/ui/unoobj/eventuno.cxx @@ -96,7 +96,7 @@ void SAL_CALL ScSheetEventsObj::replaceByName( const OUString& aName, const uno: if ( rProp.Value >>= aEventType ) { // only "Script" is supported - if ( aEventType.compareToAscii( SC_UNO_SCRIPT ) != 0 ) + if ( ! aEventType.equalsAscii( SC_UNO_SCRIPT ) ) throw lang::IllegalArgumentException(); } } diff --git a/scaddins/source/analysis/analysis.cxx b/scaddins/source/analysis/analysis.cxx index 8d2470555740..6349b7b27247 100644 --- a/scaddins/source/analysis/analysis.cxx +++ b/scaddins/source/analysis/analysis.cxx @@ -1153,7 +1153,7 @@ OUString SAL_CALL AnalysisAddIn::getComplex( double fR, double fI, const uno::An { const OUString* pSuff = ( const OUString* ) rSuff.getValue(); bi = pSuff->equalsAscii( "i" ) || pSuff->isEmpty(); - if( !bi && pSuff->compareToAscii( "j" ) != 0 ) + if( !bi && !pSuff->equalsAscii( "j" ) ) throw lang::IllegalArgumentException(); } break; diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 79c6ffb99b6e..b5760b613bc9 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -203,7 +203,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( // Sometimes we get a propertyval with name = "Referer" // this is not an argument to be passed to script, so // ignore. - if ( lArgs[ index ].Name.compareToAscii("Referer") != 0 || + if ( !lArgs[ index ].Name.equalsAscii("Referer") || lArgs[ index ].Name.isEmpty() ) { inArgs.realloc( ++argCount ); diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index c2876a79c70e..53454bc9197b 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -771,7 +771,7 @@ Writer& OutHTML_DrawFrmFmtAsControl( Writer& rWrt, const OUString& rVal = *(OUString*)aTmp.getValue(); if( rVal.isEmpty() ) bEmptyValue = true; - else if( rVal.compareToAscii( OOO_STRING_SVTOOLS_HTML_on ) != 0 ) + else if( !rVal.equalsAscii( OOO_STRING_SVTOOLS_HTML_on ) ) sValue = rVal; } break; diff --git a/ucb/source/ucp/file/filrset.cxx b/ucb/source/ucp/file/filrset.cxx index a7a60606a01e..d847271ddf81 100644 --- a/ucb/source/ucp/file/filrset.cxx +++ b/ucb/source/ucp/file/filrset.cxx @@ -708,8 +708,7 @@ XResultSet_impl::getMetaData( { for ( sal_Int32 n = 0; n < m_sProperty.getLength(); ++n ) { - if ( m_sProperty.getConstArray()[ n ].Name.compareToAscii( "Title" ) - == 0 ) + if ( m_sProperty.getConstArray()[ n ].Name.equalsAscii( "Title" ) ) { // @@@ #82177# - Determine correct value! bool bCaseSensitiveChildren = false; diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 8beeec966bd4..6bf08cccd209 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -871,8 +871,8 @@ static bool UCBOpenContentSync( return _UCBOpenContentSync( xLockBytes,xContent,rArg,xSink,xInteract,xProgress,xHandler); - if ( (aScheme.compareToAscii( "http" ) != 0) || - (aScheme.compareToAscii( "https" ) != 0) ) + if ( !aScheme.equalsAscii( "http" ) || + !aScheme.equalsAscii( "https" ) ) xLockBytes->SetStreamValid_Impl(); Reference< XPropertiesChangeListener > xListener; @@ -1108,7 +1108,7 @@ static bool _UCBOpenContentSync( // http protocol must be handled in a special way: during the opening process the input stream may change // only the last inputstream after notifying the document headers is valid - if ( aScheme.compareToAscii("http") != 0 ) + if ( !aScheme.equalsAscii("http") ) xLockBytes->SetStreamValid_Impl(); Reference< XPropertiesChangeListener > xListener = new UcbPropertiesChangeListener_Impl( xLockBytes ); diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx index 73bf69ea48f0..31f96c5e4a4a 100644 --- a/xmlhelp/source/cxxhelp/provider/databases.cxx +++ b/xmlhelp/source/cxxhelp/provider/databases.cxx @@ -419,7 +419,7 @@ const std::vector< OUString >& Databases::getModuleList( const OUString& Languag ( str[idx + 1] == 'c' || str[idx + 1] == 'C' ) && ( str[idx + 2] == 'f' || str[idx + 2] == 'F' ) && ( str[idx + 3] == 'g' || str[idx + 3] == 'G' ) && - ( fileName = fileName.copy(0,idx).toAsciiLowerCase() ).compareToAscii( "picture" ) != 0 ) { + !( fileName = fileName.copy(0,idx).toAsciiLowerCase() ).equalsAscii( "picture" ) ) { if(! m_bShowBasic && fileName.equalsAscii("sbasic") ) continue; m_avModules.push_back( fileName ); diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 88937f553dd8..2d4cb92b089a 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -246,7 +246,7 @@ ContentProvider::elementReplaced(const container::ContainerEvent& Event) OUString accessor; Event.Accessor >>= accessor; - if(accessor.compareToAscii("HelpStyleSheet")) + if(!accessor.equalsAscii("HelpStyleSheet")) return; OUString replacedElement,element; diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx index 1e0a670229c3..174aef46ed09 100644 --- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx +++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx @@ -158,7 +158,7 @@ OUString URLParameter::get_title() { if( isFile() ) return get_the_title(); - else if( m_aModule.compareToAscii("") != 0 ) + else if( !m_aModule.equalsAscii("") ) { StaticModuleInformation* inf = m_pDatabases->getStaticInformationForModule( get_module(), diff --git a/xmlhelp/source/treeview/tvfactory.cxx b/xmlhelp/source/treeview/tvfactory.cxx index d0bd2e955264..110fbfbb1f97 100644 --- a/xmlhelp/source/treeview/tvfactory.cxx +++ b/xmlhelp/source/treeview/tvfactory.cxx @@ -108,7 +108,7 @@ TVFactory::createInstanceWithArguments( if( ! ( Arguments[i] >>= pV ) ) continue; - if( pV.Name.compareToAscii( "nodepath" ) ) + if( !pV.Name.equalsAscii( "nodepath" ) ) continue; if( ! ( pV.Value >>= hierview ) ) |