diff options
author | Thomas Arnhold <thomas@arnhold.org> | 2011-01-20 11:23:45 +0100 |
---|---|---|
committer | Thomas Arnhold <thomas@arnhold.org> | 2011-01-20 11:23:45 +0100 |
commit | 88fa511a7748ff920546bd28ac9e15f5e0ba2fb0 (patch) | |
tree | 4555e53c8209dbeb038221ab142cbb9c445b1330 /embeddedobj/source/general | |
parent | d1041919f51c597b5c098ca716f141e494c22c49 (diff) |
Replace suitable equalsAscii calls with equalsAsciiL.
Done with sed -i 's%\(\.equalsAscii\)(\(\s\?"[^"]\+"\)\(\s\?\))%\1L(\3RTL_CONSTASCII_STRINGPARAM(\2\3)\3)%g'.
Diffstat (limited to 'embeddedobj/source/general')
-rw-r--r-- | embeddedobj/source/general/docholder.cxx | 16 | ||||
-rw-r--r-- | embeddedobj/source/general/intercept.cxx | 2 | ||||
-rw-r--r-- | embeddedobj/source/general/xcreator.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx index c87bff4cd597..d72ab4529ae2 100644 --- a/embeddedobj/source/general/docholder.cxx +++ b/embeddedobj/source/general/docholder.cxx @@ -620,7 +620,7 @@ void DocumentHolder::FindConnectPoints( xMenu->getByIndex( nInd ) >>= aProps; rtl::OUString aCommand; for ( sal_Int32 nSeqInd = 0; nSeqInd < aProps.getLength(); nSeqInd++ ) - if ( aProps[nSeqInd].Name.equalsAscii( "CommandURL" ) ) + if ( aProps[nSeqInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "CommandURL" ) ) ) { aProps[nSeqInd].Value >>= aCommand; break; @@ -629,9 +629,9 @@ void DocumentHolder::FindConnectPoints( if ( !aCommand.getLength() ) throw uno::RuntimeException(); - if ( aCommand.equalsAscii( ".uno:PickList" ) ) + if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:PickList" ) ) ) nConnectPoints[0] = nInd; - else if ( aCommand.equalsAscii( ".uno:WindowList" ) ) + else if ( aCommand.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ".uno:WindowList" ) ) ) nConnectPoints[1] = nInd; } } @@ -1239,11 +1239,11 @@ void SAL_CALL DocumentHolder::notifyEvent( const document::EventObject& Event ) if( m_pEmbedObj && Event.Source == m_xComponent ) { // for now the ignored events are not forwarded, but sent by the object itself - if ( !Event.EventName.equalsAscii( "OnSave" ) - && !Event.EventName.equalsAscii( "OnSaveDone" ) - && !Event.EventName.equalsAscii( "OnSaveAs" ) - && !Event.EventName.equalsAscii( "OnSaveAsDone" ) - && !( Event.EventName.equalsAscii( "OnVisAreaChanged" ) && m_nNoResizeReact ) ) + if ( !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSave" ) ) + && !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveDone" ) ) + && !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveAs" ) ) + && !Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnSaveAsDone" ) ) + && !( Event.EventName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "OnVisAreaChanged" ) ) && m_nNoResizeReact ) ) m_pEmbedObj->PostEvent_Impl( Event.EventName, Event.Source ); } } diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx index db8d735ce11a..7359ee225b4d 100644 --- a/embeddedobj/source/general/intercept.cxx +++ b/embeddedobj/source/general/intercept.cxx @@ -173,7 +173,7 @@ Interceptor::dispatch( while( nInd < aNewArgs.getLength() ) { - if ( aNewArgs[nInd].Name.equalsAscii( "SaveTo" ) ) + if ( aNewArgs[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "SaveTo" ) ) ) { aNewArgs[nInd].Value <<= sal_True; break; diff --git a/embeddedobj/source/general/xcreator.cxx b/embeddedobj/source/general/xcreator.cxx index 84804d41b7de..9654f0004e9a 100644 --- a/embeddedobj/source/general/xcreator.cxx +++ b/embeddedobj/source/general/xcreator.cxx @@ -369,7 +369,7 @@ uno::Reference< uno::XInterface > SAL_CALL UNOEmbeddedObjectCreator::createInsta // check if there is URL, URL must exist ::rtl::OUString aURL; for ( sal_Int32 nInd = 0; nInd < aTempMedDescr.getLength(); nInd++ ) - if ( aTempMedDescr[nInd].Name.equalsAscii( "URL" ) ) + if ( aTempMedDescr[nInd].Name.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "URL" ) ) ) aTempMedDescr[nInd].Value >>= aURL; if ( !aURL.getLength() ) |