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 /svx | |
| parent | 8f266781a6bd6a629bce65c0f613683047c9a794 (diff) | |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/gallery2/galini.cxx | 3 | ||||
| -rw-r--r-- | svx/source/gallery2/galtheme.cxx | 2 | ||||
| -rw-r--r-- | svx/source/sidebar/insert/InsertPropertyPanel.cxx | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx index b4c53388cf1c..5c5de4d58b65 100644 --- a/svx/source/gallery2/galini.cxx +++ b/svx/source/gallery2/galini.cxx @@ -57,8 +57,7 @@ OUString GalleryThemeEntry::ReadStrFromIni(const OUString &aKeyName ) { aKey = OStringToOUString( aLine.copy( 0, n ).trim(), RTL_TEXTENCODING_ASCII_US ); - aValue = OStringToOUString( - aLine.copy( n + 1 ).trim(), RTL_TEXTENCODING_UTF8 ); + aValue = OUString::fromUtf8( aLine.copy( n + 1 ).trim() ); if( ( n = aKey.indexOf( '[' ) ) >= 1 ) { diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index cf644489752f..8caa580b7acf 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -711,7 +711,7 @@ GalleryThemeEntry* GalleryTheme::CreateThemeEntry( const INetURLObject& rURL, bo sal_uInt32 nThemeId = 0; OString aTmpStr = read_uInt16_lenPrefixed_uInt8s_ToOString(*pIStm); - aThemeName = OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); + aThemeName = OUString::fromUtf8(aTmpStr); // execute a charakter conversion if( nVersion >= 0x0004 ) diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index 7f4925b22e51..f0cb73507218 100644 --- a/svx/source/sidebar/insert/InsertPropertyPanel.cxx +++ b/svx/source/sidebar/insert/InsertPropertyPanel.cxx @@ -106,7 +106,7 @@ IMPL_LINK(InsertPropertyPanel, WindowEventListener, VclSimpleEvent*, pEvent) return 1; // Extract name of (sub)toolbar from help id. - OUString sToolbarName (rtl::OStringToOUString(pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8)); + OUString sToolbarName (rtl::OUString::fromUtf8(pToolBox->GetHelpId())); if (sToolbarName.getLength() == 0) return 1; const util::URL aURL (sfx2::sidebar::Tools::GetURL(sToolbarName)); |