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 /framework | |
| 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 'framework')
| -rw-r--r-- | framework/source/helper/persistentwindowstate.cxx | 5 | ||||
| -rw-r--r-- | framework/source/inc/pattern/window.hxx | 2 | ||||
| -rw-r--r-- | framework/source/layoutmanager/helpers.cxx | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index f88c620aede1..1599447eef8c 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -239,8 +239,9 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno:: { sal_uLong nMask = WINDOWSTATE_MASK_ALL; nMask &= ~(WINDOWSTATE_MASK_MINIMIZED); - sWindowState = OUString::fromUtf8( - static_cast<SystemWindow*>(pWindow)->GetWindowState(nMask)); + sWindowState = OStringToOUString( + static_cast<SystemWindow*>(pWindow)->GetWindowState(nMask), + RTL_TEXTENCODING_UTF8); } // <- SOLAR SAFE ------------------------ } diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index bb5e73581a83..7ff8d45dfaa7 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -62,7 +62,7 @@ static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& x } // <- SOLAR SAFE ---------------------------- - return OUString::fromUtf8(sWindowState); + return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); } static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow , 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<ToolBox *>( 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 |