diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-06 07:45:00 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-11-06 13:51:10 +0200 |
commit | 05050cdb23de586870bf479a9df5ced06828d498 (patch) | |
tree | a34c3bba9a921a5e9abf23d5757c15dfaea0ceac /vcl/source/control | |
parent | 8f266781a6bd6a629bce65c0f613683047c9a794 (diff) |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
Diffstat (limited to 'vcl/source/control')
-rw-r--r-- | vcl/source/control/edit.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/fixed.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/fixedhyper.cxx | 2 | ||||
-rw-r--r-- | vcl/source/control/tabctrl.cxx | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index ffe94bfd11c2..cfc2ca735d90 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -231,7 +231,7 @@ bool Edit::set_property(const OString &rKey, const OString &rValue) SetStyle(nBits); } else if (rKey == "placeholder-text") - SetPlaceholderText(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); + SetPlaceholderText(OUString::fromUtf8(rValue)); else return Control::set_property(rKey, rValue); return true; diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx index a0d3da11eccd..d86356e056ff 100644 --- a/vcl/source/control/fixed.cxx +++ b/vcl/source/control/fixed.cxx @@ -1049,7 +1049,7 @@ Image FixedImage::loadThemeImage(const OString &rFileName) static ImplImageTreeSingletonRef aImageTree; OUString sIconTheme = Application::GetSettings().GetStyleSettings().DetermineIconTheme(); - const OUString sFileName(OStringToOUString(rFileName, RTL_TEXTENCODING_UTF8)); + const OUString sFileName(OUString::fromUtf8(rFileName)); BitmapEx aBitmap; bool bSuccess = aImageTree->loadImage(sFileName, sIconTheme, aBitmap, true); SAL_WARN_IF(!bSuccess, "vcl.layout", "Unable to load " << sFileName diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index 6926a0c843c6..701c529985cf 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -134,7 +134,7 @@ void FixedHyperlink::SetText(const OUString& rNewDescription) bool FixedHyperlink::set_property(const OString &rKey, const OString &rValue) { if (rKey == "uri") - SetURL(OStringToOUString(rValue, RTL_TEXTENCODING_UTF8)); + SetURL(OUString::fromUtf8(rValue)); else return FixedText::set_property(rKey, rValue); return true; diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 8c58442ba063..11d2b9f2e156 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -1366,7 +1366,7 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - OUString aHelpId( OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + OUString aHelpId( OUString::fromUtf8( GetHelpId( nItemId ) ) ); if ( !aHelpId.isEmpty() ) { // call Help if existing @@ -1962,7 +1962,7 @@ const OUString& TabControl::GetHelpText( sal_uInt16 nPageId ) const { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); + pItem->maHelpText = pHelp->GetHelpText( OUString::fromUtf8( pItem->maHelpId ), this ); } return pItem->maHelpText; } |