3 files changed, 15 insertions, 11 deletions

diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 75845925c128..b8a3a7419596 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -101,7 +101,7 @@ void SfxModalDialog::SetDialogData_Impl()
     // save settings (position and user data)
     OUString sConfigId;
     if (isLayoutEnabled())
-        sConfigId = OUString::fromUtf8(GetHelpId());
+        sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8);
     else
     {
         SAL_WARN("sfx.config", "Dialog needs to be converted to .ui format");
@@ -128,7 +128,7 @@ void SfxModalDialog::GetDialogData_Impl()
 {
     OUString sConfigId;
     if (isLayoutEnabled())
-        sConfigId = OUString::fromUtf8(GetHelpId());
+        sConfigId = OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8);
     else
     {
         SAL_WARN("sfx.config", "Dialog needs to be converted to .ui format");
@@ -654,7 +654,8 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl)
         pImpl->m_pSfxPage->FillUserData();
         OUString sData( pImpl->m_pSfxPage->GetUserData() );
 
-        OUString sConfigId = OUString::fromUtf8(pImpl->m_pSfxPage->GetConfigId());
+        OUString sConfigId = OStringToOUString(pImpl->m_pSfxPage->GetConfigId(),
+            RTL_TEXTENCODING_UTF8);
         if (sConfigId.isEmpty())
         {
             SAL_WARN("sfx.config", "Tabpage needs to be converted to .ui format");
@@ -723,7 +724,8 @@ void SfxSingleTabDialog::SetTabPage(SfxTabPage* pTabPage,
     if ( pImpl->m_pSfxPage )
     {
         // First obtain the user data, only then Reset()
-        OUString sConfigId = OUString::fromUtf8(pImpl->m_pSfxPage->GetConfigId());
+        OUString sConfigId = OStringToOUString(pImpl->m_pSfxPage->GetConfigId(),
+            RTL_TEXTENCODING_UTF8);
         if (sConfigId.isEmpty())
         {
             SAL_WARN("sfx.config", "Tabpage needs to be converted to .ui format");
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 25d91ae3d4b1..18da893e5823 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -271,7 +271,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve
     OUString aHelpText;
     Help* pHelp = Application::GetHelp();
     if ( pHelp )
-        aHelpText = pHelp->GetHelpText( OUString::fromUtf8(sHelpId), NULL );
+        aHelpText = pHelp->GetHelpText( OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), NULL );
     return aHelpText;
 }
 
@@ -1143,7 +1143,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
         {
             while ( *_pControlId )
             {
-                DBG_ASSERT( INetURLObject( OUString::fromUtf8( *_pHelpId ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
+                DBG_ASSERT( INetURLObject( OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" );
                 OUString sId( sHelpIdPrefix );
                 sId += OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 );
                 xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) );
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index d71f62d466ba..34338673e9ba 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -377,7 +377,8 @@ SfxTabDialog::~SfxTabDialog()
             if ( !aPageData.isEmpty() )
             {
                 // save settings of all pages (user data)
-                OUString sConfigId = OUString::fromUtf8(pDataObject->pTabPage->GetConfigId());
+                OUString sConfigId = OStringToOUString(pDataObject->pTabPage->GetConfigId(),
+                    RTL_TEXTENCODING_UTF8);
                 if (sConfigId.isEmpty())
                 {
                     SAL_WARN("sfx.config", "Tabpage needs to be converted to .ui format");
@@ -554,7 +555,7 @@ void SfxTabDialog::Start_Impl()
     sal_uInt16 nActPage = m_pTabCtrl->GetPageId( 0 );
 
     // load old settings, when exists
-    SvtViewOptions aDlgOpt(E_TABDIALOG, OUString::fromUtf8(GetHelpId()));
+    SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8));
     if ( aDlgOpt.Exists() )
     {
         SetWindowState(OUStringToOString(aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US));
@@ -673,7 +674,8 @@ void SfxTabDialog::RemoveTabPage( sal_uInt16 nId )
             if ( !aPageData.isEmpty() )
             {
                 // save settings of this page (user data)
-                OUString sConfigId = OUString::fromUtf8(pDataObject->pTabPage->GetConfigId());
+                OUString sConfigId = OStringToOUString(pDataObject->pTabPage->GetConfigId(),
+                    RTL_TEXTENCODING_UTF8);
                 if (sConfigId.isEmpty())
                 {
                     SAL_WARN("sfx.config", "Tabpage needs to be converted to .ui format");
@@ -756,7 +758,7 @@ SfxTabPage* SfxTabDialog::GetTabPage( sal_uInt16 nPageId ) const
 void SfxTabDialog::SavePosAndId()
 {
     // save settings (screen position and current page)
-    SvtViewOptions aDlgOpt(E_TABDIALOG, OUString::fromUtf8(GetHelpId()));
+    SvtViewOptions aDlgOpt(E_TABDIALOG, OStringToOUString(GetHelpId(),RTL_TEXTENCODING_UTF8));
     aDlgOpt.SetWindowState(OStringToOUString(GetWindowState(WINDOWSTATE_MASK_POS),RTL_TEXTENCODING_ASCII_US));
     // to-do replace with name of page when all pages are converted to .ui
     aDlgOpt.SetPageID( m_pTabCtrl->GetCurPageId() );
@@ -1125,7 +1127,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl )
         DBG_ASSERT( NULL == pDataObject->pTabPage, "create TabPage more than once" );
         pDataObject->pTabPage = pTabPage;
 
-        OUString sConfigId = OUString::fromUtf8(pTabPage->GetConfigId());
+        OUString sConfigId = OStringToOUString(pTabPage->GetConfigId(), RTL_TEXTENCODING_UTF8);
         if (sConfigId.isEmpty())
         {
             SAL_WARN("sfx.config", "Tabpage needs to be converted to .ui format");