diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-05 12:07:44 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-05 14:45:31 +0100 |
| commit | 801cb231f2e2b43f4befd9575e23da58d764c600 (patch) | |
| tree | 92fe3b44a9ec99b3d872da930b6252a77f2f8ff5 /sw | |
| parent | 2bd1896e207f7fda2861d019702b931f07c9c4e1 (diff) | |
Add rtl::OUString::fromUtf8()
Note that this should be used only at places legitimately assuming that
the OString contains valid UTF-8.
Change-Id: I9e8ecef9928975fe0737553f5b2a19ff2dd40861
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/frmdlg/frmdlg.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/uno/unomod.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sw/source/ui/frmdlg/frmdlg.cxx b/sw/source/ui/frmdlg/frmdlg.cxx index cd623185758a..2213373dc58b 100644 --- a/sw/source/ui/frmdlg/frmdlg.cxx +++ b/sw/source/ui/frmdlg/frmdlg.cxx @@ -55,7 +55,7 @@ SwFrmDlg::SwFrmDlg( SfxViewFrame* pViewFrame, : SfxTabDialog(pViewFrame, pParent, sResType, OUString("modules/swriter/ui/") + - OStringToOUString(sResType.toAsciiLowerCase(), RTL_TEXTENCODING_UTF8) + + OUString::fromUtf8(sResType.toAsciiLowerCase()) + (".ui"), &rCoreSet, pStr != 0) , m_bFormat(bFormat) , m_bNew(bNewFrm) diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx index a0b27cd4ac89..2614c3574d6b 100644 --- a/sw/source/uibase/uno/unomod.cxx +++ b/sw/source/uibase/uno/unomod.cxx @@ -934,7 +934,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u OUStringBuffer sHelpURL; sHelpURL.appendAscii ( INET_HID_SCHEME ); SwEditWin &rEditWin = pView->GetEditWin(); - sHelpURL.append( OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + sHelpURL.append( OUString::fromUtf8( rEditWin.GetHelpId() ) ); rValue <<= sHelpURL.makeStringAndClear(); } else diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index fc3108076921..aa58f59d2166 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -374,7 +374,7 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName aCmd += pSlot->GetUnoName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); boost::scoped_ptr<SfxAbstractInsertObjectDialog> pDlg( - pFact->CreateInsertObjectDialog( GetWin(), OStringToOUString( aCmd, RTL_TEXTENCODING_UTF8 ), xStor, &aServerList )); + pFact->CreateInsertObjectDialog( GetWin(), OUString::fromUtf8( aCmd ), xStor, &aServerList )); if ( pDlg ) { pDlg->Execute(); |