From ba23ece286671f8f9b5baf245239996e1e1fabdb Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 28 Jun 2012 12:18:31 +0100 Subject: probably the last uses of the one argument String::CreateFromAscii variant Change-Id: I36aab317da2f69f12aaefc24895ad9eaa6b69a7c --- cui/source/dialogs/hldocntp.cxx | 5 ++--- cui/source/dialogs/hlinettp.cxx | 6 ++---- cui/source/dialogs/hlmailtp.cxx | 2 +- cui/source/dialogs/thesdlg.cxx | 2 +- 4 files changed, 6 insertions(+), 9 deletions(-) (limited to 'cui/source/dialogs') diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 0e3af3134610..628f7f94c955 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -354,9 +354,8 @@ void SvxHyperlinkNewDocTp::DoApply () // create items SfxStringItem aName( SID_FILE_NAME, aStrDocName ); - SfxStringItem aReferer( SID_REFERER, UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) ); - SfxStringItem aFrame( SID_TARGETNAME, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_blank" ) ) ); + SfxStringItem aReferer( SID_REFERER, rtl::OUString("private:user") ); + SfxStringItem aFrame( SID_TARGETNAME, rtl::OUString("_blank") ); String aStrFlags ( sal_Unicode('S') ); if ( maRbtEditLater.IsChecked() ) diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index ea7f2ad19af2..8957a142c1b8 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -427,10 +427,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickBrowseHdl_Impl) ///////////////////////////////////////////////// // Open URL if available - SfxStringItem aName( SID_FILE_NAME, UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "http://" ) ) ); - SfxStringItem aRefererItem( SID_REFERER, UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) ); + SfxStringItem aName( SID_FILE_NAME, rtl::OUString("http://") ); + SfxStringItem aRefererItem( SID_REFERER, rtl::OUString("private:user") ); SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True ); SfxBoolItem aSilent( SID_SILENT, sal_True ); SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 0f84219c976e..476ab9abf0c1 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -170,7 +170,7 @@ String SvxHyperlinkMailTp::CreateAbsoluteURL() const { if ( maEdSubject.GetText() != aEmptyStr ) { - String aQuery = UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "subject=" ) ); + String aQuery = rtl::OUString("subject="); aQuery.Append( maEdSubject.GetText() ); aURL.SetParam(aQuery); } diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx index 0328a592f359..4c47b37fa567 100644 --- a/cui/source/dialogs/thesdlg.cxx +++ b/cui/source/dialogs/thesdlg.cxx @@ -670,7 +670,7 @@ void SvxThesaurusDialog::SetWindowTitle( LanguageType nLanguage ) // adjust language String aStr( GetText() ); aStr.Erase( aStr.Search( sal_Unicode( '(' ) ) - 1 ); - aStr.Append( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( " (" ) ) ); + aStr.Append( rtl::OUString(" (") ); aStr += SvtLanguageTable().GetLanguageString( nLanguage ); aStr.Append( sal_Unicode( ')' ) ); SetText( aStr ); // set window title -- cgit