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>

51 files changed, 207 insertions, 207 deletions

diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index 18e898ee7333..bb9233441553 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -19,44 +19,44 @@
 
 #pragma once
 
-#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
 
-inline constexpr OStringLiteral HID_SDDRAWVIEWSHELL = "SD_HID_SDDRAWVIEWSHELL";
-inline constexpr OStringLiteral HID_SDGRAPHICVIEWSHELL = "SD_HID_SDGRAPHICVIEWSHELL";
-inline constexpr OStringLiteral HID_SDOUTLINEVIEWSHELL = "SD_HID_SDOUTLINEVIEWSHELL";
+inline constexpr OUStringLiteral HID_SDDRAWVIEWSHELL = u"SD_HID_SDDRAWVIEWSHELL";
+inline constexpr OUStringLiteral HID_SDGRAPHICVIEWSHELL = u"SD_HID_SDGRAPHICVIEWSHELL";
+inline constexpr OUStringLiteral HID_SDOUTLINEVIEWSHELL = u"SD_HID_SDOUTLINEVIEWSHELL";
 
-inline constexpr OStringLiteral HID_SD_WIN_PRESENTATION = "SD_HID_SD_WIN_PRESENTATION";
+inline constexpr OUStringLiteral HID_SD_WIN_PRESENTATION = u"SD_HID_SD_WIN_PRESENTATION";
 
-#define HID_SD_HTMLEXPORT_PAGE1                                 "SD_HID_SD_HTMLEXPORT_PAGE1"
-#define HID_SD_HTMLEXPORT_PAGE2                                 "SD_HID_SD_HTMLEXPORT_PAGE2"
-#define HID_SD_HTMLEXPORT_PAGE3                                 "SD_HID_SD_HTMLEXPORT_PAGE3"
-#define HID_SD_HTMLEXPORT_PAGE4                                 "SD_HID_SD_HTMLEXPORT_PAGE4"
-#define HID_SD_HTMLEXPORT_PAGE5                                 "SD_HID_SD_HTMLEXPORT_PAGE5"
-#define HID_SD_HTMLEXPORT_PAGE6                                 "SD_HID_SD_HTMLEXPORT_PAGE6"
+inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE1 = u"SD_HID_SD_HTMLEXPORT_PAGE1";
+inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE2 = u"SD_HID_SD_HTMLEXPORT_PAGE2";
+inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE3 = u"SD_HID_SD_HTMLEXPORT_PAGE3";
+inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE4 = u"SD_HID_SD_HTMLEXPORT_PAGE4";
+inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE5 = u"SD_HID_SD_HTMLEXPORT_PAGE5";
+inline constexpr OUStringLiteral HID_SD_HTMLEXPORT_PAGE6 = u"SD_HID_SD_HTMLEXPORT_PAGE6";
 
-inline constexpr OStringLiteral HID_SD_TABBAR_PAGES = "SD_HID_SD_TABBAR_PAGES";
-inline constexpr OStringLiteral HID_SD_TABBAR_LAYERS = "SD_HID_SD_TABBAR_LAYERS";
+inline constexpr OUStringLiteral HID_SD_TABBAR_PAGES = u"SD_HID_SD_TABBAR_PAGES";
+inline constexpr OUStringLiteral HID_SD_TABBAR_LAYERS = u"SD_HID_SD_TABBAR_LAYERS";
 
-inline constexpr OStringLiteral HID_SD_NAMEDIALOG_OBJECT = "SD_HID_SD_NAMEDIALOG_OBJECT";
-inline constexpr OStringLiteral HID_SD_NAMEDIALOG_PAGE = "SD_HID_SD_NAMEDIALOG_PAGE";
-inline constexpr OStringLiteral HID_SD_NAMEDIALOG_LINEEND = "SD_HID_SD_NAMEDIALOG_LINEEND";
+inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_OBJECT = u"SD_HID_SD_NAMEDIALOG_OBJECT";
+inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_PAGE = u"SD_HID_SD_NAMEDIALOG_PAGE";
+inline constexpr OUStringLiteral HID_SD_NAMEDIALOG_LINEEND = u"SD_HID_SD_NAMEDIALOG_LINEEND";
 
-inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_CURRENT = "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT";
-inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_RECENT = "SD_HID_SD_TASK_PANE_PREVIEW_RECENT";
-inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_ALL = "SD_HID_SD_TASK_PANE_PREVIEW_ALL";
-inline constexpr OStringLiteral HID_SD_TASK_PANE_PREVIEW_LAYOUTS = "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS";
+inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_CURRENT = u"SD_HID_SD_TASK_PANE_PREVIEW_CURRENT";
+inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_RECENT = u"SD_HID_SD_TASK_PANE_PREVIEW_RECENT";
+inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_ALL = u"SD_HID_SD_TASK_PANE_PREVIEW_ALL";
+inline constexpr OUStringLiteral HID_SD_TASK_PANE_PREVIEW_LAYOUTS = u"SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS";
 
-inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX";
-inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX";
-inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX";
-inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX";
-inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX";
-inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX";
-inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX";
-inline constexpr OStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX = "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX";
+inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX";
+inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX";
+inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX";
+inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX";
+inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX";
+inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX";
+inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX";
+inline constexpr OUStringLiteral HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX = u"SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX";
 
 
-inline constexpr OStringLiteral HID_SD_RULER_HORIZONTAL = "SD_HID_SD_RULER_HORIZONTAL";
-inline constexpr OStringLiteral HID_SD_RULER_VERTICAL = "SD_HID_SD_RULER_VERTICAL";
+inline constexpr OUStringLiteral HID_SD_RULER_HORIZONTAL = u"SD_HID_SD_RULER_HORIZONTAL";
+inline constexpr OUStringLiteral HID_SD_RULER_VERTICAL = u"SD_HID_SD_RULER_VERTICAL";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx
index 9428325cdca0..84c1a6ff8e2e 100644
--- a/sd/inc/sdabstdlg.hxx
+++ b/sd/inc/sdabstdlg.hxx
@@ -99,7 +99,7 @@ protected:
     virtual ~AbstractSdInsertLayerDlg() override = default;
 public:
     virtual void    GetAttr( SfxItemSet& rOutAttrs ) = 0;
-    virtual void    SetHelpId( const OString& rHelpId ) = 0;
+    virtual void    SetHelpId( const OUString& rHelpId ) = 0;
 };
 
 class AbstractSdInsertPagesObjsDlg : public VclAbstractDialog
diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h
index 829e5d50a73c..6c79485bb31a 100644
--- a/sd/inc/sdcommands.h
+++ b/sd/inc/sdcommands.h
@@ -18,9 +18,9 @@
  */
 #pragma once
 
-#include <rtl/string.hxx>
+#include <rtl/ustring.hxx>
 
-inline constexpr OStringLiteral CMD_SID_HANDOUT_MASTER_MODE = ".uno:HandoutMode";
-inline constexpr OStringLiteral CMD_SID_NOTES_MODE = ".uno:NotesMode";
+inline constexpr OUStringLiteral CMD_SID_HANDOUT_MASTER_MODE = u".uno:HandoutMode";
+inline constexpr OUStringLiteral CMD_SID_NOTES_MODE = u".uno:NotesMode";
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 257021d96dc9..9fbaec3840aa 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -58,7 +58,7 @@ const sal_uInt16 nMagic = sal_uInt16(0x1977);
 constexpr OUStringLiteral KEY_QUALITY = u"JPG-EXPORT-QUALITY";
 
 // The Help-IDs of the pages
-const char* const aPageHelpIds[NOOFPAGES] =
+constexpr rtl::OUStringConstExpr aPageHelpIds[NOOFPAGES] =
 {
     HID_SD_HTMLEXPORT_PAGE1,
     HID_SD_HTMLEXPORT_PAGE2,
diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 41d7685798d4..e12e6ea123e7 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -329,7 +329,7 @@ public:
     virtual Any getValue() override;
     virtual void setValue( const Any& rValue, const OUString& ) override;
 
-    DECL_LINK(implMenuSelectHdl, const OString& rIdent, void);
+    DECL_LINK(implMenuSelectHdl, const OUString& rIdent, void);
 
 private:
     Link<LinkParamNone*,void> maModifyHdl;
@@ -364,7 +364,7 @@ IMPL_LINK_NOARG(SdCharHeightPropertyBox, EditModifyHdl, weld::MetricSpinButton&,
     maModifyHdl.Call(nullptr);
 }
 
-IMPL_LINK(SdCharHeightPropertyBox, implMenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(SdCharHeightPropertyBox, implMenuSelectHdl, const OUString&, rIdent, void)
 {
     sal_Int32 nValue = rIdent.toInt32();
     mxMetric->set_value(nValue, FieldUnit::PERCENT);
@@ -396,7 +396,7 @@ public:
     virtual Any getValue() override;
     virtual void setValue( const Any& rValue, const OUString& rPresetId  ) override;
 
-    DECL_LINK(implMenuSelectHdl, const OString&, void);
+    DECL_LINK(implMenuSelectHdl, const OUString&, void);
     DECL_LINK(implModifyHdl, weld::MetricSpinButton&, void);
 
     void updateMenu();
@@ -439,7 +439,7 @@ void SdTransparencyPropertyBox::updateMenu()
 {
     sal_Int64 nValue = mxMetric->get_value(FieldUnit::PERCENT);
     for (sal_uInt16 i = 25; i < 101; i += 25)
-        mxControl->set_item_active(OString::number(i), nValue == i);
+        mxControl->set_item_active(OUString::number(i), nValue == i);
 }
 
 IMPL_LINK_NOARG(SdTransparencyPropertyBox, implModifyHdl, weld::MetricSpinButton&, void)
@@ -448,7 +448,7 @@ IMPL_LINK_NOARG(SdTransparencyPropertyBox, implModifyHdl, weld::MetricSpinButton
     maModifyHdl.Call(nullptr);
 }
 
-IMPL_LINK(SdTransparencyPropertyBox, implMenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(SdTransparencyPropertyBox, implMenuSelectHdl, const OUString&, rIdent, void)
 {
     auto nValue = rIdent.toInt32();
     if (nValue != mxMetric->get_value(FieldUnit::PERCENT))
@@ -485,7 +485,7 @@ public:
     virtual Any getValue() override;
     virtual void setValue( const Any& rValue, const OUString& ) override;
 
-    DECL_LINK(implMenuSelectHdl, const OString&, void);
+    DECL_LINK(implMenuSelectHdl, const OUString&, void);
     DECL_LINK(implModifyHdl, weld::MetricSpinButton&, void);
 
     void updateMenu();
@@ -538,7 +538,7 @@ IMPL_LINK_NOARG(SdRotationPropertyBox, implModifyHdl, weld::MetricSpinButton&, v
     maModifyHdl.Call(nullptr);
 }
 
-IMPL_LINK(SdRotationPropertyBox, implMenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(SdRotationPropertyBox, implMenuSelectHdl, const OUString&, rIdent, void)
 {
     auto nValue = mxMetric->get_value(FieldUnit::DEGREE);
     bool bDirection = nValue >= 0;
@@ -588,7 +588,7 @@ public:
     virtual Any getValue() override;
     virtual void setValue( const Any& rValue, const OUString& ) override;
 
-    DECL_LINK(implMenuSelectHdl, const OString&, void);
+    DECL_LINK(implMenuSelectHdl, const OUString&, void);
     DECL_LINK(implModifyHdl, weld::MetricSpinButton&, void);
 
     void updateMenu();
@@ -641,7 +641,7 @@ IMPL_LINK_NOARG(SdScalePropertyBox, implModifyHdl, weld::MetricSpinButton&, void
     maModifyHdl.Call(nullptr);
 }
 
-IMPL_LINK(SdScalePropertyBox, implMenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(SdScalePropertyBox, implMenuSelectHdl, const OUString&, rIdent, void)
 {
     auto nValue = mxMetric->get_value(FieldUnit::PERCENT);
 
@@ -770,7 +770,7 @@ public:
     virtual Any getValue() override;
     virtual void setValue( const Any& rValue, const OUString& ) override;
 
-    DECL_LINK(implMenuSelectHdl, const OString&, void);
+    DECL_LINK(implMenuSelectHdl, const OUString&, void);
 
     void update();
 
@@ -819,7 +819,7 @@ void SdFontStylePropertyBox::update()
     mxEdit->set_font(aFont);
 }
 
-IMPL_LINK(SdFontStylePropertyBox, implMenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(SdFontStylePropertyBox, implMenuSelectHdl, const OUString&, rIdent, void)
 {
     if (rIdent == "bold")
     {
@@ -1942,7 +1942,7 @@ IMPL_LINK_NOARG(CustomAnimationTextAnimTabPage, implSelectHdl, weld::ComboBox&,
     updateControlStates();
 }
 
-CustomAnimationDialog::CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OString& rPage)
+CustomAnimationDialog::CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OUString& rPage)
     : GenericDialogController(pParent, "modules/simpress/ui/customanimationproperties.ui", "CustomAnimationProperties")
     , mxSet(std::move(pSet))
     , mxTabControl(m_xBuilder->weld_notebook("tabcontrol"))
diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx
index b8a8abcff00a..34101fbc1f29 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.hxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.hxx
@@ -118,7 +118,7 @@ class STLPropertySet;
 class CustomAnimationDialog : public weld::GenericDialogController
 {
 public:
-    CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OString& Page);
+    CustomAnimationDialog(weld::Window* pParent, std::unique_ptr<STLPropertySet> pSet, const OUString& Page);
     virtual ~CustomAnimationDialog() override;
 
     STLPropertySet* getResultSet();
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 43d48f05aeb4..0128f210eb77 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -1209,14 +1209,14 @@ IMPL_LINK(CustomAnimationList, CommandHdl, const CommandEvent&, rCEvt, bool)
     xMenu->set_sensitive("options", nEntries == 1);
     xMenu->set_sensitive("timing", nEntries == 1);
 
-    OString sCommand = xMenu->popup_at_rect(mxTreeView.get(), ::tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)));
+    OUString sCommand = xMenu->popup_at_rect(mxTreeView.get(), ::tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)));
     if (!sCommand.isEmpty())
         ExecuteContextMenuAction(sCommand);
 
     return true;
 }
 
-void CustomAnimationList::ExecuteContextMenuAction(const OString& rIdent)
+void CustomAnimationList::ExecuteContextMenuAction(const OUString& rIdent)
 {
     mpController->onContextMenu(rIdent);
 }
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 6578f3eb3c27..2276fa91b3aa 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -851,7 +851,7 @@ void CustomAnimationPane::onDoubleClick()
     showOptions();
 }
 
-void CustomAnimationPane::onContextMenu(const OString &rIdent)
+void CustomAnimationPane::onContextMenu(const OUString &rIdent)
 {
     if (rIdent == "onclick")
         onChangeStart( EffectNodeType::ON_CLICK );
@@ -1606,7 +1606,7 @@ void CustomAnimationPane::changeSelection( STLPropertySet const * pResultSet, ST
     }
 }
 
-void CustomAnimationPane::showOptions(const OString& rPage)
+void CustomAnimationPane::showOptions(const OUString& rPage)
 {
     std::unique_ptr<STLPropertySet> xSet = createSelectionSet();
 
diff --git a/sd/source/ui/annotations/annotationwindow.cxx b/sd/source/ui/annotations/annotationwindow.cxx
index 6c1210575915..dd6290206966 100644
--- a/sd/source/ui/annotations/annotationwindow.cxx
+++ b/sd/source/ui/annotations/annotationwindow.cxx
@@ -297,7 +297,7 @@ void AnnotationWindow::InitControls()
     mxTextControl->GrabFocus();
 }
 
-IMPL_LINK(AnnotationWindow, MenuItemSelectedHdl, const OString&, rIdent, void)
+IMPL_LINK(AnnotationWindow, MenuItemSelectedHdl, const OUString&, rIdent, void)
 {
     SfxDispatcher* pDispatcher = mpDocShell->GetViewShell()->GetViewFrame()->GetDispatcher();
     if (!pDispatcher)
diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx
index 558cc61651a6..a150ebf1c8cd 100644
--- a/sd/source/ui/annotations/annotationwindow.hxx
+++ b/sd/source/ui/annotations/annotationwindow.hxx
@@ -92,7 +92,7 @@ private:
     std::unique_ptr<weld::MenuButton> mxMenuButton;
 
     DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void);
-    DECL_LINK(MenuItemSelectedHdl, const OString&, void);
+    DECL_LINK(MenuItemSelectedHdl, const OUString&, void);
 
     void FillMenuButton();
     void InitControls();
diff --git a/sd/source/ui/app/scalectrl.cxx b/sd/source/ui/app/scalectrl.cxx
index 90ccbc78150e..84667f41cebb 100644
--- a/sd/source/ui/app/scalectrl.cxx
+++ b/sd/source/ui/app/scalectrl.cxx
@@ -87,7 +87,7 @@ void SdScaleControl::Command(const CommandEvent& rCEvt)
 
     ::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1, 1));
     weld::Window* pParent = weld::GetPopupParent(GetStatusBar(), aRect);
-    OString sResult = xPopup->popup_at_rect(pParent, aRect);
+    OUString sResult = xPopup->popup_at_rect(pParent, aRect);
     if (sResult.isEmpty())
         return;
 
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index 4aafd2848a3a..a303817eeb18 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -84,7 +84,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
         aDateField.SetFormat( SvxDateFormat::F );    // Dienstag, 13.Februar 1996
         m_xPopup->append_radio(OUString::number(nID++), aDateField.GetFormatted(*pNumberFormatter, eLanguage));
 
-        m_xPopup->set_active(OString::number(static_cast<sal_uInt16>( pDateField->GetFormat() ) + 1), true); // - 2 + 3 !
+        m_xPopup->set_active(OUString::number(static_cast<sal_uInt16>( pDateField->GetFormat() ) + 1), true); // - 2 + 3 !
     }
     else if( auto pTimeField = dynamic_cast< const SvxExtTimeField *>( m_pField ) )
     {
@@ -117,7 +117,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
         //SvxTimeFormat::HH12_MM_SS_AMPM, // 01:49:38 PM
         //SvxTimeFormat::HH12_MM_SS_00_AMPM // 01:49:38.78 PM
 
-        m_xPopup->set_active(OString::number(static_cast<sal_uInt16>( pTimeField->GetFormat() ) + 1), true); // - 2 + 3 !
+        m_xPopup->set_active(OUString::number(static_cast<sal_uInt16>( pTimeField->GetFormat() ) + 1), true); // - 2 + 3 !
     }
     else if( auto pFileField = dynamic_cast< const SvxExtFileField *>( m_pField ) )
     {
@@ -133,7 +133,7 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
         m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_FILEFORMAT_PATH));
         m_xPopup->append_radio(OUString::number(nID++), SdResId(STR_FILEFORMAT_NAME));
 
-        m_xPopup->set_active(OString::number(static_cast<sal_uInt16>( pFileField->GetFormat() ) + 3), true);
+        m_xPopup->set_active(OUString::number(static_cast<sal_uInt16>( pFileField->GetFormat() ) + 3), true);
     }
     else if( auto pAuthorField = dynamic_cast< const SvxAuthorField *>( m_pField ) )
     {
@@ -149,13 +149,13 @@ void SdFieldPopup::Fill( LanguageType eLanguage )
             aAuthorField.SetFormat( static_cast<SvxAuthorFormat>(i) );
             m_xPopup->append_radio(OUString::number(nID++), aAuthorField.GetFormatted());
         }
-        m_xPopup->set_active(OString::number(static_cast<sal_uInt16>( pAuthorField->GetFormat() ) + 3), true);
+        m_xPopup->set_active(OUString::number(static_cast<sal_uInt16>( pAuthorField->GetFormat() ) + 3), true);
     }
 }
 
 void SdFieldPopup::Execute(weld::Window* pParent, const tools::Rectangle& rRect)
 {
-    OString sIdent = m_xPopup->popup_at_rect(pParent, rRect);
+    OUString sIdent = m_xPopup->popup_at_rect(pParent, rRect);
     if (sIdent.isEmpty())
         return;
 
@@ -169,7 +169,7 @@ void SdFieldPopup::Execute(weld::Window* pParent, const tools::Rectangle& rRect)
         int nCount = m_xPopup->n_children();
         for (int i = 3; i < nCount; i++)
             m_xPopup->set_active(
-                OString::number(i), sIdent == std::string_view(OString::number(i)));
+                OUString::number(i), sIdent == std::u16string_view(OUString::number(i)));
     }
 }
 
@@ -196,7 +196,7 @@ SvxFieldData* SdFieldPopup::GetField()
 
         for( i = 3; i < nCount; i++ )
         {
-            if (m_xPopup->get_active(OString::number(i)))
+            if (m_xPopup->get_active(OUString::number(i)))
                 break;
         }
         eFormat = static_cast<SvxDateFormat>( i - 1 );
@@ -228,7 +228,7 @@ SvxFieldData* SdFieldPopup::GetField()
 
         for( i = 3; i < nCount; i++ )
         {
-            if (m_xPopup->get_active(OString::number(i)))
+            if (m_xPopup->get_active(OUString::number(i)))
                 break;
         }
         eFormat = static_cast<SvxTimeFormat>( i - 1 );
@@ -261,7 +261,7 @@ SvxFieldData* SdFieldPopup::GetField()
 
         for( i = 3; i < nCount; i++ )
         {
-            if (m_xPopup->get_active(OString::number(i)))
+            if (m_xPopup->get_active(OUString::number(i)))
                 break;
         }
         eFormat = static_cast<SvxFileFormat>( i - 3 );
@@ -297,7 +297,7 @@ SvxFieldData* SdFieldPopup::GetField()
 
         for( i = 3; i < nCount; i++ )
         {
-            if (m_xPopup->get_active(OString::number(i)))
+            if (m_xPopup->get_active(OUString::number(i)))
                 break;
         }
         eFormat = static_cast<SvxAuthorFormat>( i - 3 );
diff --git a/sd/source/ui/app/tmplctrl.cxx b/sd/source/ui/app/tmplctrl.cxx
index 1f645bf66ee1..c8a8da9e5027 100644
--- a/sd/source/ui/app/tmplctrl.cxx
+++ b/sd/source/ui/app/tmplctrl.cxx
@@ -94,7 +94,7 @@ void SdTemplateControl::Command( const CommandEvent& rCEvt )
 
     ::tools::Rectangle aRect(rCEvt.GetMousePosPixel(), Size(1, 1));
     weld::Window* pParent = weld::GetPopupParent(GetStatusBar(), aRect);
-    OString sResult = xPopup->popup_at_rect(pParent, aRect);
+    OUString sResult = xPopup->popup_at_rect(pParent, aRect);
     if (!sResult.isEmpty())
     {
         sal_uInt16 nCurrId = sResult.toUInt32();
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 763d0b25435f..95f7d68a576e 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -783,14 +783,14 @@ IMPL_LINK(SvxBulletAndPositionDlg, BulRelSizeHdl_Impl, weld::MetricSpinButton&,
     SetModified();
 }
 
-IMPL_LINK(SvxBulletAndPositionDlg, GraphicHdl_Impl, const OString&, rIdent, void)
+IMPL_LINK(SvxBulletAndPositionDlg, GraphicHdl_Impl, const OUString&, rIdent, void)
 {
     OUString aGrfName;
     Size aSize;
     bool bSucc(false);
     SvxOpenGraphicDialog aGrfDlg(SdResId(RID_SVXSTR_EDIT_GRAPHIC), p_Window);
 
-    OString sNumber;
+    OUString sNumber;
     if (rIdent.startsWith("gallery", &sNumber))
     {
         auto idx = sNumber.toUInt32();
diff --git a/sd/source/ui/dlg/PaneShells.cxx b/sd/source/ui/dlg/PaneShells.cxx
index 8870d1186753..77e411aaedc2 100644
--- a/sd/source/ui/dlg/PaneShells.cxx
+++ b/sd/source/ui/dlg/PaneShells.cxx
@@ -30,7 +30,7 @@ namespace sd {
 
 static SfxSlot aLeftImpressPaneShellSlots_Impl[] =
 {
-    { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, nullptr }
+    { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, "" }
 };
 
 SFX_IMPL_INTERFACE(LeftImpressPaneShell, SfxShell)
@@ -54,7 +54,7 @@ LeftImpressPaneShell::~LeftImpressPaneShell()
 
 static SfxSlot aLeftDrawPaneShellSlots_Impl[] =
 {
-    { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, nullptr }
+    { 0, SfxGroupId::NONE, SfxSlotMode::NONE, 0, 0, nullptr, nullptr, nullptr, nullptr, nullptr, 0, SfxDisableFlags::NONE, "" }
 };
 
 SFX_IMPL_INTERFACE(LeftDrawPaneShell, SfxShell)
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index 2a48b1c0e3d6..9abb892e037c 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -386,7 +386,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickRbtHdl, weld::Toggleable&, void)
 IMPL_LINK(AnimationWindow, ClickHelpHdl, weld::Button&, rButton, void)
 {
     if (Help* pHelp = Application::GetHelp())
-        pHelp->Start(OUString::fromUtf8(m_xContainer->get_help_id()), &rButton);
+        pHelp->Start(m_xContainer->get_help_id(), &rButton);
 }
 
 IMPL_LINK( AnimationWindow, ClickGetObjectHdl, weld::Button&, rBtn, void )
diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx
index 1fa8c2dab768..fd6e9a36fa6a 100644
--- a/sd/source/ui/dlg/copydlg.cxx
+++ b/sd/source/ui/dlg/copydlg.cxx
@@ -71,7 +71,7 @@ CopyDlg::CopyDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View*
 
 CopyDlg::~CopyDlg()
 {
-    SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8));
+    SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id());
     OUString sStr =
         OUString::number(m_xNumFldCopies->get_value()) + OUStringChar(TOKEN) +
         OUString::number(m_xMtrFldMoveX->get_value(FieldUnit::NONE)) + OUStringChar(TOKEN) +
@@ -107,7 +107,7 @@ void CopyDlg::Reset()
     m_xMtrFldHeight->set_range(-nRectHeight, nPageHeight, FieldUnit::MM_100TH);
 
     OUString aStr;
-    SvtViewOptions aDlgOpt(EViewType::Dialog, OStringToOUString(m_xDialog->get_help_id(), RTL_TEXTENCODING_UTF8));
+    SvtViewOptions aDlgOpt(EViewType::Dialog, m_xDialog->get_help_id());
     if (aDlgOpt.Exists())
     {
         css::uno::Any aUserItem = aDlgOpt.GetUserItem("UserItem");
diff --git a/sd/source/ui/dlg/dlgchar.cxx b/sd/source/ui/dlg/dlgchar.cxx
index df1b24179915..074f5d7d1301 100644
--- a/sd/source/ui/dlg/dlgchar.cxx
+++ b/sd/source/ui/dlg/dlgchar.cxx
@@ -44,7 +44,7 @@ SdCharDlg::SdCharDlg(weld::Window* pParent, const SfxItemSet* pAttr,
     AddTabPage("RID_SVXPAGE_BKG", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr);
 }
 
-void SdCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SdCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     if (rId == "RID_SVXPAGE_CHAR_NAME")
diff --git a/sd/source/ui/dlg/dlgolbul.cxx b/sd/source/ui/dlg/dlgolbul.cxx
index 41c00efa8afa..edc867785b63 100644
--- a/sd/source/ui/dlg/dlgolbul.cxx
+++ b/sd/source/ui/dlg/dlgolbul.cxx
@@ -125,7 +125,7 @@ OutlineBulletDlg::~OutlineBulletDlg()
 {
 }
 
-void OutlineBulletDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void OutlineBulletDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (!m_pSdView)
         return;
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index e3bc5978bd8c..ecc452dca022 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -79,7 +79,7 @@ SdPageDlg::SdPageDlg(SfxObjectShell const* pDocSh, weld::Window* pParent, const
     }
 }
 
-void SdPageDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
+void SdPageDlg::PageCreated(const OUString& rId, SfxTabPage& rPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     if (rId == "RID_SVXPAGE_PAGE")
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index 0c0786d3eebb..8401ec38cd6e 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -225,7 +225,7 @@ HeaderFooterDialog::~HeaderFooterDialog()
 {
 }
 
-IMPL_LINK(HeaderFooterDialog, ActivatePageHdl, const OString&, rIdent, void)
+IMPL_LINK(HeaderFooterDialog, ActivatePageHdl, const OUString&, rIdent, void)
 {
     mxPBApply->set_visible(rIdent == "slides");
     mxPBApply->set_sensitive(mpCurrentPage != nullptr);
@@ -256,14 +256,14 @@ short HeaderFooterDialog::run()
 
 void HeaderFooterDialog::ApplyToAll()
 {
-    OString tabId = mxTabCtrl->get_current_page_ident();
+    OUString tabId = mxTabCtrl->get_current_page_ident();
     apply(true, tabId == "slides");
     m_xDialog->response(RET_OK);
 }
 
 void HeaderFooterDialog::Apply()
 {
-    OString tabId = mxTabCtrl->get_current_page_ident();
+    OUString tabId = mxTabCtrl->get_current_page_ident();
     apply(false, tabId == "slides");
     m_xDialog->response(RET_OK);
 }
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index cdc2db1f5a81..ff0bc85d9b85 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -249,20 +249,20 @@ IMPL_LINK(SdNavigatorWin, CommandHdl, const CommandEvent&, rCEvt, bool)
     std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(&rTreeView,
                                             "modules/sdraw/ui/navigatorcontextmenu.ui"));
     std::unique_ptr<weld::Menu> xPop = xBuilder->weld_menu("navmenu");
-    OString sCommand = xPop->popup_at_rect(&rTreeView,
+    OUString sCommand = xPop->popup_at_rect(&rTreeView,
                                            tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)));
     if (!sCommand.isEmpty())
         ExecuteContextMenuAction(sCommand);
     return true;
 }
 
-void SdNavigatorWin::ExecuteContextMenuAction(std::string_view rSelectedPopupEntry)
+void SdNavigatorWin::ExecuteContextMenuAction(std::u16string_view rSelectedPopupEntry)
 {
-    if (rSelectedPopupEntry == "rename")
+    if (rSelectedPopupEntry == u"rename")
         GetObjects().start_editing();
 }
 
-IMPL_LINK(SdNavigatorWin, SelectToolboxHdl, const OString&, rCommand, void)
+IMPL_LINK(SdNavigatorWin, SelectToolboxHdl, const OUString&, rCommand, void)
 {
     PageJump ePage = PAGE_NONE;
 
@@ -287,7 +287,7 @@ IMPL_LINK(SdNavigatorWin, SelectToolboxHdl, const OString&, rCommand, void)
     }
 }
 
-IMPL_LINK(SdNavigatorWin, DropdownClickToolBoxHdl, const OString&, rCommand, void)
+IMPL_LINK(SdNavigatorWin, DropdownClickToolBoxHdl, const OUString&, rCommand, void)
 {
     if (!mxToolbox->get_menu_item_active(rCommand))
         return;
@@ -297,12 +297,12 @@ IMPL_LINK(SdNavigatorWin, DropdownClickToolBoxHdl, const OString&, rCommand, voi
         NavDocInfo* pInfo = GetDocInfo();
         if( ( pInfo && !pInfo->HasName() ) || !mxTlbObjects->IsLinkableSelected() )
         {
-            mxDragModeMenu->set_sensitive(OString::number(NAVIGATOR_DRAGTYPE_LINK), false);
-            mxDragModeMenu->set_sensitive(OString::number(NAVIGATOR_DRAGTYPE_URL), false);
+            mxDragModeMenu->set_sensitive(OUString::number(NAVIGATOR_DRAGTYPE_LINK), false);
+            mxDragModeMenu->set_sensitive(OUString::number(NAVIGATOR_DRAGTYPE_URL), false);
             meDragType = NAVIGATOR_DRAGTYPE_EMBEDDED;
         }
 
-        mxDragModeMenu->set_active(OString::number(meDragType), true);
+        mxDragModeMenu->set_active(OUString::number(meDragType), true);
     }
     else if (rCommand == "shapes")
     {
@@ -475,7 +475,7 @@ IMPL_LINK_NOARG(SdNavigatorWin, SelectDocumentHdl, weld::ComboBox&, void)
 /**
  * Set DrageType and set image accordingly to it.
  */
-IMPL_LINK(SdNavigatorWin, MenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(SdNavigatorWin, MenuSelectHdl, const OUString&, rIdent, void)
 {
     sal_uInt32 nMenuId = rIdent.toUInt32();
 
@@ -498,7 +498,7 @@ IMPL_LINK(SdNavigatorWin, MenuSelectHdl, const OString&, rIdent, void)
         mxTlbObjects->set_selection_mode(SelectionMode::Multiple);
 }
 
-IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, const OString&, rIdent, void )
+IMPL_LINK( SdNavigatorWin, ShapeFilterCallback, const OUString&, rIdent, void )
 {
     bool bShowAllShapes(mxTlbObjects->GetShowAllShapes());
     if (rIdent == "named")
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index be9df558e50d..66ac46643195 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -156,7 +156,7 @@ SdParagraphDlg::SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr)
     AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
 }
 
-void SdParagraphDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SdParagraphDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     if (rId == "labelTP_PARA_STD")
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index 869f13c837d4..7ae551983b42 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -209,7 +209,7 @@ SdPresLayoutTemplateDlg::~SdPresLayoutTemplateDlg()
 {
 }
 
-void SdPresLayoutTemplateDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SdPresLayoutTemplateDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     SfxAllItemSet aSet(*(aInputSet.GetPool()));
 
diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx
index c526df75d44f..b07c75cb71c7 100644
--- a/sd/source/ui/dlg/sddlgfact.cxx
+++ b/sd/source/ui/dlg/sddlgfact.cxx
@@ -61,7 +61,7 @@ BitmapEx SdAbstractGenericDialog_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString SdAbstractGenericDialog_Impl::GetScreenshotId() const
+OUString SdAbstractGenericDialog_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -167,7 +167,7 @@ BitmapEx AbstractHeaderFooterDialog_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractHeaderFooterDialog_Impl::GetScreenshotId() const
+OUString AbstractHeaderFooterDialog_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -198,7 +198,7 @@ BitmapEx AbstractBreakDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractBreakDlg_Impl::GetScreenshotId() const
+OUString AbstractBreakDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -219,7 +219,7 @@ BitmapEx AbstractMasterLayoutDialog_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractMasterLayoutDialog_Impl::GetScreenshotId() const
+OUString AbstractMasterLayoutDialog_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -235,7 +235,7 @@ BitmapEx AbstractCopyDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractCopyDlg_Impl::GetScreenshotId() const
+OUString AbstractCopyDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -251,7 +251,7 @@ BitmapEx AbstractSdCustomShowDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdCustomShowDlg_Impl::GetScreenshotId() const
+OUString AbstractSdCustomShowDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -261,7 +261,7 @@ short SdAbstractTabController_Impl::Execute()
     return m_xDlg->run();
 }
 
-void SdAbstractTabController_Impl::SetCurPageId( const OString &rName )
+void SdAbstractTabController_Impl::SetCurPageId( const OUString &rName )
 {
     m_xDlg->SetCurPageId( rName );
 }
@@ -298,12 +298,12 @@ BitmapEx SdAbstractTabController_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString SdAbstractTabController_Impl::GetScreenshotId() const
+OUString SdAbstractTabController_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
 
-void AbstractBulletDialog_Impl::SetCurPageId( const OString& rName )
+void AbstractBulletDialog_Impl::SetCurPageId( const OUString& rName )
 {
     m_xDlg->SetCurPageId( rName );
 }
@@ -334,12 +334,12 @@ BitmapEx AbstractBulletDialog_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractBulletDialog_Impl::GetScreenshotId() const
+OUString AbstractBulletDialog_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
 
-void SdPresLayoutTemplateDlg_Impl::SetCurPageId( const OString& rName )
+void SdPresLayoutTemplateDlg_Impl::SetCurPageId( const OUString& rName )
 {
     m_xDlg->SetCurPageId( rName );
 }
@@ -370,7 +370,7 @@ BitmapEx SdPresLayoutTemplateDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString SdPresLayoutTemplateDlg_Impl::GetScreenshotId() const
+OUString SdPresLayoutTemplateDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -391,7 +391,7 @@ BitmapEx AbstractSdModifyFieldDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdModifyFieldDlg_Impl::GetScreenshotId() const
+OUString AbstractSdModifyFieldDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -427,7 +427,7 @@ BitmapEx AbstractSdSnapLineDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdSnapLineDlg_Impl::GetScreenshotId() const
+OUString AbstractSdSnapLineDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -437,7 +437,7 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs )
     m_xDlg->GetAttr(rOutAttrs);
 }
 
-void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OString& rHelpId )
+void AbstractSdInsertLayerDlg_Impl::SetHelpId( const OUString& rHelpId )
 {
     m_xDlg->set_help_id(rHelpId);
 }
@@ -448,7 +448,7 @@ BitmapEx AbstractSdInsertLayerDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdInsertLayerDlg_Impl::GetScreenshotId() const
+OUString AbstractSdInsertLayerDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -474,7 +474,7 @@ BitmapEx AbstractSdInsertPagesObjsDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdInsertPagesObjsDlg_Impl::GetScreenshotId() const
+OUString AbstractSdInsertPagesObjsDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -505,7 +505,7 @@ BitmapEx AbstractMorphDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractMorphDlg_Impl::GetScreenshotId() const
+OUString AbstractMorphDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -521,7 +521,7 @@ BitmapEx AbstractSdStartPresDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdStartPresDlg_Impl::GetScreenshotId() const
+OUString AbstractSdStartPresDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -537,7 +537,7 @@ BitmapEx AbstractSdPresLayoutDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdPresLayoutDlg_Impl::GetScreenshotId() const
+OUString AbstractSdPresLayoutDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -563,7 +563,7 @@ BitmapEx AbstractSdVectorizeDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdVectorizeDlg_Impl::GetScreenshotId() const
+OUString AbstractSdVectorizeDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -579,7 +579,7 @@ BitmapEx AbstractSdPublishingDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractSdPublishingDlg_Impl::GetScreenshotId() const
+OUString AbstractSdPublishingDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx
index 8da5c74ddc8d..b9dd75226841 100644
--- a/sd/source/ui/dlg/sddlgfact.hxx
+++ b/sd/source/ui/dlg/sddlgfact.hxx
@@ -77,7 +77,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractMasterLayoutDialog_Impl : public VclAbstractDialog
@@ -90,7 +90,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractBreakDlg_Impl : public VclAbstractDialog
@@ -103,7 +103,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractCopyDlg_Impl : public AbstractCopyDlg
@@ -120,7 +120,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractSdCustomShowDlg_Impl : public AbstractSdCustomShowDlg
@@ -137,7 +137,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class SdAbstractTabController_Impl : public SfxAbstractTabDialog
@@ -150,7 +150,7 @@ public:
     }
     virtual short Execute() override;
     virtual bool  StartExecuteAsync(AsyncContext &rCtx) 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;
@@ -158,7 +158,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractBulletDialog_Impl : public SfxAbstractTabDialog
@@ -171,7 +171,7 @@ public:
     }
     virtual short Execute() override;
     virtual bool  StartExecuteAsync(AsyncContext &rCtx) 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;
@@ -179,7 +179,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class SdPresLayoutTemplateDlg_Impl : public SfxAbstractTabDialog
@@ -192,7 +192,7 @@ public:
     }
     virtual short Execute() override;
     virtual bool  StartExecuteAsync(AsyncContext &rCtx) 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;
@@ -200,7 +200,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractSdModifyFieldDlg_Impl : public AbstractSdModifyFieldDlg
@@ -218,7 +218,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractSdSnapLineDlg_Impl : public AbstractSdSnapLineDlg
@@ -239,7 +239,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg
@@ -253,11 +253,11 @@ public:
     }
     virtual short   Execute() override;
     virtual void    GetAttr( SfxItemSet& rOutAttrs ) override ;
-    virtual void    SetHelpId( const OString& rHelpId ) override ;
+    virtual void    SetHelpId( const OUString& rHelpId ) override ;
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractSdInsertPagesObjsDlg_Impl : public AbstractSdInsertPagesObjsDlg
@@ -276,7 +276,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractMorphDlg_Impl : public AbstractMorphDlg
@@ -296,7 +296,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractSdStartPresDlg_Impl : public AbstractSdStartPresDlg
@@ -313,7 +313,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractSdPresLayoutDlg_Impl : public AbstractSdPresLayoutDlg
@@ -330,7 +330,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class SdAbstractSfxDialog_Impl : public SfxAbstractDialog
@@ -361,7 +361,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractSdPublishingDlg_Impl :public AbstractSdPublishingDlg
@@ -378,7 +378,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractHeaderFooterDialog_Impl :public AbstractHeaderFooterDialog
@@ -395,7 +395,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 //AbstractDialogFactory_Impl implementations
diff --git a/sd/source/ui/dlg/tabtempl.cxx b/sd/source/ui/dlg/tabtempl.cxx
index e5db39e68ed6..70930be48f0e 100644
--- a/sd/source/ui/dlg/tabtempl.cxx
+++ b/sd/source/ui/dlg/tabtempl.cxx
@@ -75,7 +75,7 @@ SdTabTemplateDlg::SdTabTemplateDlg(weld::Window* pParent,
         RemoveTabPage("asiantypo");
 }
 
-void SdTabTemplateDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void SdTabTemplateDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     if (rId == "line")
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index a00cb453d6b0..64b266f42060 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -469,7 +469,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
                 {
                     SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                     ScopedVclPtr<SfxAbstractInsertObjectDialog> pDlg(
-                            pFact->CreateInsertObjectDialog( mpViewShell->GetFrameWeld(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommandString(),
+                            pFact->CreateInsertObjectDialog( mpViewShell->GetFrameWeld(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand(),
                             xStorage, &aServerLst ));
                     pDlg->Execute();
                     bCreateNew = pDlg->IsCreateNew();
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index 90f940487cb7..35a35412bce0 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -118,7 +118,7 @@ class SvxBulletAndPositionDlg : public weld::GenericDialogController
     DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(LevelHdl_Impl, weld::TreeView&, 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/sd/source/ui/inc/CustomAnimationList.hxx b/sd/source/ui/inc/CustomAnimationList.hxx
index ca9673fd7772..fe35f5ae919b 100644
--- a/sd/source/ui/inc/CustomAnimationList.hxx
+++ b/sd/source/ui/inc/CustomAnimationList.hxx
@@ -40,7 +40,7 @@ class ICustomAnimationListController
 public:
     virtual void onSelect() = 0;
     virtual void onDoubleClick() = 0;
-    virtual void onContextMenu(const OString &rIdent) = 0;
+    virtual void onContextMenu(const OUString &rIdent) = 0;
     virtual void onDragNDropComplete( std::vector< CustomAnimationEffectPtr > pEffectsDragged, CustomAnimationEffectPtr pEffectInsertBefore ) = 0;
     virtual ~ICustomAnimationListController() {}
 };
@@ -139,7 +139,7 @@ private:
     DECL_STATIC_LINK(CustomAnimationList, CustomRenderHdl, weld::TreeView::render_args, void);
     DECL_STATIC_LINK(CustomAnimationList, CustomGetSizeHdl, weld::TreeView::get_size_args, Size);
 
-    void ExecuteContextMenuAction(const OString& rSelectedPopupEntry);
+    void ExecuteContextMenuAction(const OUString& rSelectedPopupEntry);
 
     /** appends the given effect to the list*/
     void append( CustomAnimationEffectPtr pEffect );
diff --git a/sd/source/ui/inc/CustomAnimationPane.hxx b/sd/source/ui/inc/CustomAnimationPane.hxx
index 5e2d69658f77..9896b45f6653 100644
--- a/sd/source/ui/inc/CustomAnimationPane.hxx
+++ b/sd/source/ui/inc/CustomAnimationPane.hxx
@@ -72,7 +72,7 @@ public:
     // ICustomAnimationListController
     virtual void onSelect() override;
     virtual void onDoubleClick() override;
-    virtual void onContextMenu(const OString& rIdent) override;
+    virtual void onContextMenu(const OUString& rIdent) override;
     virtual void onDragNDropComplete( std::vector< CustomAnimationEffectPtr > pEffectsDragged, CustomAnimationEffectPtr pEffectInsertBefore ) override;
 
     void addUndo();
@@ -87,7 +87,7 @@ private:
     void updateControls();
     void updateMotionPathTags();
 
-    void showOptions(const OString& sPage = OString());
+    void showOptions(const OUString& sPage = {});
     void moveSelection( bool bUp );
     void onPreview( bool bForcePreview );
 
diff --git a/sd/source/ui/inc/OutlineBulletDlg.hxx b/sd/source/ui/inc/OutlineBulletDlg.hxx
index 512d45f9a103..88f401e617d3 100644
--- a/sd/source/ui/inc/OutlineBulletDlg.hxx
+++ b/sd/source/ui/inc/OutlineBulletDlg.hxx
@@ -37,7 +37,7 @@ public:
     const SfxItemSet* GetBulletOutputItemSet() const;
 
 protected:
-    virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
 
 private:
     SfxItemSet m_aInputSet;
diff --git a/sd/source/ui/inc/TableDesignPane.hxx b/sd/source/ui/inc/TableDesignPane.hxx
index 2ab94204b7ff..33fe87006f4a 100644
--- a/sd/source/ui/inc/TableDesignPane.hxx
+++ b/sd/source/ui/inc/TableDesignPane.hxx
@@ -79,7 +79,7 @@ public:
     void CloneStyle();
     void ResetStyle();
     void DeleteStyle();
-    void EditStyle(std::string_view rCommand);
+    void EditStyle(const OUString& rCommand);
 
 private:
     void addListener();
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index 36c2aa6f84a7..c9e11994af7c 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -55,7 +55,7 @@ private:
     ::rtl::Reference<ViewTabBar> mpViewTabBar;
     int mnAllocatedWidth;
 
-    DECL_LINK(ActivatePageHdl, const OString&, void);
+    DECL_LINK(ActivatePageHdl, const OUString&, void);
     DECL_LINK(NotebookSizeAllocHdl, const Size&, void);
 };
 
diff --git a/sd/source/ui/inc/dlg_char.hxx b/sd/source/ui/inc/dlg_char.hxx
index 36e791a093fa..dd12c321eb6a 100644
--- a/sd/source/ui/inc/dlg_char.hxx
+++ b/sd/source/ui/inc/dlg_char.hxx
@@ -32,7 +32,7 @@ class SdCharDlg : public SfxTabDialogController
 private:
     const SfxObjectShell& rDocShell;
 
-    virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
 
 public:
     SdCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell);
diff --git a/sd/source/ui/inc/dlgpage.hxx b/sd/source/ui/inc/dlgpage.hxx
index 718ccf0c614b..abe75ff1092e 100644
--- a/sd/source/ui/inc/dlgpage.hxx
+++ b/sd/source/ui/inc/dlgpage.hxx
@@ -42,7 +42,7 @@ public:
 
     SdPageDlg(SfxObjectShell const * pDocSh, weld::Window* pParent, const SfxItemSet* pAttr, bool bAreaPage, bool bIsImpressDoc, bool bIsImpressMaster);
 
-    virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/inc/headerfooterdlg.hxx b/sd/source/ui/inc/headerfooterdlg.hxx
index e794712d3572..0b96d0348b70 100644
--- a/sd/source/ui/inc/headerfooterdlg.hxx
+++ b/sd/source/ui/inc/headerfooterdlg.hxx
@@ -33,7 +33,7 @@ class HeaderFooterTabPage;
 class HeaderFooterDialog : public weld::GenericDialogController
 {
 private:
-    DECL_LINK( ActivatePageHdl, const OString&, void );
+    DECL_LINK( ActivatePageHdl, const OUString&, void );
     DECL_LINK( ClickApplyToAllHdl, weld::Button&, void );
     DECL_LINK( ClickApplyHdl, weld::Button&, void );
     DECL_LINK( ClickCancelHdl, weld::Button&, void );
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index fdcc1f2cf3ab..7246c1012d4d 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -151,19 +151,19 @@ private:
     static OUString             GetDragTypeSdBmpId(NavigatorDragType eDT);
     NavDocInfo*                 GetDocInfo();
 
-                                DECL_DLLPRIVATE_LINK( SelectToolboxHdl, const OString&, void );
-                                DECL_DLLPRIVATE_LINK( DropdownClickToolBoxHdl, const OString&, void );
+                                DECL_DLLPRIVATE_LINK( SelectToolboxHdl, const OUString&, void );
+                                DECL_DLLPRIVATE_LINK( DropdownClickToolBoxHdl, const OUString&, void );
                                 DECL_DLLPRIVATE_LINK( ClickObjectHdl, weld::TreeView&, bool );
                                 DECL_DLLPRIVATE_LINK( SelectDocumentHdl, weld::ComboBox&, void );
-                                DECL_DLLPRIVATE_LINK( MenuSelectHdl, const OString&, void );
-                                DECL_DLLPRIVATE_LINK( ShapeFilterCallback, const OString&, void );
+                                DECL_DLLPRIVATE_LINK( MenuSelectHdl, const OUString&, void );
+                                DECL_DLLPRIVATE_LINK( ShapeFilterCallback, const OUString&, void );
                                 DECL_DLLPRIVATE_LINK( KeyInputHdl, const KeyEvent&, bool );
     DECL_DLLPRIVATE_STATIC_LINK(SdNavigatorWin, MouseReleaseHdl, const MouseEvent&, bool);
     DECL_LINK(CommandHdl, const CommandEvent&, bool);
 
     void                        SetDragImage();
 
-    void ExecuteContextMenuAction(std::string_view rSelectedPopupEntry);
+    void ExecuteContextMenuAction(std::u16string_view rSelectedPopupEntry);
 
 public:
     //when object is marked , fresh the corresponding entry tree .
diff --git a/sd/source/ui/inc/paragr.hxx b/sd/source/ui/inc/paragr.hxx
index 30304d8002bf..cbdfda101969 100644
--- a/sd/source/ui/inc/paragr.hxx
+++ b/sd/source/ui/inc/paragr.hxx
@@ -27,7 +27,7 @@
 class SdParagraphDlg : public SfxTabDialogController
 {
 private:
-    virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
 
 public:
     SdParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr);
diff --git a/sd/source/ui/inc/prltempl.hxx b/sd/source/ui/inc/prltempl.hxx
index efd50e4f7206..ea1ef022b882 100644
--- a/sd/source/ui/inc/prltempl.hxx
+++ b/sd/source/ui/inc/prltempl.hxx
@@ -46,7 +46,7 @@ private:
 
     PresentationObjects   ePO;
 
-    virtual void        PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void        PageCreated(const OUString& rId, SfxTabPage &rPage) override;
 
     // for mapping with the new SvxNumBulletItem
     SfxItemSet aInputSet;
diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx
index d32388d7bdc4..4e24fb992904 100644
--- a/sd/source/ui/inc/tabtempl.hxx
+++ b/sd/source/ui/inc/tabtempl.hxx
@@ -43,7 +43,7 @@ private:
     XDashListRef          pDashList;
     XLineEndListRef       pLineEndList;
 
-    virtual void PageCreated(const OString& rId, SfxTabPage &rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage &rPage) override;
     virtual void RefreshInputSet() override;
 
 public:
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
index 269099edd0c1..e0e1c6a07cbe 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx
@@ -189,7 +189,7 @@ void CurrentMasterPagesSelector::UpdateSelection()
     }
 }
 
-void CurrentMasterPagesSelector::ExecuteCommand(const OString &rIdent)
+void CurrentMasterPagesSelector::ExecuteCommand(const OUString &rIdent)
 {
     if (rIdent == "delete")
     {
diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
index cd7c2773421d..5b2ad3114e2c 100644
--- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx
@@ -64,7 +64,7 @@ protected:
     virtual OUString GetContextMenuUIFile() const override;
 
     virtual void ProcessPopupMenu(weld::Menu& rMenu) override;
-    virtual void ExecuteCommand(const OString &rIdent) override;
+    virtual void ExecuteCommand(const OUString &rIdent) override;
 
 private:
     virtual void LateInit() override;
diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx
index b0aab2f227ed..aa7bc7b3e9b7 100644
--- a/sd/source/ui/sidebar/LayoutMenu.cxx
+++ b/sd/source/ui/sidebar/LayoutMenu.cxx
@@ -609,16 +609,16 @@ IMPL_LINK_NOARG(LayoutMenu, StateChangeHandler, const OUString&, void)
     InvalidateContent();
 }
 
-void LayoutMenu::OnMenuItemSelected(std::string_view ident)
+void LayoutMenu::OnMenuItemSelected(std::u16string_view ident)
 {
     if (ident.empty())
         return;
 
-    if (ident == "apply")
+    if (ident == u"apply")
     {
         AssignLayoutToSelectedSlides(GetSelectedAutoLayout());
     }
-    else if (ident == "insert")
+    else if (ident == u"insert")
     {
         // Add arguments to this slot and forward it to the main view
         // shell.
diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx
index d24b7386e0b8..0b1f7b451211 100644
--- a/sd/source/ui/sidebar/LayoutMenu.hxx
+++ b/sd/source/ui/sidebar/LayoutMenu.hxx
@@ -149,7 +149,7 @@ private:
     DECL_LINK(ClickHandler, ValueSet*, void);
     DECL_LINK(StateChangeHandler, const OUString&, void);
     DECL_LINK(EventMultiplexerListener, ::sd::tools::EventMultiplexerEvent&, void);
-    void OnMenuItemSelected(std::string_view ident);
+    void OnMenuItemSelected(std::u16string_view ident);
 };
 
 } // end of namespace ::sd::toolpanel
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index ac66cf362593..5be2e73cd091 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -48,7 +48,7 @@ namespace sd::sidebar {
     /** menu entry that is executed as default action when the left mouse button is
         clicked over a master page.
     */
-constexpr OStringLiteral gsDefaultClickAction = "applyselect";
+constexpr OUStringLiteral gsDefaultClickAction = u"applyselect";
 
 MasterPagesSelector::MasterPagesSelector (
     weld::Widget* pParent,
@@ -57,7 +57,7 @@ MasterPagesSelector::MasterPagesSelector (
     std::shared_ptr<MasterPageContainer> pContainer,
     css::uno::Reference<css::ui::XSidebar> xSidebar,
     const OUString& rUIFileName,
-    const OString& rValueSetName)
+    const OUString& rValueSetName)
     : PanelLayout( pParent, "MasterPagePanel", rUIFileName ),
       mpContainer(std::move(pContainer)),
       mxPreviewValueSet(new PreviewValueSet),
@@ -212,7 +212,7 @@ void MasterPagesSelector::ProcessPopupMenu(weld::Menu& rMenu)
         rMenu.set_sensitive("large", false);
 }
 
-void MasterPagesSelector::ExecuteCommand(const OString &rIdent)
+void MasterPagesSelector::ExecuteCommand(const OUString &rIdent)
 {
     if (rIdent == "applyall")
     {
@@ -537,7 +537,7 @@ void MasterPagesSelector::ClearPageSet()
     mxPreviewValueSet->Clear();
 }
 
-void MasterPagesSelector::SetHelpId( const OString& aId )
+void MasterPagesSelector::SetHelpId( const OUString& aId )
 {
     const ::osl::MutexGuard aGuard (maMutex);
 
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.hxx b/sd/source/ui/sidebar/MasterPagesSelector.hxx
index 5709bd6d4482..f0a540bade1b 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.hxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.hxx
@@ -53,7 +53,7 @@ public:
         std::shared_ptr<MasterPageContainer> pContainer,
         css::uno::Reference<css::ui::XSidebar> xSidebar,
         const OUString& rUIFileName,
-        const OString& rValueSetName);
+        const OUString& rValueSetName);
     virtual ~MasterPagesSelector() override;
 
     virtual void LateInit();
@@ -66,7 +66,7 @@ public:
     */
     void ClearPageSet();
 
-    void SetHelpId( const OString& aId );
+    void SetHelpId( const OUString& aId );
 
     /** Mark the preview that belongs to the given index as not up-to-date
         anymore with respect to page content or preview size.
@@ -151,7 +151,7 @@ protected:
     virtual OUString GetContextMenuUIFile() const;
 
     virtual void ProcessPopupMenu(weld::Menu& rMenu);
-    virtual void ExecuteCommand(const OString& rIdent);
+    virtual void ExecuteCommand(const OUString& rIdent);
 
 private:
     css::uno::Reference<css::ui::XSidebar> mxSidebar;
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx
index 4648ac379b20..73517ff87c0e 100644
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -2004,7 +2004,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void)
                     OUString sId(OUString::number(CM_SLIDES + nPageNumber));
                     xPageMenu->append_check(sId, pPage->GetName());
                     if (nPageNumber == nCurrentSlideNumber)
-                        xPageMenu->set_active(sId.toUtf8(), true);
+                        xPageMenu->set_active(sId, true);
                 }
             }
         }
@@ -2048,7 +2048,7 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void)
         }
 
         if (nWidth == mdUserPaintStrokeWidth)
-            xWidthMenu->set_active(OString::number(nWidth), true);
+            xWidthMenu->set_active(OUString::number(nWidth), true);
     }
 
     ::tools::Rectangle aRect(maPopupMousePos, Size(1,1));
@@ -2062,31 +2062,31 @@ IMPL_LINK_NOARG(SlideshowImpl, ContextMenuHdl, void*, void)
         resume();
 }
 
-void SlideshowImpl::ContextMenuSelectHdl(std::string_view rMenuId)
+void SlideshowImpl::ContextMenuSelectHdl(std::u16string_view rMenuId)
 {
-    if (rMenuId == "prev")
+    if (rMenuId == u"prev")
     {
         gotoPreviousSlide();
         mbWasPaused = false;
     }
-    else if(rMenuId == "next")
+    else if(rMenuId == u"next")
     {
         gotoNextSlide();
         mbWasPaused = false;
     }
-    else if (rMenuId == "first")
+    else if (rMenuId == u"first")
     {
         gotoFirstSlide();
         mbWasPaused = false;
     }
-    else if (rMenuId == "last")
+    else if (rMenuId == u"last")
     {
         gotoLastSlide();
         mbWasPaused = false;
     }
-    else if (rMenuId == "black" || rMenuId == "white")
+    else if (rMenuId == u"black" || rMenuId == u"white")
     {
-        const Color aBlankColor(rMenuId == "white" ? COL_WHITE : COL_BLACK);
+        const Color aBlankColor(rMenuId == u"white" ? COL_WHITE : COL_BLACK);
         if( mbWasPaused )
         {
             if( mpShowWindow->GetShowWindowMode() == SHOWWINDOWMODE_BLANK )
@@ -2106,7 +2106,7 @@ void SlideshowImpl::ContextMenuSelectHdl(std::string_view rMenuId)
             mbWasPaused = true;
         }
     }
-    else if (rMenuId == "color")
+    else if (rMenuId == u"color")
     {
         //Open a color picker based on SvColorDialog
         ::Color aColor( ColorTransparency, mnUserPaintColor );
@@ -2120,42 +2120,42 @@ void SlideshowImpl::ContextMenuSelectHdl(std::string_view rMenuId)
         }
         mbWasPaused = false;
     }
-    else if (rMenuId == "4")
+    else if (rMenuId == u"4")
     {
         setPenWidth(4.0);
         mbWasPaused = false;
     }
-    else if (rMenuId == "100")
+    else if (rMenuId == u"100")
     {
         setPenWidth(100.0);
         mbWasPaused = false;
     }
-    else if (rMenuId == "150")
+    else if (rMenuId == u"150")
     {
         setPenWidth(150.0);
         mbWasPaused = false;
     }
-    else if (rMenuId == "200")
+    else if (rMenuId == u"200")
     {
         setPenWidth(200.0);
         mbWasPaused = false;
     }
-    else if (rMenuId == "400")
+    else if (rMenuId == u"400")
     {
         setPenWidth(400.0);
         mbWasPaused = false;
     }
-    else if (rMenuId == "erase")
+    else if (rMenuId == u"erase")
     {
         setEraseAllInk(true);
         mbWasPaused = false;
     }
-    else if (rMenuId == "pen")
+    else if (rMenuId == u"pen")
     {
         setUsePen(!mbUsePen);
         mbWasPaused = false;
     }
-    else if (rMenuId == "edit")
+    else if (rMenuId == u"edit")
     {
         // When in autoplay mode (pps/ppsx), offer editing of the presentation
         // Turn autostart off, else Impress will close when exiting the Presentation
@@ -2169,7 +2169,7 @@ void SlideshowImpl::ContextMenuSelectHdl(std::string_view rMenuId)
         }
         endPresentation();
     }
-    else if (rMenuId == "end")
+    else if (rMenuId == u"end")
     {
         // in case the user cancels the presentation, switch to current slide
         // in edit mode
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 284744799475..27c755318c8d 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -242,7 +242,7 @@ private:
     DECL_LINK( updateHdl, Timer *, void );
     DECL_LINK( ReadyForNextInputHdl, Timer *, void );
     DECL_LINK( endPresentationHdl, void*, void );
-    void ContextMenuSelectHdl(std::string_view rIdent);
+    void ContextMenuSelectHdl(std::u16string_view rIdent);
     DECL_LINK( ContextMenuHdl, void*, void );
     DECL_LINK( deactivateHdl, Timer *, void );
     DECL_LINK( EventListenerHdl, VclSimpleEvent&, void );
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index dad8d2c0fec3..216cf09b3b59 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -87,14 +87,14 @@ const sal_Int32 nCellHeight = 7; // one pixel is shared with the next cell!
 const sal_Int32 nBitmapWidth = (nCellWidth * nPreviewColumns) - (nPreviewColumns - 1);
 const sal_Int32 nBitmapHeight = (nCellHeight * nPreviewRows) - (nPreviewRows - 1);
 
-const std::string_view gPropNames[CB_COUNT] =
+const std::u16string_view gPropNames[CB_COUNT] =
 {
-    "UseFirstRowStyle",
-    "UseLastRowStyle",
-    "UseBandingRowStyle",
-    "UseFirstColumnStyle",
-    "UseLastColumnStyle",
-    "UseBandingColumnStyle"
+    u"UseFirstRowStyle",
+    u"UseLastRowStyle",
+    u"UseBandingRowStyle",
+    u"UseFirstColumnStyle",
+    u"UseLastColumnStyle",
+    u"UseBandingColumnStyle"
 };
 
 constexpr std::u16string_view aTableStyleBaseName = u"table";
@@ -114,7 +114,7 @@ TableDesignWidget::TableDesignWidget(weld::Builder& rBuilder, ViewShellBase& rBa
 
     for (sal_uInt16 i = CB_HEADER_ROW; i <= CB_BANDED_COLUMNS; ++i)
     {
-        m_aCheckBoxes[i] = rBuilder.weld_check_button(OString(gPropNames[i].data(), gPropNames[i].size()));
+        m_aCheckBoxes[i] = rBuilder.weld_check_button(OUString(gPropNames[i]));
         m_aCheckBoxes[i]->connect_toggled(LINK(this, TableDesignWidget, implCheckBoxHdl));
     }
 
@@ -193,7 +193,7 @@ IMPL_LINK(TableDesignWidget, implContextMenuHandler, const Point*, pPoint, void)
     m_xValueSet->SelectItem(nClickedItemId);
 
     Point aPosition = pPoint ? *pPoint : m_xValueSet->GetItemRect(nClickedItemId).Center();
-    OString aCommand = m_xMenu->popup_at_rect(m_xValueSet->GetDrawingArea(), ::tools::Rectangle(aPosition, Size(1,1)));
+    OUString aCommand = m_xMenu->popup_at_rect(m_xValueSet->GetDrawingArea(), ::tools::Rectangle(aPosition, Size(1,1)));
 
     if (aCommand == "new")
         InsertStyle();
@@ -352,12 +352,12 @@ void TableDesignWidget::DeleteStyle()
     }
 }
 
-void TableDesignWidget::EditStyle(std::string_view rCommand)
+void TableDesignWidget::EditStyle(const OUString& rCommand)
 {
     try
     {
         Reference<XNameReplace> xTableStyle(mxTableFamily->getByIndex(m_xValueSet->GetSelectedItemId() - 1), UNO_QUERY_THROW);
-        Reference<XStyle> xCellStyle(xTableStyle->getByName(OUString::fromUtf8(rCommand)), UNO_QUERY_THROW);
+        Reference<XStyle> xCellStyle(xTableStyle->getByName(rCommand), UNO_QUERY_THROW);
         rtl::Reference xStyleSheet = static_cast<SdStyleSheet*>(xCellStyle.get());
 
         bool bUserDefined = xStyleSheet->IsEditable();
@@ -390,9 +390,9 @@ void TableDesignWidget::EditStyle(std::string_view rCommand)
             if (!bUserDefined)
             {
                 Reference<XNamed> xNamed(xTableStyle, UNO_QUERY_THROW);
-                const OUString aStyleName(getNewStyleName(mxCellFamily, Concat2View(xNamed->getName() + "-" + OUString::fromUtf8(rCommand))));
+                const OUString aStyleName(getNewStyleName(mxCellFamily, Concat2View(xNamed->getName() + "-" + rCommand)));
                 mxCellFamily->insertByName(aStyleName, Any(xCellStyle));
-                xTableStyle->replaceByName(OUString::fromUtf8(rCommand), Any(xCellStyle));
+                xTableStyle->replaceByName(rCommand, Any(xCellStyle));
             }
 
             SfxItemSet aNewSet(*pDlg->GetOutputItemSet());
@@ -649,7 +649,7 @@ void TableDesignWidget::updateControls()
         bool bUse = gDefaults[i];
         if( bHasTable ) try
         {
-            mxSelectedTable->getPropertyValue( OUString::createFromAscii(gPropNames[i]) ) >>= bUse;
+            mxSelectedTable->getPropertyValue( OUString(gPropNames[i]) ) >>= bUse;
         }
         catch( Exception& )
         {
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index 99b78f27c31f..099a333ae5d2 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -315,7 +315,7 @@ int ViewTabBar::GetHeight() const
             // set each page width-request to the size it takes to fit the notebook allocation
             for (int nIndex = 1, nPageCount = rNotebook.get_n_pages(); nIndex <= nPageCount; ++nIndex)
             {
-                OString sIdent(OString::number(nIndex));
+                OUString sIdent(OUString::number(nIndex));
                 weld::Container* pContainer = rNotebook.get_page(sIdent);
                 pContainer->set_size_request(nPageWidth, -1);
             }
@@ -450,7 +450,7 @@ void ViewTabBar::UpdateTabBarButtons()
     int nIndex = 1;
     for (const auto& rTab : maTabBarButtons)
     {
-        OString sIdent(OString::number(nIndex));
+        OUString sIdent(OUString::number(nIndex));
         // Create a new tab when there are not enough.
         if (nPageCount < nIndex)
             rNotebook.append_page(sIdent, rTab.ButtonLabel);
@@ -472,7 +472,7 @@ void ViewTabBar::UpdateTabBarButtons()
 
     // Delete tabs that are no longer used.
     for (; nIndex<=nPageCount; ++nIndex)
-        rNotebook.remove_page(OString::number(nIndex));
+        rNotebook.remove_page(OUString::number(nIndex));
 
     int nWidthReq = rNotebook.get_preferred_size().Width();
     // The excess width over the page request that the notebook uses we will
@@ -520,7 +520,7 @@ IMPL_LINK(TabBarControl, NotebookSizeAllocHdl, const Size&, rSize, void)
     mnAllocatedWidth = rSize.Width();
 }
 
-IMPL_LINK(TabBarControl, ActivatePageHdl, const OString&, rPage, void)
+IMPL_LINK(TabBarControl, ActivatePageHdl, const OUString&, rPage, void)
 {
     if (!mpViewTabBar->ActivatePage(mxTabControl->get_page_index(rPage)))
     {