Avoid conversions between OUString and OString in VCL

Standardize on OUString, which is the main internal string class.
Convert from/to OUString only when communicating with respective
external APIs.

Removes about 200 conversions from the code.

Change-Id: I96ecee7c6fd271bb76639220e96d69d2964bed26
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149930
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

60 files changed, 167 insertions, 169 deletions

diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 5793825b5d76..dad5b5e1fc55 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -275,7 +275,7 @@ void SvxMenuConfigPage::SelectElement()
     UpdateButtonStates();
 }
 
-IMPL_LINK(SvxMenuConfigPage, GearHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxMenuConfigPage, GearHdl, const OUString&, rIdent, void)
 {
     if (rIdent == "menu_gear_add")
     {
@@ -371,7 +371,7 @@ IMPL_LINK_NOARG(SvxMenuConfigPage, RemoveCommandHdl, weld::Button&, void)
     }
 }
 
-IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OUString&, rIdent, void)
 {
     weld::TreeView& rTreeView = m_xContentsListBox->get_widget();
     if (rIdent == "insertseparator")
@@ -423,7 +423,7 @@ IMPL_LINK(SvxMenuConfigPage, InsertHdl, const OString&, rIdent, void)
     }
 }
 
-IMPL_LINK(SvxMenuConfigPage, ModifyItemHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxMenuConfigPage, ModifyItemHdl, const OUString&, rIdent, void)
 {
     if (rIdent == "renameItem")
     {
@@ -541,7 +541,7 @@ IMPL_LINK(SvxMenuConfigPage, ContentContextMenuHdl, const CommandEvent&, rCEvt,
     xContextMenu->set_visible("changeIcon", false);
     xContextMenu->set_visible("resetIcon", false);
     xContextMenu->set_visible("restoreDefault", false);
-    OString sCommand(xContextMenu->popup_at_rect(
+    OUString sCommand(xContextMenu->popup_at_rect(
         &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))));
 
     if (sCommand == "remove")
@@ -580,7 +580,7 @@ IMPL_LINK(SvxMenuConfigPage, FunctionContextMenuHdl, const CommandEvent&, rCEvt,
     xContextMenu->set_visible("changeIcon", false);
     xContextMenu->set_visible("resetIcon", false);
     xContextMenu->set_visible("restoreDefault", false);
-    OString sCommand(xContextMenu->popup_at_rect(
+    OUString sCommand(xContextMenu->popup_at_rect(
         &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))));
 
     if (sCommand == "add")
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 359dc02bb1f5..73a836ff7a17 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -287,7 +287,7 @@ IMPL_LINK_NOARG(SvxToolbarConfigPage, SelectToolbarEntry, weld::TreeView&, void)
     UpdateButtonStates();
 }
 
-IMPL_LINK(SvxToolbarConfigPage, GearHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxToolbarConfigPage, GearHdl, const OUString&, rIdent, void)
 {
     SvxConfigEntry* pCurrentToolbar = GetTopLevelSelection();
 
@@ -427,7 +427,7 @@ IMPL_LINK_NOARG(SvxToolbarConfigPage, RemoveCommandHdl, weld::Button&, void)
     DeleteSelectedContent();
 }
 
-IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OUString&, rIdent, void)
 {
     if (rIdent == "insertseparator")
     {
@@ -452,7 +452,7 @@ IMPL_LINK(SvxToolbarConfigPage, InsertHdl, const OString&, rIdent, void)
     }
 }
 
-IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OString&, rIdent, void)
+IMPL_LINK(SvxToolbarConfigPage, ModifyItemHdl, const OUString&, rIdent, void)
 {
     bool bNeedsApply = false;
 
@@ -876,7 +876,7 @@ IMPL_LINK(SvxToolbarConfigPage, ContentContextMenuHdl, const CommandEvent&, rCEv
     xContextMenu->set_visible("changeIcon", bIsValidSelection && !bIsSeparator);
     xContextMenu->set_visible("resetIcon", bIsValidSelection && !bIsSeparator);
     xContextMenu->set_visible("restoreDefault", bIsValidSelection && !bIsSeparator);
-    OString sCommand(xContextMenu->popup_at_rect(
+    OUString sCommand(xContextMenu->popup_at_rect(
         &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))));
 
     if (sCommand == "remove")
@@ -916,7 +916,7 @@ IMPL_LINK(SvxToolbarConfigPage, FunctionContextMenuHdl, const CommandEvent&, rCE
     xContextMenu->set_visible("changeIcon", false);
     xContextMenu->set_visible("resetIcon", false);
     xContextMenu->set_visible("restoreDefault", false);
-    OString sCommand(xContextMenu->popup_at_rect(
+    OUString sCommand(xContextMenu->popup_at_rect(
         &rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1))));
 
     if (sCommand == "add")
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 91584562a647..d41012850bce 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -236,7 +236,7 @@ SvxConfigDialog::SvxConfigDialog(weld::Window * pParent, const SfxItemSet* pInSe
 #endif
 }
 
-void SvxConfigDialog::ActivatePage(const OString& rPage)
+void SvxConfigDialog::ActivatePage(const OUString& rPage)
 {
     SfxTabDialogController::ActivatePage(rPage);
     GetResetButton()->set_visible(rPage != "keyboard");
@@ -257,7 +257,7 @@ void SvxConfigDialog::SetFrame(const css::uno::Reference<css::frame::XFrame>& xF
         RemoveTabPage("keyboard");
 }
 
-void SvxConfigDialog::PageCreated(const OString &rId, SfxTabPage& rPage)
+void SvxConfigDialog::PageCreated(const OUString &rId, SfxTabPage& rPage)
 {
     if (rId == "menus" || rId == "keyboard" || rId == "notebookbar"
         || rId == "toolbars" || rId == "contextmenus")
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 7746333fe796..aa77952563a8 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -1204,7 +1204,7 @@ IMPL_LINK(SvxScriptSelectorDialog, ContextMenuHdl, const CommandEvent&, rCEvt, b
     xDropMenu->set_active("alphabetically", xTreeView.get_sort_order());
     xDropMenu->set_active("properorder", !xTreeView.get_sort_order());
 
-    OString sCommand(xPopup->popup_at_rect(&xTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
+    OUString sCommand(xPopup->popup_at_rect(&xTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
     if (sCommand == "alphabetically")
     {
         xTreeView.make_sorted();
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 3980c8b6c3f7..6a22ee2c3d99 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -72,7 +72,7 @@ void SvxMacroTabPage_::EnableButtons()
 }
 
 SvxMacroTabPage_::SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription,
-    const OString& rID, const SfxItemSet& rAttrSet)
+    const OUString& rID, const SfxItemSet& rAttrSet)
     : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
     , m_nAssignedEvents(0)
     , bDocModified(false)
diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx
index bf386e597412..d46a22a9071f 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -848,7 +848,7 @@ void TmpRepositoryCommandEnv::update(uno::Any const& /*Status */) {}
 
 void TmpRepositoryCommandEnv::pop() {}
 
-IMPL_LINK(AdditionsDialog, GearHdl, const OString&, rIdent, void)
+IMPL_LINK(AdditionsDialog, GearHdl, const OUString&, rIdent, void)
 {
     if (rIdent == "gear_sort_voting")
     {
diff --git a/cui/source/dialogs/SignatureLineDialogBase.cxx b/cui/source/dialogs/SignatureLineDialogBase.cxx
index 4e591124bc44..e0ae28fe5040 100644
--- a/cui/source/dialogs/SignatureLineDialogBase.cxx
+++ b/cui/source/dialogs/SignatureLineDialogBase.cxx
@@ -18,7 +18,7 @@ using namespace css::uno;
 using namespace css::frame;
 
 SignatureLineDialogBase::SignatureLineDialogBase(weld::Widget* pParent, Reference<XModel> xModel,
-                                                 const OUString& rUIFile, const OString& rDialogId)
+                                                 const OUString& rUIFile, const OUString& rDialogId)
     : GenericDialogController(pParent, rUIFile, rDialogId)
     , m_xModel(std::move(xModel))
 {
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 7b671fd84dfa..b5356aa30a45 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -833,15 +833,15 @@ int SpellDialog::InitUserDicts()
 
 IMPL_LINK_NOARG(SpellDialog, AddToDictClickHdl, weld::Button&, void)
 {
-    AddToDictionaryExecute(OString::number(1));
+    AddToDictionaryExecute(OUString::number(1));
 }
 
-IMPL_LINK(SpellDialog, AddToDictSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(SpellDialog, AddToDictSelectHdl, const OUString&, rIdent, void)
 {
     AddToDictionaryExecute(rIdent);
 }
 
-void SpellDialog::AddToDictionaryExecute(const OString& rItemId)
+void SpellDialog::AddToDictionaryExecute(const OUString& rItemId)
 {
     auto xGuard(std::make_unique<UndoChangeGroupGuard>(*m_xSentenceED));
 
@@ -1526,7 +1526,7 @@ void SentenceEditWindow_Impl::Init(weld::Toolbar* pToolbar)
     m_pToolbar->connect_clicked(LINK(this,SentenceEditWindow_Impl,ToolbarHdl));
 }
 
-IMPL_LINK(SentenceEditWindow_Impl, ToolbarHdl, const OString&, rCurItemId, void)
+IMPL_LINK(SentenceEditWindow_Impl, ToolbarHdl, const OUString&, rCurItemId, void)
 {
     if (rCurItemId == "paste")
     {
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index e432b4fce85b..530ef109c216 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -492,7 +492,7 @@ GalleryThemeProperties::GalleryThemeProperties(weld::Widget* pParent,
     m_xDialog->set_title(aText);
 }
 
-void GalleryThemeProperties::PageCreated(const OString& rId, SfxTabPage &rPage)
+void GalleryThemeProperties::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (rId == "general")
         static_cast<TPGalleryThemeGeneral&>( rPage ).SetXChgData( pData );
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index c67ee92d141c..48373e7f1968 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -124,7 +124,7 @@ void CuiGraphicPreviewWindow::Resize()
 }
 
 GraphicFilterDialog::GraphicFilterDialog(weld::Window* pParent,
-    const OUString& rUIXMLDescription, const OString& rID,
+    const OUString& rUIXMLDescription, const OUString& rID,
     const Graphic& rGraphic)
     : GenericDialogController(pParent, rUIXMLDescription, rID)
     , maTimer("cui GraphicFilterDialog maTimer")
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 3352a7a10f5a..9eb5a1fa367e 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl, weld::Button&, void)
 |************************************************************************/
 void SvxHpLinkDlg::SetPage ( SvxHyperlinkItem const * pItem )
 {
-    OString sPageId("internet");
+    OUString sPageId("internet");
 
     OUString aStrURL(pItem->GetURL());
     INetURLObject aURL(aStrURL);
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 77d335f109c2..c1b9b270f9c9 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -105,7 +105,7 @@ sal_Int8 SvxHyperURLBox::ExecuteDrop( const ExecuteDropEvent& rEvt )
 SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase(weld::Container* pParent,
                                                  SvxHpLinkDlg* pDlg,
                                                  const OUString& rUIXMLDescription,
-                                                 const OString& rID,
+                                                 const OUString& rID,
                                                  const SfxItemSet* pItemSet)
   : IconChoicePage(pParent, rUIXMLDescription, rID, pItemSet)
   , mxCbbFrame(xBuilder->weld_combo_box("frame"))
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 6e6ffaf5c53a..0c2219f0ee71 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -31,7 +31,7 @@
 \**********************************************************************/
 
 IconChoicePage::IconChoicePage(weld::Container* pParent,
-                               const OUString& rUIXMLDescription, const OString& rID,
+                               const OUString& rUIXMLDescription, const OUString& rID,
                                const SfxItemSet* pItemSet)
     : xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription))
     , xContainer(xBuilder->weld_container(rID))
@@ -70,7 +70,7 @@ bool IconChoicePage::QueryClose()
 | add new page
 |
 \**********************************************************************/
-void SvxHpLinkDlg::AddTabPage(const OString& rId, CreatePage pCreateFunc /* != 0 */)
+void SvxHpLinkDlg::AddTabPage(const OUString& rId, CreatePage pCreateFunc /* != 0 */)
 {
     weld::Container* pPage = m_xIconCtrl->get_page(rId);
     maPageList.emplace_back(new IconChoicePageData(rId, pCreateFunc(pPage, this, pSet)));
@@ -83,9 +83,9 @@ void SvxHpLinkDlg::AddTabPage(const OString& rId, CreatePage pCreateFunc /* != 0
 | Show / Hide page or button
 |
 \**********************************************************************/
-void SvxHpLinkDlg::ShowPage(const OString& rId)
+void SvxHpLinkDlg::ShowPage(const OUString& rId)
 {
-    OString sOldPageId = GetCurPageId();
+    OUString sOldPageId = GetCurPageId();
     bool bInvalidate = sOldPageId != rId;
     if (bInvalidate)
     {
@@ -104,7 +104,7 @@ void SvxHpLinkDlg::ShowPage(const OString& rId)
 | select a page
 |
 \**********************************************************************/
-IMPL_LINK(SvxHpLinkDlg, ChosePageHdl_Impl, const OString&, rId, void)
+IMPL_LINK(SvxHpLinkDlg, ChosePageHdl_Impl, const OUString&, rId, void)
 {
     if (rId != msCurrentPageId)
     {
@@ -280,7 +280,7 @@ void SvxHpLinkDlg::Start()
 |
 \**********************************************************************/
 
-IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::string_view rId )
+IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::u16string_view rId )
 {
     IconChoicePageData *pRet = nullptr;
     for (const auto & pData : maPageList)
@@ -300,7 +300,7 @@ IconChoicePageData* SvxHpLinkDlg::GetPageData ( std::string_view rId )
 |
 \**********************************************************************/
 
-void SvxHpLinkDlg::SwitchPage( const OString& rId )
+void SvxHpLinkDlg::SwitchPage( const OUString& rId )
 {
     m_xIconCtrl->set_current_page(rId);
 }
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 53488a72e334..3cb50c2a6066 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -72,7 +72,7 @@ uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified(
 }
 
 InsertObjectDialog_Impl::InsertObjectDialog_Impl(weld::Window* pParent,
-    const OUString& rUIXMLDescription, const OString& rID,
+    const OUString& rUIXMLDescription, const OUString& rID,
     css::uno::Reference < css::embed::XStorage > xStorage)
     : GenericDialogController(pParent, rUIXMLDescription, rID)
     , m_xStorage(std::move( xStorage ))
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx
index bec311442756..1ff1a14411cb 100644
--- a/cui/source/dialogs/insrc.cxx
+++ b/cui/source/dialogs/insrc.cxx
@@ -31,7 +31,7 @@ sal_uInt16 SvxInsRowColDlg::getInsertCount() const
     return m_xCountEdit->get_value();
 }
 
-SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const OString& rHelpId)
+SvxInsRowColDlg::SvxInsRowColDlg(weld::Window* pParent, bool bColumn, const OUString& rHelpId)
     : GenericDialogController(pParent, "cui/ui/insertrowcolumn.ui", "InsertRowColumnDialog")
     , m_xCountEdit(m_xBuilder->weld_spin_button("insert_number"))
     , m_xBeforeBtn(m_xBuilder->weld_radio_button("insert_before"))
diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx
index c23146f91fbd..fca03c02d42d 100644
--- a/cui/source/dialogs/screenshotannotationdlg.cxx
+++ b/cui/source/dialogs/screenshotannotationdlg.cxx
@@ -252,7 +252,7 @@ ScreenshotAnnotationDlg_Impl::ScreenshotAnnotationDlg_Impl(
     if (mxText)
     {
         mxText->set_size_request(400, mxText->get_height_rows(10));
-        OUString aHelpId = OStringToOUString( mrParentDialog.get_help_id(), RTL_TEXTENCODING_UTF8 );
+        OUString aHelpId = mrParentDialog.get_help_id();
         Size aSizeCm = Application::GetDefaultDevice()->PixelToLogic(maParentDialogSize, MapMode(MapUnit::MapCM));
         maMainMarkupText = lcl_ParagraphWithImage( aHelpId, aSizeCm );
         mxText->set_text( maMainMarkupText );
@@ -276,7 +276,7 @@ IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl, saveButtonHandler, weld::Button&,
     // 'save screenshot...' pressed, offer to save maParentDialogBitmap
     // as PNG image, use *.id file name as screenshot file name offering
     // get a suggestion for the filename from buildable name
-    OString aDerivedFileName = mrParentDialog.get_buildable_name();
+    OUString aDerivedFileName = mrParentDialog.get_buildable_name();
 
     auto xFileDlg = std::make_unique<sfx2::FileDialogHelper>(ui::dialogs::TemplateDescription::FILESAVE_AUTOEXTENSION,
                                                              FileDialogFlags::NONE, mpParentWindow);
@@ -293,7 +293,7 @@ IMPL_LINK_NOARG(ScreenshotAnnotationDlg_Impl, saveButtonHandler, weld::Button&,
 
     xFilePicker->appendFilter("*.png", "*.png");
     xFilePicker->setCurrentFilter("*.png");
-    xFilePicker->setDefaultName(OStringToOUString(aDerivedFileName, RTL_TEXTENCODING_UTF8));
+    xFilePicker->setDefaultName(aDerivedFileName);
     xFilePicker->setMultiSelectionMode(false);
 
     if (xFilePicker->execute() != ui::dialogs::ExecutableDialogResults::OK)
@@ -546,10 +546,7 @@ bool ScreenshotAnnotationDlg_Impl::MouseButtonUp()
 
         OUStringBuffer aBookmarks(maMainMarkupText);
         for (auto&& rCandidate : maSelected)
-        {
-            OUString aHelpId = OStringToOUString( rCandidate->GetHelpId(), RTL_TEXTENCODING_UTF8 );
-            aBookmarks.append(lcl_Bookmark( aHelpId ));
-        }
+            aBookmarks.append(lcl_Bookmark(rCandidate->GetHelpId()));
 
         mxText->set_text( aBookmarks.makeStringAndClear() );
         bRepaint = true;
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index 3afbc0f694d3..c5c4d22e162c 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -67,7 +67,7 @@ SvxFormatCellsDialog::SvxFormatCellsDialog(weld::Window* pParent, const SfxItemS
         RemoveTabPage("asian");
 }
 
-void SvxFormatCellsDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxFormatCellsDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (rId == "area")
     {
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 40c2e369ab6b..9ed00b46377d 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -59,7 +59,7 @@ SvxSearchFormatDialog::~SvxSearchFormatDialog()
 {
 }
 
-void SvxSearchFormatDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
+void SvxSearchFormatDialog::PageCreated(const OUString& rId, SfxTabPage& rPage)
 {
     if (rId == "font")
     {
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index f0177530fa70..5478b62ad55c 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -165,7 +165,7 @@ void AbstractSvxCharacterMapDialog_Impl::SetText(const OUString& rStr)
     m_xDlg->set_title(rStr);
 }
 
-void CuiAbstractTabController_Impl::SetCurPageId( const OString &rName )
+void CuiAbstractTabController_Impl::SetCurPageId( const OUString &rName )
 {
     m_xDlg->SetCurPageId( rName );
 }
@@ -191,12 +191,12 @@ void CuiAbstractTabController_Impl::SetText( const OUString& rStr )
     m_xDlg->set_title(rStr);
 }
 
-std::vector<OString> CuiAbstractTabController_Impl::getAllPageUIXMLDescriptions() const
+std::vector<OUString> CuiAbstractTabController_Impl::getAllPageUIXMLDescriptions() const
 {
     return m_xDlg->getAllPageUIXMLDescriptions();
 }
 
-bool CuiAbstractTabController_Impl::selectPageByUIXMLDescription(const OString& rUIXMLDescription)
+bool CuiAbstractTabController_Impl::selectPageByUIXMLDescription(const OUString& rUIXMLDescription)
 {
     return m_xDlg->selectPageByUIXMLDescription(rUIXMLDescription);
 }
@@ -206,7 +206,7 @@ BitmapEx CuiAbstractTabController_Impl::createScreenshot() const
     return m_xDlg->createScreenshot();
 }
 
-OString CuiAbstractTabController_Impl::GetScreenshotId() const
+OUString CuiAbstractTabController_Impl::GetScreenshotId() const
 {
     return m_xDlg->GetScreenshotId();
 }
@@ -466,7 +466,7 @@ bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
 }
 
 // AbstractSvxTransformTabDialog implementations just forwards everything to the dialog
-void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OString& rName )
+void AbstractSvxTransformTabDialog_Impl::SetCurPageId( const OUString& rName )
 {
     m_xDlg->SetCurPageId( rName );
 }
@@ -498,7 +498,7 @@ void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<Svx
 }
 
 // AbstractSvxCaptionDialog implementations just forwards everything to the dialog
-void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OString& rName )
+void AbstractSvxCaptionDialog_Impl::SetCurPageId( const OUString& rName )
 {
     m_xDlg->SetCurPageId(rName);
 }
@@ -571,12 +571,12 @@ void AbstractSvxNameDialog_Impl::SetCheckNameTooltipHdl( const Link<AbstractSvxN
         m_xDlg->SetCheckNameTooltipHdl( Link<SvxNameDialog&,OUString>());
 }
 
-void AbstractSvxNameDialog_Impl::SetEditHelpId(const OString& rHelpId)
+void AbstractSvxNameDialog_Impl::SetEditHelpId(const OUString& rHelpId)
 {
     m_xDlg->SetEditHelpId(rHelpId);
 }
 
-void AbstractSvxNameDialog_Impl::SetHelpId(const OString& rHelpId)
+void AbstractSvxNameDialog_Impl::SetHelpId(const OUString& rHelpId)
 {
     m_xDlg->set_help_id(rHelpId);
 }
@@ -691,7 +691,7 @@ Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic(const Graphic& rGra
 }
 
 // AbstractSvxAreaTabDialog implementations just forwards everything to the dialog
-void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OString& rName )
+void AbstractSvxAreaTabDialog_Impl::SetCurPageId( const OUString& rName )
 {
     m_xDlg->SetCurPageId( rName );
 }
@@ -1409,7 +1409,7 @@ VclPtr<SfxAbstractInsertObjectDialog> AbstractDialogFactory_Impl::CreateInsertOb
 
     if ( pDlg )
     {
-        pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
+        pDlg->SetHelpId(rCommand);
         return VclPtr<AbstractInsertObjectDialog_Impl>::Create( std::move(pDlg) );
     }
     return nullptr;
@@ -1421,7 +1421,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateEditObjectDialog(wel
     if ( rCommand == ".uno:InsertObjectFloatingFrame" )
     {
         auto pDlg = std::make_unique<SfxInsertFloatingFrameDialog>(pParent, xObj);
-        pDlg->SetHelpId( OUStringToOString( rCommand, RTL_TEXTENCODING_UTF8 ) );
+        pDlg->SetHelpId(rCommand);
         return VclPtr<AbstractInsertObjectDialog_Impl>::Create( std::move(pDlg) );
     }
     return nullptr;
@@ -1460,7 +1460,7 @@ VclPtr<VclAbstractDialog> AbstractDialogFactory_Impl::CreateOptionsDialog(weld::
     return VclPtr<CuiAbstractController_Impl>::Create(std::make_unique<OfaTreeOptionsDialog>(pParent, rExtensionId));
 }
 
-VclPtr<SvxAbstractInsRowColDlg> AbstractDialogFactory_Impl::CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId)
+VclPtr<SvxAbstractInsRowColDlg> AbstractDialogFactory_Impl::CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId)
 {
     return VclPtr<SvxInsRowColDlg>::Create(pParent, bCol, rHelpId);
 }
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 991ec082ad48..8e23592d87b7 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -122,17 +122,17 @@ DECL_ABSTDLG_CLASS_UNIQUE(CuiAbstractSingleTabController, SfxAbstractDialog, Sfx
 
 // CuiAbstractTabController_Impl
 DECL_ABSTDLG_CLASS_SHARED_ASYNC(CuiAbstractTabController, SfxAbstractTabDialog, SfxTabDialogController)
-    virtual void                SetCurPageId( const OString &rName ) override;
+    virtual void                SetCurPageId( const OUString &rName ) override;
     virtual const SfxItemSet*   GetOutputItemSet() const override;
     virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override;
     virtual void                SetInputSet( const SfxItemSet* pInSet ) override;
     virtual void        SetText( const OUString& rStr ) override;
 
     // screenshotting
-    virtual std::vector<OString> getAllPageUIXMLDescriptions() const override;
-    virtual bool selectPageByUIXMLDescription(const OString& rUIXMLDescription) override;
+    virtual std::vector<OUString> getAllPageUIXMLDescriptions() const override;
+    virtual bool selectPageByUIXMLDescription(const OUString& rUIXMLDescription) override;
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 // AbstractHangulHanjaConversionDialog_Impl
@@ -235,7 +235,7 @@ DECL_ABSTDLG_CLASS(AbstractSvxJSearchOptionsDialog,SvxJSearchOptionsDialog)
 // AbstractSvxTransformTabDialog_Impl
 DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxTransformTabDialog,SvxTransformTabDialog)
     virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override;
-    virtual void                SetCurPageId( const OString& rName ) override;
+    virtual void                SetCurPageId( const OUString& rName ) override;
     virtual const SfxItemSet*   GetOutputItemSet() const override;
     virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override;
     virtual void                SetInputSet( const SfxItemSet* pInSet ) override;
@@ -245,7 +245,7 @@ DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxTransformTabDialog,SvxTransformTabDialog)
 // AbstractSvxCaptionDialog_Impl
 DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxCaptionDialog,SvxCaptionTabDialog)
     virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) override;
-    virtual void                SetCurPageId( const OString& rName ) override;
+    virtual void                SetCurPageId( const OUString& rName ) override;
     virtual const SfxItemSet*   GetOutputItemSet() const override;
     virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override;
     virtual void                SetInputSet( const SfxItemSet* pInSet ) override;
@@ -268,9 +268,9 @@ DECL_ABSTDLG_CLASS(AbstractSvxNameDialog,SvxNameDialog)
     virtual void    GetName( OUString& rName ) override ;
     virtual void    SetCheckNameHdl( const Link<AbstractSvxNameDialog&,bool>& rLink, bool bCheckImmediately = false ) override ;
     virtual void    SetCheckNameTooltipHdl( const Link<AbstractSvxNameDialog&, OUString>& rLink ) override ;
-    virtual void    SetEditHelpId(const OString&) override ;
+    virtual void    SetEditHelpId(const OUString&) override ;
     //from class Window
-    virtual void    SetHelpId( const OString& ) override ;
+    virtual void    SetHelpId( const OUString& ) override ;
     virtual void    SetText( const OUString& rStr ) override ;
 
 private:
@@ -334,7 +334,7 @@ DECL_ABSTDLG_CLASS(AbstractGraphicFilterDialog,GraphicFilterDialog)
 
 // AbstractSvxAreaTabDialog_Impl
 DECL_ABSTDLG_CLASS_ASYNC(AbstractSvxAreaTabDialog,SvxAreaTabDialog)
-    virtual void SetCurPageId(const OString& rName) override;
+    virtual void SetCurPageId(const OUString& rName) override;
     virtual const SfxItemSet* GetOutputItemSet() const override;
     virtual WhichRangesContainer GetInputRanges( const SfxItemPool& pItem ) override;
     virtual void SetInputSet(const SfxItemSet* pInSet) override;
@@ -586,7 +586,7 @@ public:
     virtual VclPtr<VclAbstractDialog>          CreateOptionsDialog(
         weld::Window* pParent, const OUString& rExtensionId ) override;
 
-    virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId) override;
+    virtual VclPtr<SvxAbstractInsRowColDlg> CreateSvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId) override;
 
     virtual VclPtr<AbstractPasswordToOpenModifyDialog> CreatePasswordToOpenModifyDialog(weld::Window* pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) override;
 
diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx
index 415aa1e9da36..302d11bbc6ea 100644
--- a/cui/source/inc/AdditionsDialog.hxx
+++ b/cui/source/inc/AdditionsDialog.hxx
@@ -58,7 +58,7 @@ class AdditionsDialog : public weld::GenericDialogController
 private:
     Timer m_aSearchDataTimer;
 
-    DECL_LINK(GearHdl, const OString&, void);
+    DECL_LINK(GearHdl, const OUString&, void);
     DECL_LINK(SearchUpdateHdl, weld::Entry&, void);
     DECL_LINK(ImplUpdateDataHdl, Timer*, void);
     DECL_LINK(FocusOut_Impl, weld::Widget&, void);
diff --git a/cui/source/inc/SignatureLineDialogBase.hxx b/cui/source/inc/SignatureLineDialogBase.hxx
index 3cc645819be8..dd114d81ab7d 100644
--- a/cui/source/inc/SignatureLineDialogBase.hxx
+++ b/cui/source/inc/SignatureLineDialogBase.hxx
@@ -21,7 +21,7 @@ class SignatureLineDialogBase : public weld::GenericDialogController
 {
 public:
     SignatureLineDialogBase(weld::Widget* pParent, css::uno::Reference<css::frame::XModel> xModel,
-                            const OUString& rUIFile, const OString& rDialogId);
+                            const OUString& rUIFile, const OUString& rDialogId);
 
     virtual short run() override;
 
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 3c6a7b229ebb..3c45ffce043b 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -61,7 +61,7 @@ private:
 
     bool GetErrorDescription(SpellErrorDescription& rSpellErrorDescription, sal_Int32 nPosition);
 
-    DECL_LINK(ToolbarHdl, const OString&, void);
+    DECL_LINK(ToolbarHdl, const OUString&, void);
 
 protected:
     virtual bool    KeyInput( const KeyEvent& rKEvt ) override;
@@ -176,14 +176,14 @@ private:
     DECL_LINK(CancelHdl, weld::Button&, void);
     DECL_LINK(ModifyHdl, LinkParamNone*, void);
     DECL_LINK(UndoHdl, weld::Button&, void);
-    DECL_LINK(AddToDictSelectHdl, const OString&, void);
+    DECL_LINK(AddToDictSelectHdl, const OUString&, void);
     DECL_LINK(AddToDictClickHdl, weld::Button&, void);
     DECL_LINK(LanguageSelectHdl, weld::ComboBox&, void);
     DECL_LINK(DialogUndoHdl, SpellUndoAction_Impl&, void);
 
     DECL_LINK(InitHdl, void*, void);
 
-    void            AddToDictionaryExecute(const OString& rItemId);
+    void            AddToDictionaryExecute(const OUString& rItemId);
     void            StartSpellOptDlg_Impl();
     int             InitUserDicts();
     void            UpdateBoxes_Impl(bool bCallFromSelectHdl = false);
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx
index bc8fba3f5780..36fee041de76 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -33,15 +33,15 @@ private:
     DECL_LINK(ContentContextMenuHdl, const CommandEvent&, bool);
     DECL_LINK(FunctionContextMenuHdl, const CommandEvent&, bool);
 
-    DECL_LINK(GearHdl, const OString&, void);
+    DECL_LINK(GearHdl, const OUString&, void);
 
     DECL_LINK(SelectCategory, weld::ComboBox&, void);
 
     DECL_LINK(AddCommandHdl, weld::Button&, void);
     DECL_LINK(RemoveCommandHdl, weld::Button&, void);
 
-    DECL_LINK(InsertHdl, const OString&, void);
-    DECL_LINK(ModifyItemHdl, const OString&, void);
+    DECL_LINK(InsertHdl, const OUString&, void);
+    DECL_LINK(ModifyItemHdl, const OUString&, void);
     DECL_LINK(ResetMenuHdl, weld::Button&, void);
 
     DECL_LINK(MenuEntriesSizeAllocHdl, const Size&, void);
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx
index e035d6b7ef31..28fe658f2cca 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -32,7 +32,7 @@ private:
     DECL_LINK(SelectToolbarEntry, weld::TreeView&, void);
     DECL_LINK(MoveHdl, weld::Button&, void);
 
-    DECL_LINK(GearHdl, const OString&, void);
+    DECL_LINK(GearHdl, const OUString&, void);
 
     DECL_LINK(SelectCategory, weld::ComboBox&, void);
 
@@ -42,8 +42,8 @@ private:
     DECL_LINK(AddCommandHdl, weld::Button&, void);
     DECL_LINK(RemoveCommandHdl, weld::Button&, void);
 
-    DECL_LINK(InsertHdl, const OString&, void);
-    DECL_LINK(ModifyItemHdl, const OString&, void);
+    DECL_LINK(InsertHdl, const OUString&, void);
+    DECL_LINK(ModifyItemHdl, const OUString&, void);
     DECL_LINK(ResetToolbarHdl, weld::Button&, void);
 
     virtual void ListModified() override;
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 1c7a289723a6..c18b5b3da4e6 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -32,7 +32,7 @@ public:
         bool bEnableSelector,
         bool bEnableDrawingLayerFillStyles);
 protected:
-    virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override;
+    virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override;
 
 private:
     bool        mbEnableBackgroundSelector : 1;         ///< for Border/Background
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 0ee8e1ba89fe..aaf15b5a870c 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -69,12 +69,12 @@ class SvxConfigDialog : public SfxTabDialogController
 private:
     css::uno::Reference< css::frame::XFrame > m_xFrame;
 
-    virtual void ActivatePage(const OString& rPage) override;
+    virtual void ActivatePage(const OUString& rPage) override;
 
 public:
     SvxConfigDialog(weld::Window*, const SfxItemSet*);
 
-    virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
     void SetFrame(const css::uno::Reference< css::frame::XFrame >& xFrame);
 };
 
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index e61675c1e2c3..b1fd167d6a72 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -39,7 +39,7 @@ protected:
 
     bool                m_bPreviewBackgroundToCharacter;
 
-    SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rAttrSet);
+    SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet& rAttrSet);
 
     void SetPrevFontWidthScale( const SfxItemSet& rSet );
     void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 6467e0bf1f63..cac63d8a6b1e 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -182,7 +182,7 @@ class GalleryThemeProperties : public SfxTabDialogController
 {
     ExchangeData*   pData;
 
-    virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
 public:
     GalleryThemeProperties(weld::Widget* pParent, ExchangeData* pData, SfxItemSet const * pItemSet);
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 122ac87724da..075c74c29f42 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -79,7 +79,7 @@ protected:
 
 public:
 
-    GraphicFilterDialog(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const Graphic& rGraphic);
+    GraphicFilterDialog(weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID, const Graphic& rGraphic);
     virtual Graphic GetFilteredGraphic(const Graphic& rGraphic, double fScaleX, double fScaleY) = 0;
 };
 
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index b43361edfea1..cc85db7cfe3c 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -67,7 +67,7 @@ private:
 
     std::vector< std::unique_ptr<IconChoicePageData> > maPageList;
 
-    OString msCurrentPageId;
+    OUString msCurrentPageId;
 
     const SfxItemSet*       pSet;
     std::unique_ptr<SfxItemSet>     pOutSet;
@@ -87,17 +87,17 @@ private:
     std::unique_ptr<weld::Button> m_xHelpBtn;
     std::unique_ptr<weld::Button> m_xResetBtn;
 
-    DECL_LINK( ChosePageHdl_Impl, const OString&, void );
+    DECL_LINK( ChosePageHdl_Impl, const OUString&, void );
 
-    IconChoicePageData*     GetPageData ( std::string_view rId );
+    IconChoicePageData*     GetPageData ( std::u16string_view rId );
 
-    void                    SwitchPage( const OString& rId );
+    void                    SwitchPage( const OUString& rId );
 
     DECL_LINK( ResetHdl, weld::Button&, void) ;
     DECL_LINK (ClickOkHdl_Impl, weld::Button&, void );
     DECL_LINK (ClickApplyHdl_Impl, weld::Button&, void );
 
-    IconChoicePage*         GetTabPage( std::string_view rPageId )
+    IconChoicePage*         GetTabPage( std::u16string_view rPageId )
                                 { return GetPageData(rPageId)->xPage.get(); }
 
     void                    ActivatePageImpl ();
@@ -113,11 +113,11 @@ public:
     virtual ~SvxHpLinkDlg () override;
 
     // interface
-    void AddTabPage(const OString &rId, CreatePage pCreateFunc /* != NULL */);
+    void AddTabPage(const OUString &rId, CreatePage pCreateFunc /* != NULL */);
 
-    void                SetCurPageId( const OString& rId ) { msCurrentPageId = rId; SwitchPage(rId ); }
-    const OString &     GetCurPageId() const       { return msCurrentPageId; }
-    void                ShowPage( const OString& rId );
+    void                SetCurPageId( const OUString& rId ) { msCurrentPageId = rId; SwitchPage(rId ); }
+    const OUString&     GetCurPageId() const       { return msCurrentPageId; }
+    void                ShowPage( const OUString& rId );
 
     /// gives via map converted local slots if applicable
     WhichRangesContainer GetInputRanges( const SfxItemPool& );
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 1d2c5cb0a534..836470ab2286 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -108,7 +108,7 @@ class SvxAreaTabDialog final : public SfxTabDialogController
     ChangeType          mnGradientListState;
     ChangeType          mnHatchingListState;
 
-    virtual void        PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void        PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
     virtual short       Ok() override;
     DECL_LINK(CancelHdlImpl, weld::Button&, void);
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 7e4d7798f563..1122a2017f00 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -54,7 +54,7 @@ class SvxLineTabDialog final : public SfxTabDialogController
     sal_Int32           nPosDashLb;
     sal_Int32           nPosLineEndLb;
 
-    virtual void        PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void        PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
     virtual short       Ok() override;
     DECL_LINK(CancelHdlImpl, weld::Button&, void);
@@ -170,7 +170,7 @@ private:
     std::unique_ptr<weld::CheckButton> m_xSymbolRatioCB;
 
     // handler for gallery popup menu button + size
-    DECL_LINK(GraphicHdl_Impl, const OString&, void);
+    DECL_LINK(GraphicHdl_Impl, const OUString&, void);
     DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(MenuCreateHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void);
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 0baa56b61948..414540222c7d 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -66,7 +66,7 @@ public:
         m_xBtnOK->set_tooltip_text(rLink.Call(*this));
     }
 
-    void SetEditHelpId(const OString& aHelpId) { m_xEdtName->set_help_id(aHelpId); }
+    void SetEditHelpId(const OUString& aHelpId) { m_xEdtName->set_help_id(aHelpId); }
 };
 
 /** #i68101#
diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h
index f82e0a1c8166..b17932ffa558 100644
--- a/cui/source/inc/helpids.h
+++ b/cui/source/inc/helpids.h
@@ -18,35 +18,36 @@
  */
 #pragma once
 
-#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
 
-inline constexpr OStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
-    = "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME";
-inline constexpr OStringLiteral HID_OFA_FONT_SUBST_CLB = "CUI_HID_OFA_FONT_SUBST_CLB";
-inline constexpr OStringLiteral HID_DBPATH_CTL_PATH = "CUI_HID_DBPATH_CTL_PATH";
+inline constexpr OUStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
+    = u"CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME";
+inline constexpr OUStringLiteral HID_OFA_FONT_SUBST_CLB = u"CUI_HID_OFA_FONT_SUBST_CLB";
+inline constexpr OUStringLiteral HID_DBPATH_CTL_PATH = u"CUI_HID_DBPATH_CTL_PATH";
 #define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
-inline constexpr OStringLiteral HID_OFADLG_TREELISTBOX = "CUI_HID_OFADLG_TREELISTBOX";
-inline constexpr OStringLiteral HID_SVX_CONFIG_TOOLBAR = "CUI_HID_SVX_CONFIG_TOOLBAR";
-inline constexpr OStringLiteral HID_SVX_CONFIG_TOOLBAR_CONTENTS
-    = "CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS";
-inline constexpr OStringLiteral HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS
-    = "CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS";
-inline constexpr OStringLiteral HID_HANGULDLG_SUGGESTIONS_GRID
-    = "CUI_HID_HANGULDLG_SUGGESTIONS_GRID";
-inline constexpr OStringLiteral HID_HANGULDLG_SUGGESTIONS_LIST
-    = "CUI_HID_HANGULDLG_SUGGESTIONS_LIST";
-inline constexpr OStringLiteral HID_SVX_CONFIG_NAME_SUBMENU = "CUI_HID_SVX_CONFIG_NAME_SUBMENU";
-inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_MENU = "CUI_HID_SVX_CONFIG_RENAME_MENU";
-inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_MENU_ITEM
-    = "CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM";
-inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR = "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR";
-inline constexpr OStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM
-    = "CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM";
-inline constexpr OStringLiteral HID_SVX_UP_TOOLBAR_ITEM = "CUI_HID_SVX_UP_TOOLBAR_ITEM";
-inline constexpr OStringLiteral HID_SVX_DOWN_TOOLBAR_ITEM = "CUI_HID_SVX_DOWN_TOOLBAR_ITEM";
-inline constexpr OStringLiteral HID_SVX_SAVE_IN = "CUI_HID_SVX_SAVE_IN";
-inline constexpr OStringLiteral HID_SVX_TOPLEVELLISTBOX = "CUI_HID_SVX_TOPLEVELLISTBOX";
-inline constexpr OStringLiteral HID_SVX_DESCFIELD = "CUI_HID_SVX_DESCFIELD";
-inline constexpr OStringLiteral HID_MACRO_HEADERTABLISTBOX = "CUI_HID_MACRO_HEADERTABLISTBOX";
+inline constexpr OUStringLiteral HID_OFADLG_TREELISTBOX = u"CUI_HID_OFADLG_TREELISTBOX";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_TOOLBAR = u"CUI_HID_SVX_CONFIG_TOOLBAR";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_TOOLBAR_CONTENTS
+    = u"CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS
+    = u"CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS";
+inline constexpr OUStringLiteral HID_HANGULDLG_SUGGESTIONS_GRID
+    = u"CUI_HID_HANGULDLG_SUGGESTIONS_GRID";
+inline constexpr OUStringLiteral HID_HANGULDLG_SUGGESTIONS_LIST
+    = u"CUI_HID_HANGULDLG_SUGGESTIONS_LIST";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_NAME_SUBMENU = u"CUI_HID_SVX_CONFIG_NAME_SUBMENU";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_MENU = u"CUI_HID_SVX_CONFIG_RENAME_MENU";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_MENU_ITEM
+    = u"CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR
+    = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR";
+inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM
+    = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM";
+inline constexpr OUStringLiteral HID_SVX_UP_TOOLBAR_ITEM = u"CUI_HID_SVX_UP_TOOLBAR_ITEM";
+inline constexpr OUStringLiteral HID_SVX_DOWN_TOOLBAR_ITEM = u"CUI_HID_SVX_DOWN_TOOLBAR_ITEM";
+inline constexpr OUStringLiteral HID_SVX_SAVE_IN = u"CUI_HID_SVX_SAVE_IN";
+inline constexpr OUStringLiteral HID_SVX_TOPLEVELLISTBOX = u"CUI_HID_SVX_TOPLEVELLISTBOX";
+inline constexpr OUStringLiteral HID_SVX_DESCFIELD = u"CUI_HID_SVX_DESCFIELD";
+inline constexpr OUStringLiteral HID_MACRO_HEADERTABLISTBOX = u"CUI_HID_MACRO_HEADERTABLISTBOX";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index e3c399bd48b5..f0f7ef751997 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -94,7 +94,7 @@ public:
         weld::Container* pParent,
         SvxHpLinkDlg* pDlg,
         const OUString& rUIXMLDescription,
-        const OString& rID,
+        const OUString& rID,
         const SfxItemSet* pItemSet
     );
     virtual ~SvxHyperlinkTabPageBase () override;
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 6367016fe8b5..e31aaa74e0db 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -44,12 +44,12 @@ private:
 
 protected:
 
-    IconChoicePage(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet* pItemSet);
+    IconChoicePage(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet* pItemSet);
 
 public:
     virtual ~IconChoicePage();
 
-    OString GetHelpId() const { return xContainer->get_help_id(); }
+    OUString GetHelpId() const { return xContainer->get_help_id(); }
 
     const SfxItemSet&   GetItemSet() const { return *pSet; }
 
@@ -67,12 +67,12 @@ public:
 /// Data-structure for pages in dialog
 struct IconChoicePageData
 {
-    OString sId;
+    OUString sId;
     std::unique_ptr<IconChoicePage> xPage;      ///< the TabPage itself
     bool bRefresh;          ///< Flag: page has to be newly initialized
 
     // constructor
-    IconChoicePageData(OString aId, std::unique_ptr<IconChoicePage> xInPage)
+    IconChoicePageData(OUString aId, std::unique_ptr<IconChoicePage> xInPage)
         : sId(std::move(aId))
         , xPage(std::move(xInPage))
         , bRefresh(false)
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index 4938314a3cd3..61c707507087 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -36,12 +36,12 @@ protected:
     comphelper::EmbeddedObjectContainer aCnt;
 
     InsertObjectDialog_Impl(weld::Window * pParent,
-        const OUString& rUIXMLDescription, const OString& rID,
+        const OUString& rUIXMLDescription, const OUString& rID,
         css::uno::Reference < css::embed::XStorage > xStorage);
 public:
     const css::uno::Reference<css::embed::XEmbeddedObject>& GetObject() const { return m_xObj; }
     virtual css::uno::Reference<css::io::XInputStream> GetIconIfIconified(OUString* pGraphicMediaType);
-    void SetHelpId(const OString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
+    void SetHelpId(const OUString& rHelpId) { m_xDialog->set_help_id(rHelpId); }
     virtual bool IsCreateNew() const;
 };
 
diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx
index e003795383dc..597ef172c3e9 100644
--- a/cui/source/inc/insrc.hxx
+++ b/cui/source/inc/insrc.hxx
@@ -30,7 +30,7 @@ private:
     std::unique_ptr<weld::RadioButton> m_xAfterBtn;
 
 public:
-    SvxInsRowColDlg(weld::Window* pParent, bool bCol, const OString& rHelpId);
+    SvxInsRowColDlg(weld::Window* pParent, bool bCol, const OUString& rHelpId);
 
     virtual short Execute() override;
 
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 8146ec388f53..5d7f778d5c38 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -102,7 +102,7 @@ private:
 
     Link<SvxSwFrameValidation&,void> aValidateLink;
 
-    virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
 public:
     SvxCaptionTabDialog(weld::Window* pParent, const SdrView* pView,
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index cecdf3b55224..2f2471bb09eb 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -71,7 +71,7 @@ protected:
     bool bDocModified, bAppEvents, bInitialized;
     std::vector< EventDisplayName > aDisplayNames;
 
-    SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet);
+    SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet& rItemSet);
 
     void                        EnableButtons();
     static css::uno::Any  GetPropsByName( const OUString& eventName, EventsHash& eventsHash );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 8f554722fa67..dd1dfbaf31c6 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -265,7 +265,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
     DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
     DECL_LINK(LevelHdl, void *, void);
     DECL_LINK(PopupActivateHdl_Impl, weld::Toggleable&, void);
-    DECL_LINK(GraphicHdl_Impl, const OString&, void);
+    DECL_LINK(GraphicHdl_Impl, const OUString&, void);
     DECL_LINK(BulletHdl_Impl, weld::Button&, void);
     DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void);
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index c8fcbf704095..aac8d982b454 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -40,7 +40,7 @@ private:
 public:
     SvxFormatCellsDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrModel& rModel, bool bStyle);
 
-    virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
 };
 
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index e95fccd413fd..712abc8b55bc 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -30,7 +30,7 @@ public:
     virtual ~SvxSearchFormatDialog() override;
 
 protected:
-    virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
 private:
     std::unique_ptr<FontList> m_pFontList;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 8f4767e22fe8..010d3954716c 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -96,7 +96,7 @@ class SvxTextTabDialog : public SfxTabDialogController
 private:
     const SdrView*      pView;
 
-    virtual void        PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void        PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
 public:
     SvxTextTabDialog(weld::Window* pParent, const SfxItemSet* pAttr, const SdrView* pView);
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 30b789dc73c4..0a30b720fc81 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -41,7 +41,7 @@ private:
     SvxAnchorIds        nAnchorCtrls;
     Link<SvxSwFrameValidation&,void> aValidateLink;
 
-    virtual void        PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void        PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
 public:
     SvxTransformTabDialog(weld::Window* pParent, const SfxItemSet* pAttr,
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 15d3dadcf244..335c517622b5 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -62,7 +62,7 @@ struct
     // group
     Group eGroup;
     // .ui group name
-    const char *pGroup;
+    OUString pGroup;
 }
 const vGroupInfo[] =
 {
@@ -82,9 +82,9 @@ struct
     // group
     Group eGroup;
     //checkbox (or simple text)
-    const char *pText;
+    OUString pText;
     //color listbox
-    const char *pColor;
+    OUString pColor;
     // has checkbox?
     bool bCheckBox;
 }
@@ -235,7 +235,7 @@ private:
         // text
         std::unique_ptr<weld::Label> m_xText;
     public:
-        Chapter(weld::Builder& rBuilder, const char* pLabelWidget, bool bShow);
+        Chapter(weld::Builder& rBuilder, const OUString& pLabelWidget, bool bShow);
         void SetText(const OUString& rLabel) { m_xText->set_label(rLabel); }
     };
 
@@ -243,7 +243,7 @@ private:
     // text (checkbox) + color list box
     struct Entry
     {
-        Entry(weld::Window* pTopLevel, weld::Builder& rBuilder, const char* pTextWidget, const char* pColorWidget,
+        Entry(weld::Window* pTopLevel, weld::Builder& rBuilder, const OUString& pTextWidget, const OUString& pColorWidget,
               const Color& rColor, int nCheckBoxLabelOffset, const ColorListBox* pCache, bool bCheckBox, bool bShow);
         void SetText(const OUString& rLabel) { dynamic_cast<weld::Label&>(*m_xText).set_label(rLabel); }
         int get_height_request() const
@@ -305,7 +305,7 @@ private:
 // ctor for default groups
 // rParent: parent window (ColorConfigWindow_Impl)
 // eGroup: which group is this?
-ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder& rBuilder, const char* pLabelWidget, bool bShow)
+ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder& rBuilder, const OUString& pLabelWidget, bool bShow)
     : m_xText(rBuilder.weld_label(pLabelWidget))
 {
     if (!bShow)
@@ -314,7 +314,7 @@ ColorConfigWindow_Impl::Chapter::Chapter(weld::Builder& rBuilder, const char* pL
 
 // ColorConfigWindow_Impl::Entry
 ColorConfigWindow_Impl::Entry::Entry(weld::Window* pTopLevel, weld::Builder& rBuilder,
-                                     const char* pTextWidget, const char* pColorWidget,
+                                     const OUString& pTextWidget, const OUString& pColorWidget,
                                      const Color& rColor, int nCheckBoxLabelOffset,
                                      const ColorListBox* pCache, bool bCheckBox, bool bShow)
     : m_xColorList(new ColorListBox(rBuilder.weld_menu_button(pColorWidget),
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 0940894216bb..b3fb5cb02baf 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -80,7 +80,7 @@ namespace Lang
 struct
 {
     // id of the text
-    const char *pTextId;
+    OUString pTextId;
     // language flags (see Lang above):
     // which language is this row for?
     unsigned nLangFlags;
@@ -110,7 +110,7 @@ struct
     // in which row?
     RowType eRow;
     // id of the edit box
-    const char *pEditId;
+    OUString pEditId;
     // id for SvtUserOptions in unotools/useroptions.hxx
     UserOptToken nUserOptionsId;
     // id for settings the focus (defined in svx/optgenrl.hxx)
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 3cc3aab9a9ef..c1ee526574e6 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -37,7 +37,7 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage(weld::Container* pPage,
 {
     for (sal_uInt32 i = 0; i < MAX_DEFAULT_PERSONAS; ++i)
     {
-        OString sDefaultId("default" + OString::number(i));
+        OUString sDefaultId("default" + OUString::number(i));
         m_vDefaultPersonaImages[i] = m_xBuilder->weld_toggle_button(sDefaultId);
         m_vDefaultPersonaImages[i]->connect_clicked(
             LINK(this, SvxPersonalizationTabPage, DefaultPersona));
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 93f4432d16ee..be7bcda79227 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -653,8 +653,8 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, HelpHdl_Impl, weld::Widget&, bool)
         OptionsPageInfo* pPageInfo = weld::fromId<OptionsPageInfo*>(xTreeLB->get_id(*xCurrentPageEntry));
         if (pPageInfo->m_xPage)
         {
-            OString sHelpId(pPageInfo->m_xPage->GetHelpId());
-            pHelp->Start(OStringToOUString(sHelpId, RTL_TEXTENCODING_UTF8), m_xDialog.get());
+            OUString sHelpId(pPageInfo->m_xPage->GetHelpId());
+            pHelp->Start(sHelpId, m_xDialog.get());
             return false;
         }
     }
@@ -985,7 +985,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
     pNewPage = pPageInfo->m_xPage.get();
 
     // fdo#58170 use current page's layout child HelpId, unless there isn't a current page
-    OString sHelpId(pNewPage ? pNewPage->GetHelpId() : OString());
+    OUString sHelpId(pNewPage ? pNewPage->GetHelpId() : OUString());
     if (sHelpId.isEmpty())
         sHelpId = HID_OFADLG_TREELISTBOX;
     xTreeLB->set_help_id(sHelpId);
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 446775c6abad..aea3f7d9727e 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -167,7 +167,7 @@ IMPL_LINK_NOARG(OfaAutoCorrDlg, SelectLanguageHdl, weld::ComboBox&, void)
     if(eNewLang == eLastDialogLanguage)
         return;
 
-    OString sPageId = GetCurPageId();
+    OUString sPageId = GetCurPageId();
     if (sPageId == "replace")
     {
         OfaAutocorrReplacePage* pPage = static_cast<OfaAutocorrReplacePage*>(GetTabPage(sPageId));
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index 488fc5283a6b..9fc59604476e 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -33,8 +33,8 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window *pParent,
             ? OUString("cui/ui/borderareatransparencydialog.ui")
             : OUString("cui/ui/borderbackgrounddialog.ui"),
         bEnableDrawingLayerFillStyles
-            ? OString("BorderAreaTransparencyDialog")
-            : OString("BorderBackgroundDialog"),
+            ? OUString("BorderAreaTransparencyDialog")
+            : OUString("BorderBackgroundDialog"),
         &rCoreSet)
     , mbEnableBackgroundSelector(bEnableSelector)
 {
@@ -51,7 +51,7 @@ SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(weld::Window *pParent,
     }
 }
 
-void SvxBorderBackgroundDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage)
+void SvxBorderBackgroundDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage)
 {
     if (rPageId == "background")
     {
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 7f418a762047..0c600f83ab24 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -132,7 +132,7 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont()
     return m_aPreviewWin.GetCTLFont();
 }
 
-SvxCharBasePage::SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemset)
+SvxCharBasePage::SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet& rItemset)
     : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rItemset)
     , m_bPreviewBackgroundToCharacter( false )
 {
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index cb048426c73a..c5661586472c 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -474,7 +474,7 @@ SvxCaptionTabDialog::SvxCaptionTabDialog(weld::Window* pParent, const SdrView* p
         SvxCaptionTabPage::GetRanges );
 }
 
-void SvxCaptionTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxCaptionTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (rId == "RID_SVXPAGE_POSITION_SIZE")
     {
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 348d96e339e8..2179ad2cf107 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -1796,14 +1796,14 @@ IMPL_LINK(SvxNumOptionsTabPage, BulRelSizeHdl_Impl, weld::MetricSpinButton&, rFi
     SetModified();
 }
 
-IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OString&, rIdent, void)
+IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OUString&, rIdent, void)
 {
     OUString                aGrfName;
     Size                    aSize;
     bool                bSucc(false);
     SvxOpenGraphicDialog aGrfDlg(CuiResId(RID_CUISTR_EDIT_GRAPHIC), GetFrameWeld());
 
-    OString sNumber;
+    OUString sNumber;
     if (rIdent.startsWith("gallery", &sNumber))
     {
         auto idx = sNumber.toUInt32();
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index d03199c7b982..9b082680fcee 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -222,7 +222,7 @@ IMPL_LINK_NOARG(SvxAreaTabDialog, CancelHdlImpl, weld::Button&, void)
     m_xDialog->response(RET_CANCEL);
 }
 
-void SvxAreaTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxAreaTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (rId == "RID_SVXPAGE_AREA")
     {
diff --git a/cui/source/tabpages/tabline.cxx b/cui/source/tabpages/tabline.cxx
index 1cf54885047d..ac6cadd51109 100644
--- a/cui/source/tabpages/tabline.cxx
+++ b/cui/source/tabpages/tabline.cxx
@@ -160,7 +160,7 @@ IMPL_LINK_NOARG(SvxLineTabDialog, CancelHdlImpl, weld::Button&, void)
     m_xDialog->response(RET_CANCEL);
 }
 
-void SvxLineTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxLineTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (rId == "RID_SVXPAGE_LINE")
     {
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index e086969bbbd1..b5ba3d90ce62 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -53,7 +53,7 @@ SvxTextTabDialog::SvxTextTabDialog(weld::Window* pParent, const SfxItemSet* pAtt
 |*
 \************************************************************************/
 
-void SvxTextTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxTextTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (rId != "RID_SVXPAGE_TEXTATTR")
         return;
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 85efe01a1c2f..06e95d3fdcaf 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -1517,7 +1517,7 @@ IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::Toggleable&, void)
 
 // #58425# Symbols on a list (e.g. StarChart)
 // Handler for menu button
-IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OString&, rIdent, void)
+IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OUString&, rIdent, void)
 {
     const Graphic* pGraphic = nullptr;
     Graphic aGraphic;
@@ -1525,7 +1525,7 @@ IMPL_LINK(SvxLineTabPage, GraphicHdl_Impl, const OString&, rIdent, void)
     bool bEnable = true;
     tools::Long nPreviousSymbolType = m_nSymbolType;
 
-    OString sNumber;
+    OUString sNumber;
     if (rIdent.startsWith("gallery", &sNumber))
     {
         SvxBmpItemInfo* pInfo = m_aGalleryBrushItems[sNumber.toUInt32()].get();
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 40f54d302a3f..05fd9e56704f 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -93,7 +93,7 @@ SvxTransformTabDialog::SvxTransformTabDialog(weld::Window* pParent, const SfxIte
 }
 
 
-void SvxTransformTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SvxTransformTabDialog::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (rId == "RID_SVXPAGE_POSITION_SIZE")
     {
@@ -386,11 +386,11 @@ SvxSlantTabPage::SvxSlantTabPage(weld::Container* pPage, weld::DialogController*
 {
     for (int i = 0; i < 2; ++i)
     {
-        m_aControlGroups[i] = m_xBuilder->weld_widget("controlgroups" + OString::number(i+1));
-        m_aControlGroupX[i] = m_xBuilder->weld_widget("controlgroupx" + OString::number(i+1));
-        m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" + OString::number(i+1), FieldUnit::CM);
-        m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" + OString::number(i+1));
-        m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" + OString::number(i+1), FieldUnit::CM);
+        m_aControlGroups[i] = m_xBuilder->weld_widget("controlgroups" + OUString::number(i+1));
+        m_aControlGroupX[i] = m_xBuilder->weld_widget("controlgroupx" + OUString::number(i+1));
+        m_aControlX[i] = m_xBuilder->weld_metric_spin_button("controlx" + OUString::number(i+1), FieldUnit::CM);
+        m_aControlGroupY[i] = m_xBuilder->weld_widget("controlgroupy" + OUString::number(i+1));
+        m_aControlY[i] = m_xBuilder->weld_metric_spin_button("controly" + OUString::number(i+1), FieldUnit::CM);
     }
 
     // this page needs ExchangeSupport