From fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 6 Nov 2014 17:24:13 +0100 Subject: 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). --- framework/source/layoutmanager/helpers.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'framework/source/layoutmanager/helpers.cxx') diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index 55e0dcfa408b..ca623fff4730 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -88,7 +88,7 @@ OUString retrieveToolbarNameFromHelpURL( vcl::Window* pWindow ) ToolBox* pToolBox = dynamic_cast( pWindow ); if ( pToolBox ) { - aToolbarName = OUString::fromUtf8( pToolBox->GetHelpId() ); + aToolbarName = OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); sal_Int32 i = aToolbarName.lastIndexOf( ':' ); if ( !aToolbarName.isEmpty() && ( i > 0 ) && (( i + 1 ) < aToolbarName.getLength() )) aToolbarName = aToolbarName.copy( i+1 ); // Remove ".HelpId:" protocol from toolbar name -- cgit