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 /framework | |
| parent | 8f266781a6bd6a629bce65c0f613683047c9a794 (diff) | |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
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, 4 insertions, 5 deletions
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index 1599447eef8c..f88c620aede1 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -239,9 +239,8 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno:: { sal_uLong nMask = WINDOWSTATE_MASK_ALL; nMask &= ~(WINDOWSTATE_MASK_MINIMIZED); - sWindowState = OStringToOUString( - static_cast<SystemWindow*>(pWindow)->GetWindowState(nMask), - RTL_TEXTENCODING_UTF8); + sWindowState = OUString::fromUtf8( + static_cast<SystemWindow*>(pWindow)->GetWindowState(nMask)); } // <- SOLAR SAFE ------------------------ } diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 7ff8d45dfaa7..bb5e73581a83 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 OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8); + return OUString::fromUtf8(sWindowState); } 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 ca623fff4730..55e0dcfa408b 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 = OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); + aToolbarName = OUString::fromUtf8( pToolBox->GetHelpId() ); 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 |