diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
| commit | fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch) | |
| tree | 49a72b76d2d2a92af6371748c19277778159b86d /svx | |
| parent | e36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff) | |
Revert "use the new OUString::fromUtf8 method"
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
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, 4 insertions, 3 deletions
diff --git a/svx/source/gallery2/galini.cxx b/svx/source/gallery2/galini.cxx index 5c5de4d58b65..b4c53388cf1c 100644 --- a/svx/source/gallery2/galini.cxx +++ b/svx/source/gallery2/galini.cxx @@ -57,7 +57,8 @@ OUString GalleryThemeEntry::ReadStrFromIni(const OUString &aKeyName ) { aKey = OStringToOUString( aLine.copy( 0, n ).trim(), RTL_TEXTENCODING_ASCII_US ); - aValue = OUString::fromUtf8( aLine.copy( n + 1 ).trim() ); + aValue = OStringToOUString( + aLine.copy( n + 1 ).trim(), RTL_TEXTENCODING_UTF8 ); if( ( n = aKey.indexOf( '[' ) ) >= 1 ) { diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 8caa580b7acf..cf644489752f 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 = OUString::fromUtf8(aTmpStr); + aThemeName = OStringToOUString(aTmpStr, RTL_TEXTENCODING_UTF8); // execute a charakter conversion if( nVersion >= 0x0004 ) diff --git a/svx/source/sidebar/insert/InsertPropertyPanel.cxx b/svx/source/sidebar/insert/InsertPropertyPanel.cxx index f0cb73507218..7f4925b22e51 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::OUString::fromUtf8(pToolBox->GetHelpId())); + OUString sToolbarName (rtl::OStringToOUString(pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8)); if (sToolbarName.getLength() == 0) return 1; const util::URL aURL (sfx2::sidebar::Tools::GetURL(sToolbarName)); |