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, 163 insertions, 166 deletions

diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx
index 93e5e8c77f35..e1fafe145d53 100644
--- a/sc/source/core/data/funcdesc.cxx
+++ b/sc/source/core/data/funcdesc.cxx
@@ -74,7 +74,7 @@ struct ScFuncDescCore
     /*
      * Help ID, HID_FUNC_...
      */
-    const char* pHelpId;
+    OUString pHelpId;
     /*
      * Number of parameters. VAR_ARGS if variable number, or
      * VAR_ARGS+number if number of fixed parameters and variable
@@ -333,7 +333,7 @@ void ScFuncDesc::initArgumentInfo()  const
     }
 }
 
-OString ScFuncDesc::getHelpId() const
+OUString ScFuncDesc::getHelpId() const
 {
     return sHelpId;
 }
diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx
index 82967ecf971d..1130cb844d58 100644
--- a/sc/source/core/inc/addinhelpid.hxx
+++ b/sc/source/core/inc/addinhelpid.hxx
@@ -39,7 +39,7 @@ public:
     void                        SetServiceName( std::u16string_view rServiceName );
 
     /** @return  The help ID of the function with given built-in name or 0 if not found. */
-    OString                GetHelpId( const OUString& rFuncName ) const;
+    OUString                GetHelpId( const OUString& rFuncName ) const;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx
index 99f8061df3d2..c16f8f3e6f5e 100644
--- a/sc/source/core/tool/addincol.cxx
+++ b/sc/source/core/tool/addincol.cxx
@@ -70,7 +70,7 @@ using namespace com::sun::star;
 
 ScUnoAddInFuncData::ScUnoAddInFuncData( const OUString& rNam, const OUString& rLoc,
                                         OUString aDesc,
-                                        sal_uInt16 nCat, OString sHelp,
+                                        sal_uInt16 nCat, OUString sHelp,
                                         uno::Reference<reflection::XIdlMethod> xFunc,
                                         uno::Any aO,
                                         tools::Long nAC, const ScAddInArgDesc* pAD,
@@ -528,7 +528,7 @@ void ScUnoAddInCollection::ReadConfiguration()
                     }
                 }
 
-                OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] );
+                OUString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] );
 
                 uno::Reference<reflection::XIdlMethod> xFunc;       // remains empty
                 uno::Any aObject;                                   // also empty
@@ -862,7 +862,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference<uno::XInterface>&
                     sal_uInt16 nCategory = lcl_GetCategory(
                             xAddIn->getProgrammaticCategoryName( aFuncU ) );
 
-                    OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU );
+                    OUString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU );
 
                     OUString aLocalName;
                     try
diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx
index 92c5fb4f7950..9a7cd9213749 100644
--- a/sc/source/core/tool/addinhelpid.cxx
+++ b/sc/source/core/tool/addinhelpid.cxx
@@ -24,7 +24,7 @@
 struct ScUnoAddInHelpId
 {
     const char*             pFuncName;
-    const char*             sHelpId;
+    OUString                sHelpId;
 };
 
 // Help IDs for Analysis AddIn. MUST BE SORTED for binary search.
@@ -183,10 +183,10 @@ void ScUnoAddInHelpIdGenerator::SetServiceName( std::u16string_view rServiceName
     nArrayCount = nSize / sizeof( ScUnoAddInHelpId );
 }
 
-OString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const
+OUString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const
 {
     if( !pCurrHelpIds || !nArrayCount )
-        return OString();
+        return {};
 
     const ScUnoAddInHelpId* pFirst = pCurrHelpIds;
     const ScUnoAddInHelpId* pLast = pCurrHelpIds + nArrayCount - 1;
@@ -203,7 +203,7 @@ OString ScUnoAddInHelpIdGenerator::GetHelpId( const OUString& rFuncName ) const
             pFirst = pMiddle + 1;
     }
 
-    return OString();
+    return {};
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/oox/workbookfragment.cxx b/sc/source/filter/oox/workbookfragment.cxx
index 03abe07d6575..685b9e91ea4f 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -534,7 +534,7 @@ class MessageWithCheck : public weld::MessageDialogController
 private:
     std::unique_ptr<weld::CheckButton> m_xWarningOnBox;
 public:
-    MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OString& rDialogId)
+    MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OUString& rDialogId)
         : MessageDialogController(pParent, rUIFile, rDialogId, "ask")
         , m_xWarningOnBox(m_xBuilder->weld_check_button("ask"))
     {
diff --git a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
index 4345b816bb96..f58b61570342 100644
--- a/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
+++ b/sc/source/ui/StatisticsDialogs/MatrixComparisonGenerator.cxx
@@ -43,7 +43,7 @@ ScMatrixComparisonGenerator::ScMatrixComparisonGenerator(
                                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
                                     weld::Window* pParent, ScViewData& rViewData,
                                     const OUString& rUiXmlDescription,
-                                    const OString& rID)
+                                    const OUString& rID)
     : ScStatisticsInputOutputDialog(pSfxBindings, pChildWindow, pParent, rViewData, rUiXmlDescription, rID)
 {}
 
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
index 7447ebf9a35a..15521dd1e1ef 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx
@@ -48,7 +48,7 @@ ScRangeList ScStatisticsInputOutputDialog::MakeRowRangeList(SCTAB aTab, ScAddres
 
 ScStatisticsInputOutputDialog::ScStatisticsInputOutputDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                    weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, const OString& rID)
+                    weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, const OUString& rID)
     : ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent, rUIXMLDescription, rID)
     , mxInputRangeLabel(m_xBuilder->weld_label("input-range-label"))
     , mxInputRangeEdit(new formula::RefEdit(m_xBuilder->weld_entry("input-range-edit")))
diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
index 3c0f7ce98b56..8c45f4b2df24 100644
--- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
+++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx
@@ -20,7 +20,7 @@
 
 ScStatisticsTwoVariableDialog::ScStatisticsTwoVariableDialog(
                     SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
-                    weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, const OString& rID)
+                    weld::Window* pParent, ScViewData& rViewData, const OUString& rUIXMLDescription, const OUString& rID)
     : ScAnyRefDlgController(pSfxBindings, pChildWindow, pParent, rUIXMLDescription, rID)
     , mxVariable1RangeLabel(m_xBuilder->weld_label("variable1-range-label"))
     , mxVariable1RangeEdit(new formula::RefEdit(m_xBuilder->weld_entry("variable1-range-edit")))
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index f01c2e987b63..c8bb9fc0b727 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -1804,7 +1804,7 @@ void ScInputHandler::LOKSendFormulabarUpdate(EditView* pActiveView,
     (*pData)["selection"] = aSelection;
 
     sal_uInt64 nCurrentShellId = reinterpret_cast<sal_uInt64>(pActiveViewSh);
-    std::string sWindowId = std::to_string(nCurrentShellId) + "formulabar";
+    OUString sWindowId = OUString::number(nCurrentShellId) + "formulabar";
     jsdialog::SendAction(sWindowId, "sc_input_window", std::move(pData));
 }
 
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index c5cc7a334262..a85baa1ccca4 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1000,7 +1000,7 @@ void ScInputBarGroup::DecrementVerticalSize()
     }
 }
 
-void ScInputWindow::MenuHdl(std::string_view command)
+void ScInputWindow::MenuHdl(std::u16string_view command)
 {
     if (command.empty())
         return;
@@ -1008,47 +1008,47 @@ void ScInputWindow::MenuHdl(std::string_view command)
     bool bSubTotal = false;
     bool bRangeFinder = false;
     OpCode eCode = ocSum;
-    if ( command ==  "sum" )
+    if ( command ==  u"sum" )
     {
         eCode = ocSum;
     }
-    else if ( command == "average" )
+    else if ( command == u"average" )
     {
         eCode = ocAverage;
     }
-    else if ( command == "max" )
+    else if ( command == u"max" )
     {
         eCode = ocMax;
     }
-    else if ( command == "min" )
+    else if ( command == u"min" )
     {
         eCode = ocMin;
     }
-    else if ( command == "count" )
+    else if ( command == u"count" )
     {
         eCode = ocCount;
     }
-    else if ( command == "counta" )
+    else if ( command == u"counta" )
     {
         eCode = ocCount2;
     }
-    else if ( command == "product" )
+    else if ( command == u"product" )
     {
         eCode = ocProduct;
     }
-    else if (command == "stdev")
+    else if (command == u"stdev")
     {
         eCode = ocStDev;
     }
-    else if (command == "stdevp")
+    else if (command == u"stdevp")
     {
         eCode = ocStDevP;
     }
-    else if (command == "var")
+    else if (command == u"var")
     {
         eCode = ocVar;
     }
-    else if (command == "varp")
+    else if (command == u"varp")
     {
         eCode = ocVarP;
     }
diff --git a/sc/source/ui/attrdlg/attrdlg.cxx b/sc/source/ui/attrdlg/attrdlg.cxx
index 4e13eae6dea4..ad0a82542c3e 100644
--- a/sc/source/ui/attrdlg/attrdlg.cxx
+++ b/sc/source/ui/attrdlg/attrdlg.cxx
@@ -69,7 +69,7 @@ ScAttrDlg::~ScAttrDlg()
 {
 }
 
-void ScAttrDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage)
+void ScAttrDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage)
 {
     SfxObjectShell* pDocSh = SfxObjectShell::Current();
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx
index d0db6f84505a..26db05f15bf2 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -154,7 +154,7 @@ BitmapEx AbstractScDataFormDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScDataFormDlg_Impl::GetScreenshotId() const
+OUString AbstractScDataFormDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -220,7 +220,7 @@ BitmapEx AbstractScMoveTableDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScMoveTableDlg_Impl::GetScreenshotId() const
+OUString AbstractScMoveTableDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -345,7 +345,7 @@ BitmapEx AbstractScImportAsciiDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScImportAsciiDlg_Impl::GetScreenshotId() const
+OUString AbstractScImportAsciiDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -376,7 +376,7 @@ BitmapEx AbstractScColRowLabelDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScColRowLabelDlg_Impl::GetScreenshotId() const
+OUString AbstractScColRowLabelDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -392,7 +392,7 @@ BitmapEx AbstractScDataPilotDatabaseDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScDataPilotDatabaseDlg_Impl::GetScreenshotId() const
+OUString AbstractScDataPilotDatabaseDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -428,7 +428,7 @@ BitmapEx AbstractScDataPilotSourceTypeDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScDataPilotSourceTypeDlg_Impl::GetScreenshotId() const
+OUString AbstractScDataPilotSourceTypeDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -469,7 +469,7 @@ BitmapEx AbstractScDeleteCellDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScDeleteCellDlg_Impl::GetScreenshotId() const
+OUString AbstractScDeleteCellDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -490,7 +490,7 @@ BitmapEx AbstractScDeleteContentsDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScDeleteContentsDlg_Impl::GetScreenshotId() const
+OUString AbstractScDeleteContentsDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -606,7 +606,7 @@ BitmapEx AbstractScInsertContentsDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScInsertContentsDlg_Impl::GetScreenshotId() const
+OUString AbstractScInsertContentsDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -652,7 +652,7 @@ BitmapEx AbstractScInsertTableDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScInsertTableDlg_Impl::GetScreenshotId() const
+OUString AbstractScInsertTableDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -765,7 +765,7 @@ BitmapEx AbstractScNameCreateDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScNameCreateDlg_Impl::GetScreenshotId() const
+OUString AbstractScNameCreateDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -849,7 +849,7 @@ void AbstractScShowTabDlg_Impl::Insert( const OUString& rString, bool bSelected
 
 void    AbstractScShowTabDlg_Impl::SetDescription(
                 const OUString& rTitle, const OUString& rFixedText,
-                const OString& sDlgHelpId, const OString& sLbHelpId )
+                const OUString& sDlgHelpId, const OUString& sLbHelpId )
 {
     m_xDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId );
 }
@@ -871,7 +871,7 @@ void AbstractScGoToTabDlg_Impl::Insert( const OUString& rString, bool bSelected
 
 void    AbstractScGoToTabDlg_Impl::SetDescription(
                 const OUString& rTitle, const OUString& rEntryLabel, const OUString& rListLabel,
-                const OString& rDlgHelpId, const OString& rEnHelpId, const OString& rLbHelpId )
+                const OUString& rDlgHelpId, const OUString& rEnHelpId, const OUString& rLbHelpId )
 {
     m_xDlg->SetDescription( rTitle, rEntryLabel, rListLabel, rDlgHelpId, rEnHelpId, rLbHelpId );
 }
@@ -897,7 +897,7 @@ BitmapEx AbstractScStringInputDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScStringInputDlg_Impl::GetScreenshotId() const
+OUString AbstractScStringInputDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -913,7 +913,7 @@ BitmapEx AbstractScTabBgColorDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScTabBgColorDlg_Impl::GetScreenshotId() const
+OUString AbstractScTabBgColorDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -949,7 +949,7 @@ BitmapEx AbstractScTextImportOptionsDlg_Impl::createScreenshot() const
     return xDialogSurface->GetBitmapEx(Point(), xDialogSurface->GetOutputSizePixel());
 }
 
-OString AbstractScTextImportOptionsDlg_Impl::GetScreenshotId() const
+OUString AbstractScTextImportOptionsDlg_Impl::GetScreenshotId() const
 {
     return m_xDlg->get_help_id();
 }
@@ -964,7 +964,7 @@ bool ScAbstractTabController_Impl::StartExecuteAsync(AsyncContext &rCtx)
     return SfxTabDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
 }
 
-void ScAbstractTabController_Impl::SetCurPageId( const OString &rName )
+void ScAbstractTabController_Impl::SetCurPageId( const OUString &rName )
 {
     m_xDlg->SetCurPageId( rName );
 }
@@ -990,12 +990,12 @@ void ScAbstractTabController_Impl::SetText( const OUString& rStr )
     m_xDlg->set_title(rStr);
 }
 
-std::vector<OString> ScAbstractTabController_Impl::getAllPageUIXMLDescriptions() const
+std::vector<OUString> ScAbstractTabController_Impl::getAllPageUIXMLDescriptions() const
 {
     return m_xDlg->getAllPageUIXMLDescriptions();
 }
 
-bool ScAbstractTabController_Impl::selectPageByUIXMLDescription(const OString& rUIXMLDescription)
+bool ScAbstractTabController_Impl::selectPageByUIXMLDescription(const OUString& rUIXMLDescription)
 {
     return m_xDlg->selectPageByUIXMLDescription(rUIXMLDescription);
 }
@@ -1005,7 +1005,7 @@ BitmapEx ScAbstractTabController_Impl::createScreenshot() const
     return m_xDlg->createScreenshot();
 }
 
-OString ScAbstractTabController_Impl::GetScreenshotId() const
+OUString ScAbstractTabController_Impl::GetScreenshotId() const
 {
     return m_xDlg->GetScreenshotId();
 }
@@ -1015,7 +1015,7 @@ bool ScAsyncTabController_Impl::StartExecuteAsync(VclAbstractDialog::AsyncContex
     return SfxTabDialogController::runAsync(m_xDlg, rCtx.maEndDialogFn);
 }
 
-void ScAsyncTabController_Impl::SetCurPageId( const OString &rName )
+void ScAsyncTabController_Impl::SetCurPageId( const OUString &rName )
 {
     m_xDlg->SetCurPageId( rName );
 }
@@ -1146,7 +1146,7 @@ VclPtr<AbstractScLinkedAreaDlg> ScAbstractDialogFactory_Impl::CreateScLinkedArea
 }
 
 VclPtr<AbstractScMetricInputDlg> ScAbstractDialogFactory_Impl::CreateScMetricInputDlg(weld::Window* pParent,
-                                                                const OString& sDialogName,
+                                                                const OUString& sDialogName,
                                                                 tools::Long            nCurrent,
                                                                 tools::Long            nDefault,
                                                                 FieldUnit       eFUnit,
@@ -1231,8 +1231,8 @@ VclPtr<AbstractScGoToTabDlg> ScAbstractDialogFactory_Impl::CreateScGoToTabDlg(we
 }
 
 VclPtr<AbstractScStringInputDlg> ScAbstractDialogFactory_Impl::CreateScStringInputDlg(weld::Window* pParent,
-        const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, const OString& rHelpId,
-        const OString& rEditHelpId)
+        const OUString& rTitle, const OUString& rEditTitle, const OUString& rDefault, const OUString& rHelpId,
+        const OUString& rEditHelpId)
 {
     return VclPtr<AbstractScStringInputDlg_Impl>::Create(std::make_unique<ScStringInputDlg>(pParent, rTitle, rEditTitle,
                 rDefault, rHelpId, rEditHelpId));
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx
index 855abeecf1c8..434b84df3d7c 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -68,7 +68,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScAutoFormatDlg_Impl : public AbstractScAutoFormatDlg
@@ -98,7 +98,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScCondFormatManagerDlg_Impl : public AbstractScCondFormatManagerDlg
@@ -131,7 +131,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScDataPilotSourceTypeDlg_Impl  :public AbstractScDataPilotSourceTypeDlg
@@ -152,7 +152,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScDataPilotServiceDlg_Impl : public AbstractScDataPilotServiceDlg
@@ -186,7 +186,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 //for dataform
@@ -202,7 +202,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScDeleteContentsDlg_Impl : public AbstractScDeleteContentsDlg
@@ -219,7 +219,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg
@@ -289,7 +289,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScInsertTableDlg_Impl : public AbstractScInsertTableDlg
@@ -311,7 +311,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScSelEntryDlg_Impl : public AbstractScSelEntryDlg
@@ -378,7 +378,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScNameCreateDlg_Impl : public AbstractScNameCreateDlg
@@ -394,7 +394,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScNamePasteDlg_Impl : public AbstractScNamePasteDlg
@@ -516,7 +516,7 @@ public:
     virtual short Execute() override;
     virtual bool StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) override;
     virtual void Insert( const OUString& rString, bool bSelected ) override;
-    virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OString& sDlgHelpId, const OString& sLbHelpId) override;
+    virtual void SetDescription(const OUString& rTitle, const OUString& rFixedText, const OUString& sDlgHelpId, const OUString& sLbHelpId) override;
     virtual OUString GetEntry(sal_Int32 nPos) const override;
     virtual std::vector<sal_Int32> GetSelectedRows() const override;
 };
@@ -533,7 +533,7 @@ public:
     virtual bool StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) override;
     virtual void Insert( const OUString& rString, bool bSelected ) override;
     virtual void SetDescription(const OUString& rTitle, const OUString& rEntryLabel, const OUString& rListLabel,
-                                const OString& rDlgHelpId, const OString& rEnHelpId, const OString& rLbHelpId) override;
+                                const OUString& rDlgHelpId, const OUString& rEnHelpId, const OUString& rLbHelpId) override;
     virtual OUString GetSelectedEntry() const override;
 };
 
@@ -561,7 +561,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScTabBgColorDlg_Impl :  public AbstractScTabBgColorDlg
@@ -577,7 +577,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class AbstractScImportOptionsDlg_Impl : public AbstractScImportOptionsDlg
@@ -608,7 +608,7 @@ public:
 
     // screenshotting
     virtual BitmapEx createScreenshot() const override;
-    virtual OString GetScreenshotId() const override;
+    virtual OUString GetScreenshotId() const override;
 };
 
 class ScAbstractTabController_Impl : public SfxAbstractTabDialog
@@ -621,17 +621,17 @@ 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;
     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;
 };
 
 class ScAsyncTabController_Impl : public ScAsyncTabController
@@ -644,7 +644,7 @@ public:
     }
     virtual bool  StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) override;
     virtual const SfxItemSet*   GetOutputItemSet() const override;
-    virtual void                SetCurPageId( const OString &rName ) override;
+    virtual void                SetCurPageId( const OUString &rName ) override;
 };
 
 //AbstractDialogFactory_Impl implementations
@@ -714,7 +714,7 @@ public:
     virtual VclPtr<AbstractScLinkedAreaDlg> CreateScLinkedAreaDlg(weld::Widget* pParent) override;
 
     virtual VclPtr<AbstractScMetricInputDlg> CreateScMetricInputDlg(weld::Window* pParent,
-                                                                const OString&  sDialogName,
+                                                                const OUString&  sDialogName,
                                                                 tools::Long            nCurrent,
                                                                 tools::Long            nDefault,
                                                                 FieldUnit       eFUnit,
@@ -765,8 +765,8 @@ public:
                                                                     const OUString& rTitle,
                                                                     const OUString& rEditTitle,
                                                                     const OUString& rDefault,
-                                                                    const OString& rHelpId,
-                                                                    const OString& rEditHelpId) override;
+                                                                    const OUString& rHelpId,
+                                                                    const OUString& rEditHelpId) override;
 
     virtual VclPtr<AbstractScTabBgColorDlg> CreateScTabBgColorDlg(weld::Window* pParent,
                                                                   const OUString& rTitle, //Dialog Title
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 7506f7e56231..a89d852e6de0 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -663,7 +663,7 @@ IMPL_LINK(ScCheckListMenuControl, CommandHdl, const CommandEvent&, rCEvt, bool)
     mxContextMenu->set_sensitive("less", mnCheckListVisibleRows > 4);
     mxContextMenu->set_sensitive("more", mnCheckListVisibleRows < 42);
 
-    OString sCommand = mxContextMenu->popup_at_rect(mpChecks, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)));
+    OUString sCommand = mxContextMenu->popup_at_rect(mpChecks, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)));
     if (sCommand.isEmpty())
         return true;
 
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx b/sc/source/ui/condformat/condformatdlgentry.cxx
index 149a20e48a79..ade0cede7cef 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -82,7 +82,7 @@ void ScCondFrmtEntry::SetIndex(sal_Int32 nIndex)
     mxFtCondNr->set_label(sLabel);
 
     // tdf#124412: uitest
-    mxFtCondition->set_buildable_name(sLabel.toUtf8());
+    mxFtCondition->set_buildable_name(sLabel);
 }
 
 void ScCondFrmtEntry::Select()
diff --git a/sc/source/ui/condformat/condformatmgr.cxx b/sc/source/ui/condformat/condformatmgr.cxx
index d4a2980a6dfa..31e16ab8c08c 100644
--- a/sc/source/ui/condformat/condformatmgr.cxx
+++ b/sc/source/ui/condformat/condformatmgr.cxx
@@ -102,7 +102,7 @@ ScCondFormatManagerDlg::ScCondFormatManagerDlg(weld::Window* pParent, ScDocument
 
     SvtViewOptions aDlgOpt(EViewType::Dialog, "CondFormatDialog");
     if (aDlgOpt.Exists())
-        m_xDialog->set_window_state(aDlgOpt.GetWindowState().toUtf8());
+        m_xDialog->set_window_state(aDlgOpt.GetWindowState());
 
     UpdateButtonSensitivity();
 }
@@ -111,9 +111,7 @@ ScCondFormatManagerDlg::~ScCondFormatManagerDlg()
 {
    // tdf#101285 - Remember position of dialog
     SvtViewOptions aDlgOpt(EViewType::Dialog, "CondFormatDialog");
-    OString sWindowState
-        = m_xDialog->get_window_state(vcl::WindowDataMask::Pos);
-    aDlgOpt.SetWindowState(OUString::fromUtf8(sWindowState));
+    aDlgOpt.SetWindowState(m_xDialog->get_window_state(vcl::WindowDataMask::Pos));
 }
 
 std::unique_ptr<ScConditionalFormatList> ScCondFormatManagerDlg::GetConditionalFormatList()
diff --git a/sc/source/ui/dbgui/csvgrid.cxx b/sc/source/ui/dbgui/csvgrid.cxx
index 16b7ca61e35f..f81e510fdae7 100644
--- a/sc/source/ui/dbgui/csvgrid.cxx
+++ b/sc/source/ui/dbgui/csvgrid.cxx
@@ -626,7 +626,7 @@ void ScCsvGrid::ScrollVertRel( ScMoveMode eDir )
 
 void ScCsvGrid::ExecutePopup( const Point& rPos )
 {
-    OString sItemId = mxPopup->popup_at_rect(GetDrawingArea(), tools::Rectangle(rPos, Size(1, 1)));
+    OUString sItemId = mxPopup->popup_at_rect(GetDrawingArea(), tools::Rectangle(rPos, Size(1, 1)));
     if (!sItemId.isEmpty())   // empty = cancelled
         Execute(CSVCMD_SETCOLUMNTYPE, sItemId.toInt32());
 }
diff --git a/sc/source/ui/dbgui/sortkeydlg.cxx b/sc/source/ui/dbgui/sortkeydlg.cxx
index 7e8397415018..0e9f05870a16 100644
--- a/sc/source/ui/dbgui/sortkeydlg.cxx
+++ b/sc/source/ui/dbgui/sortkeydlg.cxx
@@ -71,7 +71,7 @@ void ScSortKeyWindow::AddSortKey( sal_uInt16 nItemNumber )
         if ( m_aSortKeyItems.size() > 0 )
         {
             pSortKeyItem->m_xLbSort->set_buildable_name(
-                pSortKeyItem->m_xLbSort->get_buildable_name() + OString::number(m_aSortKeyItems.size() + 1));
+                pSortKeyItem->m_xLbSort->get_buildable_name() + OUString::number(m_aSortKeyItems.size() + 1));
         }
     }
 
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 01431c8156c6..b7e5b9bc4a3f 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -64,8 +64,8 @@ ScTpSubTotalGroup::ScTpSubTotalGroup(weld::Container* pPage, weld::DialogControl
     Init();
 
     // UI tests
-    mxLbGroup->set_buildable_name(mxLbGroup->get_buildable_name() + OString::number(rTabNumber));
-    mxLbColumns->set_buildable_name(mxLbColumns->get_buildable_name() + OString::number(rTabNumber));
+    mxLbGroup->set_buildable_name(mxLbGroup->get_buildable_name() + OUString::number(rTabNumber));
+    mxLbColumns->set_buildable_name(mxLbColumns->get_buildable_name() + OUString::number(rTabNumber));
 }
 
 ScTpSubTotalGroup::~ScTpSubTotalGroup()
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index b817d2db4308..f5d10cfe67ab 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -437,7 +437,7 @@ class MessageWithCheck : public weld::MessageDialogController
 private:
     std::unique_ptr<weld::CheckButton> m_xWarningOnBox;
 public:
-    MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OString& rDialogId)
+    MessageWithCheck(weld::Window *pParent, const OUString& rUIFile, const OUString& rDialogId)
         : MessageDialogController(pParent, rUIFile, rDialogId, "ask")
         , m_xWarningOnBox(m_xBuilder->weld_check_button("ask"))
     {
diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx
index 49e248672ab2..66ab24b9e76f 100644
--- a/sc/source/ui/drawfunc/fuins2.cxx
+++ b/sc/source/ui/drawfunc/fuins2.cxx
@@ -260,7 +260,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView*
             {
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
                 ScopedVclPtr<SfxAbstractInsertObjectDialog> pDlg(
-                        pFact->CreateInsertObjectDialog( rViewShell.GetFrameWeld(), SC_MOD()->GetSlotPool()->GetSlot(nSlot)->GetCommandString(),
+                        pFact->CreateInsertObjectDialog( rViewShell.GetFrameWeld(), SC_MOD()->GetSlotPool()->GetSlot(nSlot)->GetCommand(),
                         xStorage, &aServerLst ));
                 if ( pDlg )
                 {
diff --git a/sc/source/ui/inc/MatrixComparisonGenerator.hxx b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
index 058b9611a758..ab1e51d7a9b4 100644
--- a/sc/source/ui/inc/MatrixComparisonGenerator.hxx
+++ b/sc/source/ui/inc/MatrixComparisonGenerator.hxx
@@ -21,7 +21,7 @@ public:
     ScMatrixComparisonGenerator(
         SfxBindings* pSfxBindings, SfxChildWindow* pChildWindow,
         weld::Window* pParent, ScViewData& rViewData,
-        const OUString& rUiXmlDescription, const OString& rID);
+        const OUString& rUiXmlDescription, const OUString& rID);
 
     virtual ~ScMatrixComparisonGenerator() override;
 
diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
index 2de05951b3ab..e831772c8451 100644
--- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
+++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx
@@ -26,7 +26,7 @@ public:
         SfxBindings* pB, SfxChildWindow* pCW,
         weld::Window* pParent, ScViewData& rViewData,
         const OUString& rUIXMLDescription,
-        const OString& rID);
+        const OUString& rID);
 
     virtual ~ScStatisticsInputOutputDialog() override;
 
diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
index 3b1d5e46781f..150a57420913 100644
--- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
+++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx
@@ -25,7 +25,7 @@ public:
     ScStatisticsTwoVariableDialog(
         SfxBindings* pB, SfxChildWindow* pCW,
         weld::Window* pParent, ScViewData& rViewData,
-        const OUString& rUIXMLDescription, const OString& rID);
+        const OUString& rUIXMLDescription, const OUString& rID);
 
     virtual ~ScStatisticsTwoVariableDialog() override;
 
diff --git a/sc/source/ui/inc/anyrefdg.hxx b/sc/source/ui/inc/anyrefdg.hxx
index 9109974a8295..ad3feac803a6 100644
--- a/sc/source/ui/inc/anyrefdg.hxx
+++ b/sc/source/ui/inc/anyrefdg.hxx
@@ -141,13 +141,13 @@ struct ScRefHdlrControllerImpl : public TBase, public ScRefHandler
 {
     enum { UNKNOWN_SLOTID = 0U, SLOTID = UNKNOWN_SLOTID };
 
-    ScRefHdlrControllerImpl(weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet* pArg, SfxBindings *pB)
+    ScRefHdlrControllerImpl(weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID, const SfxItemSet* pArg, SfxBindings *pB)
         : TBase(pParent, rUIXMLDescription, rID, pArg)
         , ScRefHandler(*static_cast<TBase*>(this), pB, bBindRef)
     {
     }
 
-    ScRefHdlrControllerImpl(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, const OUString& rUIXMLDescription, const OString& rID)
+    ScRefHdlrControllerImpl(SfxBindings* pB, SfxChildWindow* pCW, weld::Window* pParent, const OUString& rUIXMLDescription, const OUString& rID)
         : TBase(pB, pCW, pParent, rUIXMLDescription, rID)
         , ScRefHandler(*static_cast<TBase*>(this), pB, bBindRef)
     {
@@ -156,7 +156,7 @@ struct ScRefHdlrControllerImpl : public TBase, public ScRefHandler
 
 struct ScAnyRefDlgController : ScRefHdlrControllerImpl<SfxModelessDialogController>
 {
-    ScAnyRefDlgController(SfxBindings* rt1, SfxChildWindow* rt2, weld::Window* rt3, const OUString& rt4, const OString& rt5)
+    ScAnyRefDlgController(SfxBindings* rt1, SfxChildWindow* rt2, weld::Window* rt3, const OUString& rt4, const OUString& rt5)
         : ScRefHdlrControllerImpl<SfxModelessDialogController>(rt1, rt2, rt3, rt4, rt5)
     {
     }
diff --git a/sc/source/ui/inc/attrdlg.hxx b/sc/source/ui/inc/attrdlg.hxx
index 67b9aa25a68b..1f4268481f35 100644
--- a/sc/source/ui/inc/attrdlg.hxx
+++ b/sc/source/ui/inc/attrdlg.hxx
@@ -34,7 +34,7 @@ public:
     virtual ~ScAttrDlg() override;
 
 protected:
-    virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override;
+    virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/gototabdlg.hxx b/sc/source/ui/inc/gototabdlg.hxx
index 827f56b17760..1bbd5ed9761e 100644
--- a/sc/source/ui/inc/gototabdlg.hxx
+++ b/sc/source/ui/inc/gototabdlg.hxx
@@ -31,8 +31,8 @@ public:
 
     /** Sets dialog title, label texts and help IDs. */
     void SetDescription(const OUString& rTitle, const OUString& rEntryLabel,
-                        const OUString& rListLabel, const OString& rDlgHelpId,
-                        const OString& rEnHelpId, const OString& rLbHelpId);
+                        const OUString& rListLabel, const OUString& rDlgHelpId,
+                        const OUString& rEnHelpId, const OUString& rLbHelpId);
 
     /** Inserts a string into the weld::TreeView. */
     void Insert(const OUString& rString, bool bSelected);
diff --git a/sc/source/ui/inc/hfedtdlg.hxx b/sc/source/ui/inc/hfedtdlg.hxx
index 61d02f9c6f5c..6bec2d995858 100644
--- a/sc/source/ui/inc/hfedtdlg.hxx
+++ b/sc/source/ui/inc/hfedtdlg.hxx
@@ -32,9 +32,9 @@ class ScHFEditDlg : public SfxTabDialogController
 protected:
     ScHFEditDlg(weld::Window* pParent,
         const SfxItemSet& rCoreSet, std::u16string_view rPageStyle,
-        const OUString& rUIXMLDescription, const OString& rID);
+        const OUString& rUIXMLDescription, const OUString& rID);
 public:
-    virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
 };
 
 class ScHFEditHeaderDlg : public ScHFEditDlg
diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx
index f0f69e948843..500ab23eb790 100644
--- a/sc/source/ui/inc/inputwin.hxx
+++ b/sc/source/ui/inc/inputwin.hxx
@@ -336,7 +336,7 @@ public:
 
     void            NotifyLOKClient();
 
-    void MenuHdl(std::string_view command);
+    void MenuHdl(std::u16string_view command);
     DECL_LINK( DropdownClickHdl, ToolBox*, void );
 
     void            AutoSum( bool& bRangeFinder, bool& bSubTotal, OpCode eCode );
diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx
index fc4163a55e1d..1b3edfca9382 100644
--- a/sc/source/ui/inc/mtrindlg.hxx
+++ b/sc/source/ui/inc/mtrindlg.hxx
@@ -25,7 +25,7 @@ class ScMetricInputDlg : public weld::GenericDialogController
 {
 public:
     ScMetricInputDlg( weld::Window*   pParent,
-                      const OString& sDialogName,
+                      const OUString& sDialogName,
                       tools::Long           nCurrent,
                       tools::Long           nDefault,
                       FieldUnit      eFUnit,
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index 95de25f267da..5a1ae392e403 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -129,9 +129,9 @@ private:
     DECL_LINK(DocumentSelectHdl, weld::ComboBox&, void);
     DECL_LINK(ExecuteRowHdl, weld::Entry&, bool);
     DECL_LINK(ExecuteColHdl, weld::Entry&, bool);
-    DECL_LINK(ToolBoxSelectHdl, const OString&, void);
-    DECL_LINK(ToolBoxDropdownClickHdl, const OString&, void);
-    DECL_LINK(MenuSelectHdl, const OString&, void);
+    DECL_LINK(ToolBoxSelectHdl, const OUString&, void);
+    DECL_LINK(ToolBoxDropdownClickHdl, const OUString&, void);
+    DECL_LINK(MenuSelectHdl, const OUString&, void);
     DECL_LINK(FormatRowOutputHdl, weld::SpinButton&, void);
     DECL_LINK(ParseRowInputHdl, int*, bool);
 
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 79e1077d425f..18c4f97f8caa 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -110,7 +110,7 @@ private:
     DECL_LINK( ListHdl_Impl, weld::ComboBox&, void);
     DECL_LINK( ListToggleHdl_Impl, weld::ComboBox&, void);
     DECL_LINK( ClickHdl, weld::Button&, void );
-    DECL_LINK( MenuHdl, const OString&, void );
+    DECL_LINK( MenuHdl, const OUString&, void );
 };
 
 class ScFirstHeaderEditPage : public ScHFEditPage
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index 9a1bb23edb05..448a938ba724 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -35,7 +35,7 @@ public:
 
     /** Sets dialog title, fixed text for listbox and help IDs. */
     void SetDescription(const OUString& rTitle, const OUString& rFixedText,
-                        const OString& nDlgHelpId, const OString& nLbHelpId);
+                        const OUString& nDlgHelpId, const OUString& nLbHelpId);
 
     /** Inserts a string into the weld::TreeView. */
     void Insert(const OUString& rString, bool bSelected);
diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx
index 6b1490349b47..6602a5563dd6 100644
--- a/sc/source/ui/inc/strindlg.hxx
+++ b/sc/source/ui/inc/strindlg.hxx
@@ -32,7 +32,7 @@ public:
         const OUString& rTitle,
         const OUString& rEditTitle,
         const OUString& rDefault,
-        const OString& sHelpId, const OString& sEditHelpId);
+        const OUString& sHelpId, const OUString& sEditHelpId);
 
     OUString GetInputString() const
     {
diff --git a/sc/source/ui/inc/styledlg.hxx b/sc/source/ui/inc/styledlg.hxx
index 736849ef963d..2fe13111c61b 100644
--- a/sc/source/ui/inc/styledlg.hxx
+++ b/sc/source/ui/inc/styledlg.hxx
@@ -32,7 +32,7 @@ public:
                bool bPage);
 
 protected:
-    virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override;
+    virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override;
     virtual void RefreshInputSet() override;
 
 private:
@@ -47,7 +47,7 @@ public:
                    SdrView* pView);
 
 protected:
-    virtual void PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override;
+    virtual void PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override;
     virtual void RefreshInputSet() override;
 
 private:
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index e87b6355198c..a670c4429d53 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -360,7 +360,7 @@ public:
 
     static void UpdateNumberFormatter( const SvxNumberInfoItem&  rInfoItem );
 
-    void    ExecuteCellFormatDlg( SfxRequest& rReq, const OString &rTabPage);
+    void    ExecuteCellFormatDlg( SfxRequest& rReq, const OUString &rTabPage);
 
     bool    GetFunction( OUString& rFuncStr, FormulaError nErrCode );
 
diff --git a/sc/source/ui/inc/textdlgs.hxx b/sc/source/ui/inc/textdlgs.hxx
index 0bffe3a242c3..61cdfdb170ff 100644
--- a/sc/source/ui/inc/textdlgs.hxx
+++ b/sc/source/ui/inc/textdlgs.hxx
@@ -28,7 +28,7 @@ class ScCharDlg : 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:
     ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxObjectShell* pDocShell,
@@ -38,7 +38,7 @@ public:
 class ScParagraphDlg : public SfxTabDialogController
 {
 private:
-    virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
 
 public:
     ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr);
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index 618cfb23f1c0..c8ed4447c400 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -150,7 +150,7 @@ class ScValidationDlg
     typedef ScRefHdlrControllerImpl<SfxTabDialogController, false> ScValidationDlgBase;
 
     ScTabViewShell * m_pTabVwSh;
-    OString m_sValuePageId;
+    OUString m_sValuePageId;
     bool    m_bOwnRefHdlr:1;
     bool    m_bRefInputting:1;
 
diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx
index 3ff295276ab3..957661186906 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1600,7 +1600,7 @@ IMPL_LINK(ScAcceptChgDlg, CommandHdl, const CommandEvent&, rCEvt, bool)
 
     int nSortedCol = rTreeView.get_sort_column();
     for (sal_Int32 i = 0; i < 5; ++i)
-        m_xSortMenu->set_active("calcsort" + OString::number(i), i == nSortedCol);
+        m_xSortMenu->set_active("calcsort" + OUString::number(i), i == nSortedCol);
 
     m_xPopup->set_sensitive("calcedit", false);
 
@@ -1615,7 +1615,7 @@ IMPL_LINK(ScAcceptChgDlg, CommandHdl, const CommandEvent&, rCEvt, bool)
         }
     }
 
-    OString sCommand = m_xPopup->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)));
+    OUString sCommand = m_xPopup->popup_at_rect(&rTreeView, tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1)));
 
     if (!sCommand.isEmpty())
     {
diff --git a/sc/source/ui/miscdlgs/gototabdlg.cxx b/sc/source/ui/miscdlgs/gototabdlg.cxx
index e38e671009ee..c817e506d6a6 100644
--- a/sc/source/ui/miscdlgs/gototabdlg.cxx
+++ b/sc/source/ui/miscdlgs/gototabdlg.cxx
@@ -28,8 +28,8 @@ ScGoToTabDlg::ScGoToTabDlg(weld::Window* pParent)
 ScGoToTabDlg::~ScGoToTabDlg() {}
 
 void ScGoToTabDlg::SetDescription(const OUString& rTitle, const OUString& rEntryLabel,
-                                  const OUString& rListLabel, const OString& rDlgHelpId,
-                                  const OString& rEnHelpId, const OString& rLbHelpId)
+                                  const OUString& rListLabel, const OUString& rDlgHelpId,
+                                  const OUString& rEnHelpId, const OUString& rLbHelpId)
 {
     m_xDialog->set_title(rTitle);
     m_xFrameMask->set_label(rEntryLabel);
diff --git a/sc/source/ui/miscdlgs/groupdlg.cxx b/sc/source/ui/miscdlgs/groupdlg.cxx
index 839cc4f74a16..f200dbccba2c 100644
--- a/sc/source/ui/miscdlgs/groupdlg.cxx
+++ b/sc/source/ui/miscdlgs/groupdlg.cxx
@@ -28,8 +28,8 @@ ScGroupDlg::ScGroupDlg(weld::Window* pParent, bool bUngroup, bool bRows)
             OUString("modules/scalc/ui/groupdialog.ui")
     ,
         bUngroup ?
-            OString("UngroupDialog") :
-            OString("GroupDialog"))
+            OUString("UngroupDialog") :
+            OUString("GroupDialog"))
     , m_xBtnRows(m_xBuilder->weld_radio_button("rows"))
     , m_xBtnCols(m_xBuilder->weld_radio_button("cols"))
 {
diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx
index 7f234131fb33..a203a3710d09 100644
--- a/sc/source/ui/miscdlgs/mtrindlg.cxx
+++ b/sc/source/ui/miscdlgs/mtrindlg.cxx
@@ -22,7 +22,7 @@
 #include <mtrindlg.hxx>
 
 ScMetricInputDlg::ScMetricInputDlg( weld::Window*         pParent,
-                                    const OString&  sDialogName,
+                                    const OUString&  sDialogName,
                                     tools::Long            nCurrent,
                                     tools::Long            nDefault,
                                     FieldUnit       eFUnit,
@@ -30,8 +30,7 @@ ScMetricInputDlg::ScMetricInputDlg( weld::Window*         pParent,
                                     tools::Long            nMaximum,
                                     tools::Long            nMinimum)
 
-    : GenericDialogController(pParent, "modules/scalc/ui/" + OStringToOUString(
-        sDialogName.toAsciiLowerCase(), RTL_TEXTENCODING_UTF8) + ".ui", sDialogName)
+    : GenericDialogController(pParent, "modules/scalc/ui/" + sDialogName.toAsciiLowerCase() + ".ui", sDialogName)
     , m_xEdValue(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM))
     , m_xBtnDefVal(m_xBuilder->weld_check_button("default"))
 {
diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx
index cf0c10918890..23dc981e6a08 100644
--- a/sc/source/ui/miscdlgs/shtabdlg.cxx
+++ b/sc/source/ui/miscdlgs/shtabdlg.cxx
@@ -34,7 +34,7 @@ ScShowTabDlg::ScShowTabDlg(weld::Window* pParent)
 ScShowTabDlg::~ScShowTabDlg() {}
 
 void ScShowTabDlg::SetDescription(const OUString& rTitle, const OUString& rFixedText,
-                                  const OString& rDlgHelpId, const OString& sLbHelpId)
+                                  const OUString& rDlgHelpId, const OUString& sLbHelpId)
 {
     m_xDialog->set_title(rTitle);
     m_xFrame->set_label(rFixedText);
diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx
index 61ba77534401..18112a69347e 100644
--- a/sc/source/ui/miscdlgs/strindlg.cxx
+++ b/sc/source/ui/miscdlgs/strindlg.cxx
@@ -25,7 +25,7 @@ ScStringInputDlg::ScStringInputDlg(weld::Window* pParent,
                                    const OUString& rTitle,
                                    const OUString& rEditTitle,
                                    const OUString& rDefault,
-                                   const OString& rHelpId, const OString& rEditHelpId)
+                                   const OUString& rHelpId, const OUString& rEditHelpId)
     : GenericDialogController(pParent, "modules/scalc/ui/inputstringdialog.ui",
             "InputStringDialog")
     , m_xLabel(m_xBuilder->weld_label("description_label"))
diff --git a/sc/source/ui/miscdlgs/textdlgs.cxx b/sc/source/ui/miscdlgs/textdlgs.cxx
index 40a84a626a4f..04c4db957db8 100644
--- a/sc/source/ui/miscdlgs/textdlgs.cxx
+++ b/sc/source/ui/miscdlgs/textdlgs.cxx
@@ -44,7 +44,7 @@ ScCharDlg::ScCharDlg(weld::Window* pParent, const SfxItemSet* pAttr, const SfxOb
         RemoveTabPage("background");
 }
 
-void ScCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void ScCharDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     if (rId == "font")
@@ -79,7 +79,7 @@ ScParagraphDlg::ScParagraphDlg(weld::Window* pParent, const SfxItemSet* pAttr)
     AddTabPage("labelTP_TABULATOR", RID_SVXPAGE_TABULATOR);
 }
 
-void ScParagraphDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
+void ScParagraphDlg::PageCreated(const OUString& rId, SfxTabPage &rPage)
 {
     if (rId == "labelTP_TABULATOR")
     {
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 35ae45751c81..3b405d9449f6 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -596,9 +596,9 @@ IMPL_LINK(ScContentTree, CommandHdl, const CommandEvent&, rCEvt, bool)
                     if (bHiddenDoc)
                         sActive = sId;
                 }
-                xDocMenu->set_active(sActive.toUtf8(), true);
+                xDocMenu->set_active(sActive, true);
 
-                OString sIdent = xPop->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)));
+                OUString sIdent = xPop->popup_at_rect(m_xTreeView.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1, 1)));
                 if (sIdent == "hyperlink")
                     pParentWindow->SetDropMode(0);
                 else if (sIdent == "link")
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index a5816dc7c045..92a6c5f6c94a 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -188,7 +188,7 @@ IMPL_LINK(ScNavigatorDlg, DocumentSelectHdl, weld::ComboBox&, rListBox, void)
     m_xLbEntries->SelectDoc(aDocName);
 }
 
-IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, const OString&, rSelId, void)
+IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, const OUString&, rSelId, void)
 {
     //  Switch the mode?
     if (rSelId == "contents" || rSelId == "scenarios")
@@ -231,7 +231,7 @@ IMPL_LINK(ScNavigatorDlg, ToolBoxSelectHdl, const OString&, rSelId, void)
     }
 }
 
-IMPL_LINK(ScNavigatorDlg, ToolBoxDropdownClickHdl, const OString&, rCommand, void)
+IMPL_LINK(ScNavigatorDlg, ToolBoxDropdownClickHdl, const OUString&, rCommand, void)
 {
     if (!m_xTbxCmd2->get_menu_item_active(rCommand))
         return;
@@ -255,13 +255,13 @@ IMPL_LINK(ScNavigatorDlg, ToolBoxDropdownClickHdl, const OString&, rCommand, voi
     }
 }
 
-IMPL_LINK(ScNavigatorDlg, MenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(ScNavigatorDlg, MenuSelectHdl, const OUString&, rIdent, void)
 {
-    if (rIdent == "hyperlink")
+    if (rIdent == u"hyperlink")
         SetDropMode(0);
-    else if (rIdent == "link")
+    else if (rIdent == u"link")
         SetDropMode(1);
-    else if (rIdent == "copy")
+    else if (rIdent == u"copy")
         SetDropMode(2);
 }
 
diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx
index 3bbc6309ccd5..5ca601d2e64c 100644
--- a/sc/source/ui/navipi/scenwnd.cxx
+++ b/sc/source/ui/navipi/scenwnd.cxx
@@ -127,7 +127,7 @@ IMPL_LINK(ScScenarioWindow, ContextMenuHdl, const CommandEvent&, rCEvt, bool)
             {
                 std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(m_xLbScenario.get(), "modules/scalc/ui/scenariomenu.ui"));
                 std::unique_ptr<weld::Menu> xPopup(xBuilder->weld_menu("menu"));
-                OString sIdent(xPopup->popup_at_rect(m_xLbScenario.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
+                OUString sIdent(xPopup->popup_at_rect(m_xLbScenario.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
                 if (sIdent == "delete")
                     DeleteScenario();
                 else if (sIdent == "edit")
diff --git a/sc/source/ui/pagedlg/hfedtdlg.cxx b/sc/source/ui/pagedlg/hfedtdlg.cxx
index b4e111b9c3c3..6b873e8f5760 100644
--- a/sc/source/ui/pagedlg/hfedtdlg.cxx
+++ b/sc/source/ui/pagedlg/hfedtdlg.cxx
@@ -33,7 +33,7 @@ ScHFEditDlg::ScHFEditDlg(weld::Window* pParent,
                          const SfxItemSet& rCoreSet,
                          std::u16string_view rPageStyle,
                          const OUString& rUIXMLDescription,
-                         const OString& rID)
+                         const OUString& rID)
     :   SfxTabDialogController(pParent, rUIXMLDescription, rID, &rCoreSet)
 {
     eNumType = rCoreSet.Get(ATTR_PAGE).GetNumType();
@@ -253,7 +253,7 @@ ScHFEditActiveDlg::ScHFEditActiveDlg(
     }
 }
 
-void ScHFEditDlg::PageCreated(const OString& /* rId */, SfxTabPage& rPage)
+void ScHFEditDlg::PageCreated(const OUString& /* rId */, SfxTabPage& rPage)
 {
     // Can only be a ScHFEditPage...
 
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index a4c7a1387868..46687884e376 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -753,7 +753,7 @@ IMPL_LINK( ScHFEditPage, ClickHdl, weld::Button&, rBtn, void )
     m_pEditFocus->GrabFocus();
 }
 
-IMPL_LINK(ScHFEditPage, MenuHdl, const OString&, rSelectedId, void)
+IMPL_LINK(ScHFEditPage, MenuHdl, const OUString&, rSelectedId, void)
 {
     if (!m_pEditFocus)
         return;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index d09b8a5ca7be..a8f9dc148f28 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -36,8 +36,8 @@
 using namespace css;
 using namespace css::uno;
 
-constexpr OStringLiteral SETBORDERSTYLE = "SetBorderStyle";
-constexpr OStringLiteral LINESTYLE = "LineStyle";
+constexpr OUStringLiteral SETBORDERSTYLE = u"SetBorderStyle";
+constexpr OUStringLiteral LINESTYLE = u"LineStyle";
 
 // namespace open
 
@@ -140,12 +140,12 @@ void CellAppearancePropertyPanel::Initialize()
     mxTBLineColor->set_sensitive(false);
 }
 
-IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, const OString&, void)
+IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderSelectHdl, const OUString&, void)
 {
     mxTBCellBorder->set_menu_item_active(SETBORDERSTYLE, !mxTBCellBorder->get_menu_item_active(SETBORDERSTYLE));
 }
 
-IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderMenuHdl, const OString&, void)
+IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderMenuHdl, const OUString&, void)
 {
     if (!mxTBCellBorder->get_menu_item_active(SETBORDERSTYLE))
         return;
@@ -157,12 +157,12 @@ IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxCellBorderMenuHdl, const OString
     mxCellBorderPopoverContainer->getPopover()->GrabFocus();
 }
 
-IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, const OString&, void)
+IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxLineStyleSelectHdl, const OUString&, void)
 {
     mxTBLineStyle->set_menu_item_active(LINESTYLE, !mxTBLineStyle->get_menu_item_active(LINESTYLE));
 }
 
-IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxLineStyleMenuHdl, const OString&, void)
+IMPL_LINK_NOARG(CellAppearancePropertyPanel, TbxLineStyleMenuHdl, const OUString&, void)
 {
     if (!mxTBLineStyle->get_menu_item_active(LINESTYLE))
         return;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index 412cd37e107a..8ee0212399e8 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -131,10 +131,10 @@ private:
     vcl::EnumContext                        maContext;
     SfxBindings*                            mpBindings;
 
-    DECL_LINK(TbxCellBorderSelectHdl, const OString&, void);
-    DECL_LINK(TbxCellBorderMenuHdl, const OString&, void);
-    DECL_LINK(TbxLineStyleSelectHdl, const OString&, void);
-    DECL_LINK(TbxLineStyleMenuHdl, const OString&, void);
+    DECL_LINK(TbxCellBorderSelectHdl, const OUString&, void);
+    DECL_LINK(TbxCellBorderMenuHdl, const OUString&, void);
+    DECL_LINK(TbxLineStyleSelectHdl, const OUString&, void);
+    DECL_LINK(TbxLineStyleMenuHdl, const OUString&, void);
 
     void Initialize();
     void SetStyleIcon();
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
index 6749588b9166..1c75a4a9ae34 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx
@@ -38,7 +38,7 @@ namespace sc::sidebar {
 #define FRM_VALID_OUTER     0x0f
 #define FRM_VALID_ALL       0xff
 
-CellBorderStylePopup::CellBorderStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher)
+CellBorderStylePopup::CellBorderStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher)
     : WeldToolbarPopup(nullptr, pParent, "modules/scalc/ui/floatingborderstyle.ui", "FloatingBorderStyle")
     , maToolButton(pParent, rId)
     , mpDispatcher(pDispatcher)
@@ -69,7 +69,7 @@ void CellBorderStylePopup::Initialize()
     mxTBBorder4->connect_clicked ( LINK(this, CellBorderStylePopup, TB4SelectHdl) );
 }
 
-IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, const OString&, rId, void)
+IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, const OUString&, rId, void)
 {
     SvxBoxItem          aBorderOuter( SID_ATTR_BORDER_OUTER );
     SvxBoxInfoItem      aBorderInner( SID_ATTR_BORDER_INNER );
@@ -128,7 +128,7 @@ IMPL_LINK(CellBorderStylePopup, TB1SelectHdl, const OString&, rId, void)
     maToolButton.set_inactive();
 }
 
-IMPL_LINK(CellBorderStylePopup, TB2and3SelectHdl, const OString&, rId, void)
+IMPL_LINK(CellBorderStylePopup, TB2and3SelectHdl, const OUString&, rId, void)
 {
     if (rId == "diagup")
     {
@@ -215,7 +215,7 @@ IMPL_LINK(CellBorderStylePopup, TB2and3SelectHdl, const OString&, rId, void)
     maToolButton.set_inactive();
 }
 
-IMPL_LINK(CellBorderStylePopup, TB4SelectHdl, const OString&, rId, void)
+IMPL_LINK(CellBorderStylePopup, TB4SelectHdl, const OUString&, rId, void)
 {
     SvxBoxItem          aBorderOuter( SID_ATTR_BORDER_OUTER );
     SvxBoxInfoItem      aBorderInner( SID_ATTR_BORDER_INNER );
diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
index f6ae6891b868..95b6cb9b442d 100644
--- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx
@@ -37,12 +37,12 @@ private:
 
     void Initialize();
 
-    DECL_LINK(TB1SelectHdl, const OString&, void);
-    DECL_LINK(TB2and3SelectHdl, const OString&, void);
-    DECL_LINK(TB4SelectHdl, const OString&, void);
+    DECL_LINK(TB1SelectHdl, const OUString&, void);
+    DECL_LINK(TB2and3SelectHdl, const OUString&, void);
+    DECL_LINK(TB4SelectHdl, const OUString&, void);
 
 public:
-    CellBorderStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher);
+    CellBorderStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher);
     virtual void GrabFocus() override;
     virtual ~CellBorderStylePopup() override;
 };
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx
index 5c27ee5a51b1..b6510ffa393d 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.cxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx
@@ -32,7 +32,7 @@
 
 namespace sc::sidebar {
 
-CellLineStylePopup::CellLineStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher)
+CellLineStylePopup::CellLineStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher)
     : WeldToolbarPopup(nullptr, pParent, "modules/scalc/ui/floatinglinestyle.ui", "FloatingLineStyle")
     , maToolButton(pParent, rId)
     , mpDispatcher(pDispatcher)
diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx
index 8bb9ba89c8ce..0955592e4998 100644
--- a/sc/source/ui/sidebar/CellLineStyleControl.hxx
+++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx
@@ -43,7 +43,7 @@ private:
     DECL_LINK(PBClickHdl, weld::Button&, void);
 
 public:
-    CellLineStylePopup(weld::Toolbar* pParent, const OString& rId, SfxDispatcher* pDispatcher);
+    CellLineStylePopup(weld::Toolbar* pParent, const OUString& rId, SfxDispatcher* pDispatcher);
     void SetLineStyleSelect(sal_uInt16 out, sal_uInt16 in, sal_uInt16 dis);
     virtual void GrabFocus() override;
     virtual ~CellLineStylePopup() override;
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index 206d852cf46a..b86d61b9598c 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -47,8 +47,8 @@ ScStyleDlg::ScStyleDlg(weld::Window* pParent,
                           OUString("modules/scalc/ui/pagetemplatedialog.ui") :
                           OUString("modules/scalc/ui/paratemplatedialog.ui"),
                         bPage ?
-                          OString("PageTemplateDialog") :
-                          OString("ParaTemplateDialog"),
+                          OUString("PageTemplateDialog") :
+                          OUString("ParaTemplateDialog"),
                         rStyleBase )
     , m_bPage(bPage)
 {
@@ -80,7 +80,7 @@ ScStyleDlg::ScStyleDlg(weld::Window* pParent,
     }
 }
 
-void ScStyleDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage)
+void ScStyleDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage)
 {
     if (m_bPage)
     {
@@ -162,7 +162,7 @@ ScDrawStyleDlg::ScDrawStyleDlg(weld::Window* pParent, SfxStyleSheetBase& rStyleB
         RemoveTabPage("asiantypo");
 }
 
-void ScDrawStyleDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage)
+void ScDrawStyleDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     SdrModel& rModel = mpView->GetModel();
diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx
index efecef8cd22f..bbd5c26eff12 100644
--- a/sc/source/ui/view/tabcont.cxx
+++ b/sc/source/ui/view/tabcont.cxx
@@ -112,10 +112,10 @@ IMPL_LINK(ScTabControl, ShowPageList, const CommandEvent &, rEvent, void)
         OUString sId = OUString::number(nId);
         xPopup->append_radio(sId, aString);
         if (nId == nCurPageId)
-            xPopup->set_active(sId.toUtf8(), true);
+            xPopup->set_active(sId, true);
     }
 
-    OString sIdent(xPopup->popup_at_rect(pPopupParent, aRect));
+    OUString sIdent(xPopup->popup_at_rect(pPopupParent, aRect));
     if (!sIdent.isEmpty())
         SwitchToPageId(sIdent.toUInt32());
 }
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 9bcf40828ba6..a3eb7bd5403d 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -525,7 +525,7 @@ void ScTabViewShell::GetState( SfxItemSet& rSet )
     } // while ( nWitch )
 }
 
-void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OString &rName)
+void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, const OUString &rName)
 {
     ScDocument& rDoc = GetViewData().GetDocument();
 
diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx
index e3845529c569..4c4415fb1f4c 100644
--- a/sc/source/ui/view/tabvwshf.cxx
+++ b/sc/source/ui/view/tabvwshf.cxx
@@ -386,7 +386,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq )
                     OUString      aErrMsg ( ScResId( STR_INVALIDTABNAME ) );
                     OUString aName;
                     OUString      aDlgTitle;
-                    OString sHelpId;
+                    OUString sHelpId;
 
                     switch ( nSlot )
                     {