diff options
| author | Noel Grandin <noel@peralex.com> | 2013-08-28 17:28:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-08-29 09:30:19 +0200 |
| commit | 1451499bdbe4258708334f53ea6198965159bf7f (patch) | |
| tree | b4d085ba0adc4e7cace29b2c644aa3eebbe43e23 /sfx2 | |
| parent | 8f81b215a05d242aea06fdfa54ebe22e9c266d65 (diff) | |
convert sfx2/source/control/* from String to OUString
Change-Id: I89f5cfe46b789a4a08d4b9f096e95d7cf0a887e1
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/objface.cxx | 8 | ||||
| -rw-r--r-- | sfx2/source/control/request.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx index 8c96d0daa5ac..da6ee023215e 100644 --- a/sfx2/source/control/objface.cxx +++ b/sfx2/source/control/objface.cxx @@ -326,14 +326,14 @@ const SfxSlot* SfxInterface::GetSlot( const OUString& rCommand ) const { static const char UNO_COMMAND[] = ".uno:"; - String aCommand( rCommand ); - if ( aCommand.SearchAscii( UNO_COMMAND ) == 0 ) - aCommand.Erase( 0, sizeof( UNO_COMMAND )-1 ); + OUString aCommand( rCommand ); + if ( aCommand.startsWith( UNO_COMMAND ) ) + aCommand = aCommand.copy( sizeof( UNO_COMMAND )-1 ); for ( sal_uInt16 n=0; n<nCount; n++ ) { if ( (pSlots+n)->pUnoName && - aCommand.CompareIgnoreCaseToAscii( (pSlots+n)->GetUnoName() ) == COMPARE_EQUAL ) + aCommand.compareToIgnoreAsciiCaseAscii( (pSlots+n)->GetUnoName() ) == 0 ) return pSlots+n; } diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index a95b59f10840..403150554844 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -55,7 +55,7 @@ struct SfxRequest_Impl: public SfxListener { SfxRequest* pAnti; // Owner because of dying pool - String aTarget; // if possible from target object set by App + OUString aTarget; // if possible from target object set by App SfxItemPool* pPool; // ItemSet build with this pool SfxPoolItem* pRetVal; // Return value belongs to itself SfxShell* pShell; // run from this shell @@ -334,13 +334,13 @@ void SfxRequest_Impl::Record */ { - String aCommand = OUString(".uno:"); - aCommand.AppendAscii( pSlot->GetUnoName() ); + OUString aCommand(".uno:"); + aCommand += OUString( pSlot->GetUnoName(), strlen( pSlot->GetUnoName() ), RTL_TEXTENCODING_UTF8 ); OUString aCmd( aCommand ); if(xRecorder.is()) { uno::Reference< container::XIndexReplace > xReplace( xRecorder, uno::UNO_QUERY ); - if ( xReplace.is() && aCmd.compareToAscii(".uno:InsertText") == COMPARE_EQUAL ) + if ( xReplace.is() && aCmd == ".uno:InsertText" ) { sal_Int32 nCount = xReplace->getCount(); if ( nCount ) |