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

include/rtl/ustring.hxx

@@ -2074,6 +2074,26 @@ public:
             pData, indexUtf16, incrementCodePoints);
     }
 
+    /**
+     * Convert an OString to an OUString, assuming that the OString is
+     * UTF-8-encoded.
+     *
+     * @param rStr
+     * an OString to convert
+     *
+     * @param convertFlags
+     * flags which control the conversion.
+     *
+     * @see rtl::OStringToOUString for more info on convertFlags.
+     *
+     * @since LibreOffice 4.4
+     */
+    static inline OUString fromUtf8(const OString& rStr,
+                                    sal_uInt32 convertFlags = OSTRING_TO_OUSTRING_CVTFLAGS)
+    {
+        return OUString(rStr.getStr(), rStr.getLength(), RTL_TEXTENCODING_UTF8, convertFlags);
+    }
+
     /**
       Returns the string representation of the integer argument.
 

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)

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

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();