diff options
author | Noel Grandin <noel@peralex.com> | 2013-10-14 13:37:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2013-10-15 12:25:48 +0200 |
commit | fa469b2e00d83459faebe4c1fcb3ea1aac5fb20d (patch) | |
tree | 75796ca997b6142fa36c5ca9a1fcc4836cb2923a /sw/source/ui/app/docsh.cxx | |
parent | 6e788be6d378c33c3562bcff3df83b8ed96cda56 (diff) |
convert sw/source/ui/app/*.cxx from String to OUString
Change-Id: I08cb425ae4be64116c3f88dad73d330a953af77a
Diffstat (limited to 'sw/source/ui/app/docsh.cxx')
-rw-r--r-- | sw/source/ui/app/docsh.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx index 1b6b9a455388..da74ba9afdb0 100644 --- a/sw/source/ui/app/docsh.cxx +++ b/sw/source/ui/app/docsh.cxx @@ -144,7 +144,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, } return 0; } - String aFileName( rMedium.GetName() ); + OUString aFileName( rMedium.GetName() ); SwRead pRead = SwReaderWriter::GetReader( pFlt->GetUserData() ); if( !pRead ) return 0; @@ -162,7 +162,7 @@ Reader* SwDocShell::StartConvertFrom(SfxMedium& rMedium, SwReader** ppRdr, return 0; // Check password - String aPasswd; + OUString aPasswd; if ((*ppRdr)->NeedsPasswd( *pRead )) { if(!bAPICall) @@ -655,7 +655,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) ( pWrtShell || !::lcl_GetSourceView( this ) )) { SwAsciiOptions aOpt; - String sItemOpt; + OUString sItemOpt; const SfxItemSet* pSet; const SfxPoolItem* pItem; if( 0 != ( pSet = rMedium.GetItemSet() ) ) @@ -664,7 +664,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium ) sal_True, &pItem ) ) sItemOpt = ((const SfxStringItem*)pItem)->GetValue(); } - if(sItemOpt.Len()) + if(!sItemOpt.isEmpty()) aOpt.ReadUserData( sItemOpt ); xWriter->SetAsciiOptions( aOpt ); |