diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-08-29 20:44:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-30 11:39:01 +0100 |
| commit | 74929bba736cc6cceed3c088e13f5952abb1bd2b (patch) | |
| tree | 8a026d95bc586ca6a41686dee32dfa53b659b252 /sfx2/source/appl | |
| parent | fc7e7b683112e9ccd23104f38d4acc3417e9d5b8 (diff) | |
Related: fdo#38838 remove UniString::ToUpperAscii
things got a little out of hand and I ended up
converting quite a bit of calc to OUString
Change-Id: I056326d37ffefa8c120cb2e564d166dd9f20f216
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/appdde.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/appl/appopen.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index e9e827ee3f73..c8765de6c6aa 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -503,9 +503,9 @@ sal_Bool SfxApplication::InitializeDde() // Config path as a topic becauseof multiple starts INetURLObject aOfficeLockFile( SvtPathOptions().GetUserConfigPath() ); aOfficeLockFile.insertName( "soffice.lck" ); - String aService( SfxDdeServiceName_Impl( + OUString aService( SfxDdeServiceName_Impl( aOfficeLockFile.GetMainURL(INetURLObject::DECODE_TO_IURI) ) ); - aService.ToUpperAscii(); + aService = aService.toAsciiUpperCase(); pAppData_Impl->pDdeService2 = new ImplDdeService( aService ); pAppData_Impl->pTriggerTopic = new SfxDdeTriggerTopic_Impl; pAppData_Impl->pDdeService2->AddTopic( *pAppData_Impl->pTriggerTopic ); diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 641fd68e74d2..67a4831687fb 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -807,27 +807,27 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) SFX_REQUEST_ARG( rReq, pFileFlagsItem, SfxStringItem, SID_OPTIONS, sal_False); if ( pFileFlagsItem ) { - String aFileFlags = pFileFlagsItem->GetValue(); - aFileFlags.ToUpperAscii(); - if ( STRING_NOTFOUND != aFileFlags.Search( 0x0054 ) ) // T = 54h + OUString aFileFlags = pFileFlagsItem->GetValue(); + aFileFlags = aFileFlags.toAsciiUpperCase(); + if ( -1 != aFileFlags.indexOf( 0x0054 ) ) // T = 54h { rReq.RemoveItem( SID_TEMPLATE ); rReq.AppendItem( SfxBoolItem( SID_TEMPLATE, sal_True ) ); } - if ( STRING_NOTFOUND != aFileFlags.Search( 0x0048 ) ) // H = 48h + if ( -1 != aFileFlags.indexOf( 0x0048 ) ) // H = 48h { rReq.RemoveItem( SID_HIDDEN ); rReq.AppendItem( SfxBoolItem( SID_HIDDEN, sal_True ) ); } - if ( STRING_NOTFOUND != aFileFlags.Search( 0x0052 ) ) // R = 52h + if ( -1 != aFileFlags.indexOf( 0x0052 ) ) // R = 52h { rReq.RemoveItem( SID_DOC_READONLY ); rReq.AppendItem( SfxBoolItem( SID_DOC_READONLY, sal_True ) ); } - if ( STRING_NOTFOUND != aFileFlags.Search( 0x0042 ) ) // B = 42h + if ( -1 != aFileFlags.indexOf( 0x0042 ) ) // B = 42h { rReq.RemoveItem( SID_PREVIEW ); rReq.AppendItem( SfxBoolItem( SID_PREVIEW, sal_True ) ); |