diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-06-28 12:18:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-28 13:53:36 +0100 |
| commit | ba23ece286671f8f9b5baf245239996e1e1fabdb (patch) | |
| tree | 7314f9c83e9c92a72563856459c4a217fc42227e /svx | |
| parent | 2ee701afd333ef01bc5d4f62543aaf0f5ac5ed3c (diff) | |
probably the last uses of the one argument String::CreateFromAscii variant
Change-Id: I36aab317da2f69f12aaefc24895ad9eaa6b69a7c
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/dialog/linkwarn.cxx | 4 | ||||
| -rw-r--r-- | svx/source/dialog/pfiledlg.cxx | 2 | ||||
| -rw-r--r-- | svx/source/dialog/svxbmpnumvalueset.cxx | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/svx/source/dialog/linkwarn.cxx b/svx/source/dialog/linkwarn.cxx index 6bc3a1b21fbd..f9591c78a6e9 100644 --- a/svx/source/dialog/linkwarn.cxx +++ b/svx/source/dialog/linkwarn.cxx @@ -52,9 +52,7 @@ SvxLinkWarningDialog::SvxLinkWarningDialog( Window* pParent, const String& _rFil // replace filename String sInfoText = m_aInfoText.GetText(); - sInfoText.SearchAndReplaceAll( - UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "%FILENAME" ) ), _rFileName ); + sInfoText.SearchAndReplaceAll(rtl::OUString("%FILENAME"), _rFileName); m_aInfoText.SetText( sInfoText ); // load state of "warning on" checkbox from misc options diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index a73aaa2719e4..99b4bc37e8c5 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -177,7 +177,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind ) // add the All-Filter String aAllFilter( ResId( STR_EXTFILTER_ALL, DIALOG_MGR() ) ); - maFileDlg.AddFilter( aAllFilter, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "*.*" ) ) ); + maFileDlg.AddFilter(aAllFilter, rtl::OUString("*.*")); // and activate him maFileDlg.SetCurrentFilter( aAllFilter ); diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 6758b927794b..cd505ac71346 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -106,8 +106,7 @@ static const sal_Unicode aBulletTypes[] = static Font& lcl_GetDefaultBulletFont() { static sal_Bool bInit = 0; - static Font aDefBulletFont( UniString::CreateFromAscii( - RTL_CONSTASCII_STRINGPARAM( "StarSymbol" ) ), + static Font aDefBulletFont( rtl::OUString("StarSymbol"), String(), Size( 0, 14 ) ); if(!bInit) { |