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>

30 files changed, 97 insertions, 97 deletions

diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h
index 48a623dd1319..b16b8506d161 100644
--- a/extensions/inc/helpids.h
+++ b/extensions/inc/helpids.h
@@ -22,59 +22,59 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OStringLiteral HID_ABSPILOT_PREVIOUS = "EXTENSIONS_HID_ABSPILOT_PREVIOUS";
-inline constexpr OStringLiteral HID_ABSPILOT_NEXT = "EXTENSIONS_HID_ABSPILOT_NEXT";
-inline constexpr OStringLiteral HID_ABSPILOT_CANCEL = "EXTENSIONS_HID_ABSPILOT_CANCEL";
-inline constexpr OStringLiteral HID_ABSPILOT_FINISH = "EXTENSIONS_HID_ABSPILOT_FINISH";
-inline constexpr OStringLiteral UID_ABSPILOT_HELP = "EXTENSIONS_UID_ABSPILOT_HELP";
-inline constexpr OStringLiteral HID_ABSPILOT = "EXTENSIONS_HID_ABSPILOT";
+inline constexpr OUStringLiteral HID_ABSPILOT_PREVIOUS = u"EXTENSIONS_HID_ABSPILOT_PREVIOUS";
+inline constexpr OUStringLiteral HID_ABSPILOT_NEXT = u"EXTENSIONS_HID_ABSPILOT_NEXT";
+inline constexpr OUStringLiteral HID_ABSPILOT_CANCEL = u"EXTENSIONS_HID_ABSPILOT_CANCEL";
+inline constexpr OUStringLiteral HID_ABSPILOT_FINISH = u"EXTENSIONS_HID_ABSPILOT_FINISH";
+inline constexpr OUStringLiteral UID_ABSPILOT_HELP = u"EXTENSIONS_UID_ABSPILOT_HELP";
+inline constexpr OUStringLiteral HID_ABSPILOT = u"EXTENSIONS_HID_ABSPILOT";
 
-inline constexpr OStringLiteral HID_BIB_IDENTIFIER_POS = "EXTENSIONS_HID_BIB_IDENTIFIER_POS";
-inline constexpr OStringLiteral HID_BIB_AUTHORITYTYPE_POS = "EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS";
-inline constexpr OStringLiteral HID_BIB_AUTHOR_POS = "EXTENSIONS_HID_BIB_AUTHOR_POS";
-inline constexpr OStringLiteral HID_BIB_TITLE_POS = "EXTENSIONS_HID_BIB_TITLE_POS";
-inline constexpr OStringLiteral HID_BIB_YEAR_POS = "EXTENSIONS_HID_BIB_YEAR_POS";
-inline constexpr OStringLiteral HID_BIB_ISBN_POS = "EXTENSIONS_HID_BIB_ISBN_POS";
-inline constexpr OStringLiteral HID_BIB_BOOKTITLE_POS = "EXTENSIONS_HID_BIB_BOOKTITLE_POS";
-inline constexpr OStringLiteral HID_BIB_CHAPTER_POS = "EXTENSIONS_HID_BIB_CHAPTER_POS";
-inline constexpr OStringLiteral HID_BIB_EDITION_POS = "EXTENSIONS_HID_BIB_EDITION_POS";
-inline constexpr OStringLiteral HID_BIB_EDITOR_POS = "EXTENSIONS_HID_BIB_EDITOR_POS";
-inline constexpr OStringLiteral HID_BIB_HOWPUBLISHED_POS = "EXTENSIONS_HID_BIB_HOWPUBLISHED_POS";
-inline constexpr OStringLiteral HID_BIB_INSTITUTION_POS = "EXTENSIONS_HID_BIB_INSTITUTION_POS";
-inline constexpr OStringLiteral HID_BIB_JOURNAL_POS = "EXTENSIONS_HID_BIB_JOURNAL_POS";
-inline constexpr OStringLiteral HID_BIB_MONTH_POS = "EXTENSIONS_HID_BIB_MONTH_POS";
-inline constexpr OStringLiteral HID_BIB_NOTE_POS = "EXTENSIONS_HID_BIB_NOTE_POS";
-inline constexpr OStringLiteral HID_BIB_ANNOTE_POS = "EXTENSIONS_HID_BIB_ANNOTE_POS";
-inline constexpr OStringLiteral HID_BIB_NUMBER_POS = "EXTENSIONS_HID_BIB_NUMBER_POS";
-inline constexpr OStringLiteral HID_BIB_ORGANIZATIONS_POS = "EXTENSIONS_HID_BIB_ORGANIZATIONS_POS";
-inline constexpr OStringLiteral HID_BIB_PAGES_POS = "EXTENSIONS_HID_BIB_PAGES_POS";
-inline constexpr OStringLiteral HID_BIB_PUBLISHER_POS = "EXTENSIONS_HID_BIB_PUBLISHER_POS";
-inline constexpr OStringLiteral HID_BIB_ADDRESS_POS = "EXTENSIONS_HID_BIB_ADDRESS_POS";
-inline constexpr OStringLiteral HID_BIB_SCHOOL_POS = "EXTENSIONS_HID_BIB_SCHOOL_POS";
-inline constexpr OStringLiteral HID_BIB_SERIES_POS = "EXTENSIONS_HID_BIB_SERIES_POS";
-inline constexpr OStringLiteral HID_BIB_REPORTTYPE_POS = "EXTENSIONS_HID_BIB_REPORTTYPE_POS";
-inline constexpr OStringLiteral HID_BIB_VOLUME_POS = "EXTENSIONS_HID_BIB_VOLUME_POS";
-inline constexpr OStringLiteral HID_BIB_URL_POS = "EXTENSIONS_HID_BIB_URL_POS";
-inline constexpr OStringLiteral HID_BIB_CUSTOM1_POS = "EXTENSIONS_HID_BIB_CUSTOM1_POS";
-inline constexpr OStringLiteral HID_BIB_CUSTOM2_POS = "EXTENSIONS_HID_BIB_CUSTOM2_POS";
-inline constexpr OStringLiteral HID_BIB_CUSTOM3_POS = "EXTENSIONS_HID_BIB_CUSTOM3_POS";
-inline constexpr OStringLiteral HID_BIB_CUSTOM4_POS = "EXTENSIONS_HID_BIB_CUSTOM4_POS";
-inline constexpr OStringLiteral HID_BIB_CUSTOM5_POS = "EXTENSIONS_HID_BIB_CUSTOM5_POS";
-inline constexpr OStringLiteral HID_BIB_LOCAL_URL_POS = "EXTENSIONS_HID_BIB_LOCAL_URL_POS";
+inline constexpr OUStringLiteral HID_BIB_IDENTIFIER_POS = u"EXTENSIONS_HID_BIB_IDENTIFIER_POS";
+inline constexpr OUStringLiteral HID_BIB_AUTHORITYTYPE_POS = u"EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS";
+inline constexpr OUStringLiteral HID_BIB_AUTHOR_POS = u"EXTENSIONS_HID_BIB_AUTHOR_POS";
+inline constexpr OUStringLiteral HID_BIB_TITLE_POS = u"EXTENSIONS_HID_BIB_TITLE_POS";
+inline constexpr OUStringLiteral HID_BIB_YEAR_POS = u"EXTENSIONS_HID_BIB_YEAR_POS";
+inline constexpr OUStringLiteral HID_BIB_ISBN_POS = u"EXTENSIONS_HID_BIB_ISBN_POS";
+inline constexpr OUStringLiteral HID_BIB_BOOKTITLE_POS = u"EXTENSIONS_HID_BIB_BOOKTITLE_POS";
+inline constexpr OUStringLiteral HID_BIB_CHAPTER_POS = u"EXTENSIONS_HID_BIB_CHAPTER_POS";
+inline constexpr OUStringLiteral HID_BIB_EDITION_POS = u"EXTENSIONS_HID_BIB_EDITION_POS";
+inline constexpr OUStringLiteral HID_BIB_EDITOR_POS = u"EXTENSIONS_HID_BIB_EDITOR_POS";
+inline constexpr OUStringLiteral HID_BIB_HOWPUBLISHED_POS = u"EXTENSIONS_HID_BIB_HOWPUBLISHED_POS";
+inline constexpr OUStringLiteral HID_BIB_INSTITUTION_POS = u"EXTENSIONS_HID_BIB_INSTITUTION_POS";
+inline constexpr OUStringLiteral HID_BIB_JOURNAL_POS = u"EXTENSIONS_HID_BIB_JOURNAL_POS";
+inline constexpr OUStringLiteral HID_BIB_MONTH_POS = u"EXTENSIONS_HID_BIB_MONTH_POS";
+inline constexpr OUStringLiteral HID_BIB_NOTE_POS = u"EXTENSIONS_HID_BIB_NOTE_POS";
+inline constexpr OUStringLiteral HID_BIB_ANNOTE_POS = u"EXTENSIONS_HID_BIB_ANNOTE_POS";
+inline constexpr OUStringLiteral HID_BIB_NUMBER_POS = u"EXTENSIONS_HID_BIB_NUMBER_POS";
+inline constexpr OUStringLiteral HID_BIB_ORGANIZATIONS_POS = u"EXTENSIONS_HID_BIB_ORGANIZATIONS_POS";
+inline constexpr OUStringLiteral HID_BIB_PAGES_POS = u"EXTENSIONS_HID_BIB_PAGES_POS";
+inline constexpr OUStringLiteral HID_BIB_PUBLISHER_POS = u"EXTENSIONS_HID_BIB_PUBLISHER_POS";
+inline constexpr OUStringLiteral HID_BIB_ADDRESS_POS = u"EXTENSIONS_HID_BIB_ADDRESS_POS";
+inline constexpr OUStringLiteral HID_BIB_SCHOOL_POS = u"EXTENSIONS_HID_BIB_SCHOOL_POS";
+inline constexpr OUStringLiteral HID_BIB_SERIES_POS = u"EXTENSIONS_HID_BIB_SERIES_POS";
+inline constexpr OUStringLiteral HID_BIB_REPORTTYPE_POS = u"EXTENSIONS_HID_BIB_REPORTTYPE_POS";
+inline constexpr OUStringLiteral HID_BIB_VOLUME_POS = u"EXTENSIONS_HID_BIB_VOLUME_POS";
+inline constexpr OUStringLiteral HID_BIB_URL_POS = u"EXTENSIONS_HID_BIB_URL_POS";
+inline constexpr OUStringLiteral HID_BIB_CUSTOM1_POS = u"EXTENSIONS_HID_BIB_CUSTOM1_POS";
+inline constexpr OUStringLiteral HID_BIB_CUSTOM2_POS = u"EXTENSIONS_HID_BIB_CUSTOM2_POS";
+inline constexpr OUStringLiteral HID_BIB_CUSTOM3_POS = u"EXTENSIONS_HID_BIB_CUSTOM3_POS";
+inline constexpr OUStringLiteral HID_BIB_CUSTOM4_POS = u"EXTENSIONS_HID_BIB_CUSTOM4_POS";
+inline constexpr OUStringLiteral HID_BIB_CUSTOM5_POS = u"EXTENSIONS_HID_BIB_CUSTOM5_POS";
+inline constexpr OUStringLiteral HID_BIB_LOCAL_URL_POS = u"EXTENSIONS_HID_BIB_LOCAL_URL_POS";
 #define HID_BIB_DB_GRIDCTRL                             "EXTENSIONS_HID_BIB_DB_GRIDCTRL"
 
-inline constexpr OStringLiteral HID_GROUPWIZARD_PREVIOUS = "EXTENSIONS_HID_GROUPWIZARD_PREVIOUS";
-inline constexpr OStringLiteral HID_GROUPWIZARD_NEXT = "EXTENSIONS_HID_GROUPWIZARD_NEXT";
-inline constexpr OStringLiteral HID_GROUPWIZARD_CANCEL = "EXTENSIONS_HID_GROUPWIZARD_CANCEL";
-inline constexpr OStringLiteral HID_GROUPWIZARD_FINISH = "EXTENSIONS_HID_GROUPWIZARD_FINISH";
-inline constexpr OStringLiteral HID_LISTWIZARD_PREVIOUS = "EXTENSIONS_HID_LISTWIZARD_PREVIOUS";
-inline constexpr OStringLiteral HID_LISTWIZARD_NEXT = "EXTENSIONS_HID_LISTWIZARD_NEXT";
-inline constexpr OStringLiteral HID_LISTWIZARD_CANCEL = "EXTENSIONS_HID_LISTWIZARD_CANCEL";
-inline constexpr OStringLiteral HID_LISTWIZARD_FINISH = "EXTENSIONS_HID_LISTWIZARD_FINISH";
-inline constexpr OStringLiteral HID_GRIDWIZARD_PREVIOUS = "EXTENSIONS_HID_GRIDWIZARD_PREVIOUS";
-inline constexpr OStringLiteral HID_GRIDWIZARD_NEXT = "EXTENSIONS_HID_GRIDWIZARD_NEXT";
-inline constexpr OStringLiteral HID_GRIDWIZARD_CANCEL = "EXTENSIONS_HID_GRIDWIZARD_CANCEL";
-inline constexpr OStringLiteral HID_GRIDWIZARD_FINISH = "EXTENSIONS_HID_GRIDWIZARD_FINISH";
+inline constexpr OUStringLiteral HID_GROUPWIZARD_PREVIOUS = u"EXTENSIONS_HID_GROUPWIZARD_PREVIOUS";
+inline constexpr OUStringLiteral HID_GROUPWIZARD_NEXT = u"EXTENSIONS_HID_GROUPWIZARD_NEXT";
+inline constexpr OUStringLiteral HID_GROUPWIZARD_CANCEL = u"EXTENSIONS_HID_GROUPWIZARD_CANCEL";
+inline constexpr OUStringLiteral HID_GROUPWIZARD_FINISH = u"EXTENSIONS_HID_GROUPWIZARD_FINISH";
+inline constexpr OUStringLiteral HID_LISTWIZARD_PREVIOUS = u"EXTENSIONS_HID_LISTWIZARD_PREVIOUS";
+inline constexpr OUStringLiteral HID_LISTWIZARD_NEXT = u"EXTENSIONS_HID_LISTWIZARD_NEXT";
+inline constexpr OUStringLiteral HID_LISTWIZARD_CANCEL = u"EXTENSIONS_HID_LISTWIZARD_CANCEL";
+inline constexpr OUStringLiteral HID_LISTWIZARD_FINISH = u"EXTENSIONS_HID_LISTWIZARD_FINISH";
+inline constexpr OUStringLiteral HID_GRIDWIZARD_PREVIOUS = u"EXTENSIONS_HID_GRIDWIZARD_PREVIOUS";
+inline constexpr OUStringLiteral HID_GRIDWIZARD_NEXT = u"EXTENSIONS_HID_GRIDWIZARD_NEXT";
+inline constexpr OUStringLiteral HID_GRIDWIZARD_CANCEL = u"EXTENSIONS_HID_GRIDWIZARD_CANCEL";
+inline constexpr OUStringLiteral HID_GRIDWIZARD_FINISH = u"EXTENSIONS_HID_GRIDWIZARD_FINISH";
 
 inline constexpr OUStringLiteral HID_PROP_INPUT_REQUIRED = u"EXTENSIONS_HID_PROP_INPUT_REQUIRED";
 inline constexpr OUStringLiteral HID_PROP_CONTROLSOURCE = u"EXTENSIONS_HID_PROP_CONTROLSOURCE";
@@ -293,7 +293,7 @@ inline constexpr OUStringLiteral HID_PROP_IMAGEPOSITION = u"EXTENSIONS_HID_PROP_
 inline constexpr OUStringLiteral HID_PROP_NOLABEL = u"EXTENSIONS_HID_PROP_NOLABEL";
 inline constexpr OUStringLiteral HID_PROP_WRITING_MODE = u"EXTENSIONS_HID_PROP_WRITING_MODE";
 inline constexpr OUStringLiteral HID_PROP_ANCHOR_TYPE = u"EXTENSIONS_HID_PROP_ANCHOR_TYPE";
-inline constexpr OStringLiteral HID_FM_PROPDLG_TABCTR = "EXTENSIONS_HID_FM_PROPDLG_TABCTR";
+inline constexpr OUStringLiteral HID_FM_PROPDLG_TABCTR = u"EXTENSIONS_HID_FM_PROPDLG_TABCTR";
 inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_GENERAL = u"EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL";
 inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_DATA = u"EXTENSIONS_HID_FM_PROPDLG_TAB_DATA";
 inline constexpr OUStringLiteral HID_FM_PROPDLG_TAB_EVT = u"EXTENSIONS_HID_FM_PROPDLG_TAB_EVT";
diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx
index ee36cee27ab1..4ea1f3dded48 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -25,7 +25,7 @@ namespace abp
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::lang;
 
-    AddressBookSourcePage::AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pDialog, const OUString& rUIXMLDescription, const OString& rID)
+    AddressBookSourcePage::AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pDialog, const OUString& rUIXMLDescription, const OUString& rID)
         : AddressBookSourcePage_Base(pPage, pDialog, rUIXMLDescription, rID)
         , m_pDialog(pDialog)
     {
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index 4d78533ad885..407713fab99d 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -37,7 +37,7 @@ namespace abp
         OAddressBookSourcePilot* m_pDialog;
 
     protected:
-        AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pController, const OUString& rUIXMLDescription, const OString& rID);
+        AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pController, const OUString& rUIXMLDescription, const OUString& rID);
 
     protected:
         // helper
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 0a5cba073f0b..1b04a34ceb9b 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -361,7 +361,7 @@ namespace abp
 
     std::unique_ptr<BuilderPage> OAddressBookSourcePilot::createPage(WizardState _nState)
     {
-        OString sIdent(OString::number(_nState));
+        OUString sIdent(OUString::number(_nState));
         weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
 
         std::unique_ptr<vcl::OWizardPage> xRet;
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index 5e633e4dd98a..cba844932134 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -823,7 +823,7 @@ IMPL_LINK(BibGeneralPage, GainFocusHdl, weld::Widget&, rWidget, void)
 }
 
 template<class Target> void BibGeneralPage::AddControlWithError(const OUString& rColumnName, const OUString& rColumnUIName,
-    Target& rWidget, OUString& rErrorString, const OString& rHelpId)
+    Target& rWidget, OUString& rErrorString, const OUString& rHelpId)
 {
     rWidget.set_help_id(rHelpId);
     rWidget.connect_focus_in(LINK(this, BibGeneralPage, GainFocusHdl));
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index b4d981955891..9708174ffa1f 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -127,7 +127,7 @@ class BibGeneralPage : public InterimItemWindow
     bool                        AddXControl(const OUString& rName, weld::ComboBox& rList);
 
     template<class Target> void AddControlWithError(const OUString& rColumnName, const OUString& rColumnUIName,
-        Target& rWidget, OUString& rErrorString, const OString& rHelpId);
+        Target& rWidget, OUString& rErrorString, const OUString& rHelpId);
 
     void SaveChanges();
 
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index ca4971572eac..cee4d5fbb44a 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -424,7 +424,7 @@ sal_uInt16 BibToolBar::InsertFilterItem(const OUString& rMenuEntry)
 
 void BibToolBar::SelectFilterItem(sal_uInt16 nId)
 {
-    OString sId = OString::number(nId);
+    OUString sId = OUString::number(nId);
     xPopupMenu->set_active(sId, true);
     sSelMenuItem = sId;
     aQueryField = MnemonicGenerator::EraseAllMnemonicChars(xPopupMenu->get_label(sId));
@@ -521,7 +521,7 @@ IMPL_LINK_NOARG(BibToolBar, MenuHdl, ToolBox*, void)
 
     tools::Rectangle aRect(GetItemRect(nTBC_BT_AUTOFILTER));
     weld::Window* pParent = weld::GetPopupParent(*this, aRect);
-    OString sId = xPopupMenu->popup_at_rect(pParent, aRect);
+    OUString sId = xPopupMenu->popup_at_rect(pParent, aRect);
 
     if (!sId.isEmpty())
     {
diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx
index 3e97ec6f4702..d4e45b2e0b80 100644
--- a/extensions/source/bibliography/toolbar.hxx
+++ b/extensions/source/bibliography/toolbar.hxx
@@ -150,7 +150,7 @@ class BibToolBar:   public ToolBox
         std::unique_ptr<weld::Builder> xBuilder;
         std::unique_ptr<weld::Menu> xPopupMenu;
         sal_uInt16              nMenuId;
-        OString                 sSelMenuItem;
+        OUString                 sSelMenuItem;
         OUString                aQueryField;
         Link<void*,void>        aLayoutManager;
         sal_Int16               nSymbolsSize;
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 1a86cc70efd6..3aa003196730 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -343,7 +343,7 @@ namespace dbp
         lcl_fillEntries(*m_xTable, aQueryNames, BMP_QUERY, CommandType::QUERY);
     }
 
-    OMaybeListSelectionPage::OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+    OMaybeListSelectionPage::OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID)
         : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID)
         , m_pYes(nullptr)
         , m_pNo(nullptr)
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index 11dc5ceb65d4..66115a14451c 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -65,7 +65,7 @@ namespace dbp
         weld::ComboBox* m_pList;
 
     public:
-        OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID);
+        OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID);
         virtual ~OMaybeListSelectionPage() override;
 
     protected:
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 13fa2980683a..95a3801573df 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -72,7 +72,7 @@ namespace dbp
         OAccessRegulator() { }
     };
 
-    OControlWizardPage::OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+    OControlWizardPage::OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID)
         : OControlWizardPage_Base(pPage, pWizard, rUIXMLDescription, rID)
         , m_pDialog(pWizard)
     {
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index 22e7feca1a5b..12138899f9dd 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -61,7 +61,7 @@ namespace dbp
         css::uno::Reference< css::sdbc::XConnection >
                                         getFormConnection() const;
     public:
-        OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID);
+        OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID);
         virtual ~OControlWizardPage() override;
 
     protected:
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 3cf1d03240b7..c084eda7b364 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -216,7 +216,7 @@ namespace dbp
 
     std::unique_ptr<BuilderPage> OGridWizard::createPage(WizardState _nState)
     {
-        OString sIdent(OString::number(_nState));
+        OUString sIdent(OUString::number(_nState));
         weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
 
         switch (_nState)
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index 774e6cd69d34..dc2c069e9f76 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -60,7 +60,7 @@ namespace dbp
     class OGridPage : public OControlWizardPage
     {
     public:
-        OGridPage(weld::Container* pPage, OGridWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+        OGridPage(weld::Container* pPage, OGridWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID)
             : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID)
         {
         }
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 04f7f68eda3d..3f88e3fc938f 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -60,7 +60,7 @@ namespace dbp
 
     std::unique_ptr<BuilderPage> OGroupBoxWizard::createPage(::vcl::WizardTypes::WizardState _nState)
     {
-        OString sIdent(OString::number(_nState));
+        OUString sIdent(OUString::number(_nState));
         weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
 
         switch (_nState)
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index 18fa12c7ffe5..73950ed36918 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -65,7 +65,7 @@ namespace dbp
     class OGBWPage : public OControlWizardPage
     {
     public:
-        OGBWPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+        OGBWPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID)
             : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID)
     {
     }
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index cccd7136ba64..886e7ff131e2 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -83,7 +83,7 @@ namespace dbp
 
     std::unique_ptr<BuilderPage> OListComboWizard::createPage(WizardState _nState)
     {
-        OString sIdent(OString::number(_nState));
+        OUString sIdent(OUString::number(_nState));
         weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
 
         switch (_nState)
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index 7ab6a8a21d0f..5e61296f89be 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -77,7 +77,7 @@ namespace dbp
     class OLCPage : public OControlWizardPage
     {
     public:
-        OLCPage(weld::Container* pPage, OListComboWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+        OLCPage(weld::Container* pPage, OListComboWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID)
             : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID)
     {
     }
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 53a58966e25d..35314507e853 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -90,7 +90,7 @@ namespace pcr
         }
     }
 
-    void OBrowserLine::SetComponentHelpIds(const OString& rHelpId)
+    void OBrowserLine::SetComponentHelpIds(const OUString& rHelpId)
     {
         if (m_pControlWindow)
             m_pControlWindow->set_help_id(rHelpId);
diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx
index f56370730716..dfde2969f41f 100644
--- a/extensions/source/propctrlr/browserline.hxx
+++ b/extensions/source/propctrlr/browserline.hxx
@@ -84,7 +84,7 @@ namespace pcr
 
         const OUString&     GetEntryName() const { return m_sEntryName; }
 
-        void                SetComponentHelpIds(const OString& rHelpId);
+        void                SetComponentHelpIds(const OUString& rHelpId);
 
         void                SetTitle(const OUString& rString );
         void                FullFillTitleString();
diff --git a/extensions/source/propctrlr/browserpage.hxx b/extensions/source/propctrlr/browserpage.hxx
index 0db6cc3c7522..5f9220a7961f 100644
--- a/extensions/source/propctrlr/browserpage.hxx
+++ b/extensions/source/propctrlr/browserpage.hxx
@@ -37,7 +37,7 @@ namespace pcr
         explicit OBrowserPage(weld::Container* pParent, weld::Container* pContainer);
         ~OBrowserPage();
 
-        void SetHelpId(const OString& rHelpId) { m_xContainer->set_help_id(rHelpId); }
+        void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); }
 
         OBrowserListBox& getListBox() { return *m_xListBox; }
         const OBrowserListBox& getListBox() const { return *m_xListBox; }
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index e7b7cb690d20..3be48abe41a2 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -35,7 +35,7 @@ namespace pcr
         m_xPropBox->setPageActivationHandler(LINK(this, OPropertyBrowserView, OnPageActivation));
     }
 
-    IMPL_LINK(OPropertyBrowserView, OnPageActivation, const OString&, rNewPage, void)
+    IMPL_LINK(OPropertyBrowserView, OnPageActivation, const OUString&, rNewPage, void)
     {
         m_nActivePage = rNewPage.toUInt32();
         m_aPageActivationHandler.Call(nullptr);
diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx
index 7a0711fb145c..d64039813757 100644
--- a/extensions/source/propctrlr/browserview.hxx
+++ b/extensions/source/propctrlr/browserview.hxx
@@ -48,7 +48,7 @@ namespace pcr
         css::awt::Size getMinimumSize() const;
 
     private:
-        DECL_LINK(OnPageActivation, const OString&, void);
+        DECL_LINK(OnPageActivation, const OUString&, void);
     };
 
 } // namespace pcr
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index 2392e51f355e..997986e0f536 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -556,7 +556,7 @@ namespace pcr
         delete pFontList;
     }
 
-    void ControlCharacterDialog::PageCreated(const OString& rId, SfxTabPage& rPage)
+    void ControlCharacterDialog::PageCreated(const OUString& rId, SfxTabPage& rPage)
     {
         SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
         if (rId == "font")
diff --git a/extensions/source/propctrlr/fontdialog.hxx b/extensions/source/propctrlr/fontdialog.hxx
index eaba29db0b9c..a5946719674c 100644
--- a/extensions/source/propctrlr/fontdialog.hxx
+++ b/extensions/source/propctrlr/fontdialog.hxx
@@ -59,7 +59,7 @@ namespace pcr
             std::vector< css::beans::NamedValue >& _out_properties );
 
     protected:
-        virtual void PageCreated(const OString& rId, SfxTabPage& rPage) override;
+        virtual void PageCreated(const OUString& rId, SfxTabPage& rPage) override;
     };
 
 }   // namespace pcr
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index 4151e6827506..08da46ae8ae4 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -34,13 +34,13 @@ namespace pcr
     //= HelpIdUrl
 
 
-    OString HelpIdUrl::getHelpId( std::u16string_view _rHelpURL )
+    OUString HelpIdUrl::getHelpId( std::u16string_view _rHelpURL )
     {
         INetURLObject aHID( _rHelpURL );
         if ( aHID.GetProtocol() == INetProtocol::Hid )
-              return OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 );
+            return aHID.GetURLPath();
         else
-            return OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 );
+            return OUString(_rHelpURL);
     }
 
 
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index f9ec2838cf16..a9705188906a 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -61,7 +61,7 @@ namespace pcr
     class HelpIdUrl
     {
     public:
-        static OString getHelpId( std::u16string_view _rHelpURL );
+        static OUString getHelpId( std::u16string_view _rHelpURL );
         static OUString getHelpURL( std::u16string_view );
     };
 
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index b0516fd90903..01a0395594f5 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -1111,7 +1111,7 @@ namespace pcr
             {
                 weld::Widget* m_pControlWindow = pTunnel->getWidget();
                 if (m_pControlWindow)
-                    m_pControlWindow->set_buildable_name(m_pControlWindow->get_buildable_name() + "-" + _rDescriptor.DisplayName.toUtf8());
+                    m_pControlWindow->set_buildable_name(m_pControlWindow->get_buildable_name() + "-" + _rDescriptor.DisplayName);
             }
 
         }
@@ -1178,7 +1178,7 @@ namespace pcr
                     // this category does not yet exist. This is allowed, as an inspector model might be lazy, and not provide
                     // any category information of its own. In this case, we have a fallback ...
                     m_aPageIds[ aDescriptor.Category ] =
-                        getPropertyBox().AppendPage( aDescriptor.Category, OString() );
+                        getPropertyBox().AppendPage(aDescriptor.Category, {});
                     nTargetPageId = impl_getPageIdForCategory_nothrow( aDescriptor.Category );
                 }
 
diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx
index 45d2fb2bc7ce..1e026c5b5bb4 100644
--- a/extensions/source/propctrlr/propertyeditor.cxx
+++ b/extensions/source/propctrlr/propertyeditor.cxx
@@ -65,7 +65,7 @@ namespace pcr
         int nCount = m_xTabControl->get_n_pages();
         for (int i = nCount - 1; i >= 0; --i)
         {
-            OString sID = m_xTabControl->get_page_ident(i);
+            OUString sID = m_xTabControl->get_page_ident(i);
             m_xTabControl->remove_page(sID);
         }
 
@@ -116,12 +116,12 @@ namespace pcr
         return const_cast<OPropertyEditor*>(this)->getPage(rPageId);
     }
 
-    sal_uInt16 OPropertyEditor::AppendPage(const OUString& rText, const OString& rHelpId)
+    sal_uInt16 OPropertyEditor::AppendPage(const OUString& rText, const OUString& rHelpId)
     {
         // obtain a new id
         sal_uInt16 nId = m_nNextId++;
         // insert the id
-        OString sIdent = OString::number(nId);
+        OUString sIdent = OUString::number(nId);
         m_xTabControl->append_page(sIdent, rText);
 
         // create a new page
@@ -140,7 +140,7 @@ namespace pcr
         return nId;
     }
 
-    void OPropertyEditor::SetHelpId( const OString& rHelpId )
+    void OPropertyEditor::SetHelpId( const OUString& rHelpId )
     {
         m_xTabControl->set_help_id(rHelpId);
     }
@@ -152,13 +152,13 @@ namespace pcr
             return;
 
         m_aShownPages.erase(aPagePos);
-        OString sIdent(OString::number(nID));
+        OUString sIdent(OUString::number(nID));
         m_xTabControl->remove_page(sIdent);
     }
 
     void OPropertyEditor::SetPage(sal_uInt16 nId)
     {
-        m_xTabControl->set_current_page(OString::number(nId));
+        m_xTabControl->set_current_page(OUString::number(nId));
     }
 
     sal_uInt16 OPropertyEditor::GetCurPage() const
@@ -290,7 +290,7 @@ namespace pcr
     {
         assert((m_aHiddenPages.find(nPageId) != m_aHiddenPages.end() ||
                 m_aShownPages.find(nPageId) != m_aShownPages.end()) && "page doesn't exist");
-        OString sIdent(OString::number(nPageId));
+        OUString sIdent(OUString::number(nPageId));
         if (!bShow)
         {
             auto aPagePos = m_aShownPages.find(nPageId);
@@ -347,12 +347,12 @@ namespace pcr
         return xControl;
     }
 
-    IMPL_LINK(OPropertyEditor, OnPageActivate, const OString&, rNewPage, void)
+    IMPL_LINK(OPropertyEditor, OnPageActivate, const OUString&, rNewPage, void)
     {
         m_aPageActivationHandler.Call(rNewPage);
     }
 
-    IMPL_LINK(OPropertyEditor, OnPageDeactivate, const OString&, rIdent, bool)
+    IMPL_LINK(OPropertyEditor, OnPageDeactivate, const OUString&, rIdent, bool)
     {
         // commit the data on the current (to-be-deactivated) tab page
         // (79404)
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index fa0e3a0cd3ab..96199b31af4c 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -57,7 +57,7 @@ namespace pcr
         IPropertyLineListener*      m_pListener;
         IPropertyControlObserver*   m_pObserver;
         sal_uInt16                  m_nNextId;
-        Link<const OString&,void>   m_aPageActivationHandler;
+        Link<const OUString&,void>   m_aPageActivationHandler;
         bool                        m_bHasHelpSection;
 
         MapStringToPageId           m_aPropertyPageIds;
@@ -75,8 +75,8 @@ namespace pcr
         bool                        HasHelpSection() const { return m_bHasHelpSection; }
         void                        SetHelpText( const OUString& _rHelpText );
 
-        void                        SetHelpId( const OString& sHelpId );
-        sal_uInt16                  AppendPage( const OUString& r, const OString& _rHelpId );
+        void                        SetHelpId( const OUString& sHelpId );
+        sal_uInt16                  AppendPage( const OUString& r, const OUString& _rHelpId );
         void                        SetPage( sal_uInt16 );
         void                        RemovePage(sal_uInt16 nID);
         sal_uInt16                  GetCurPage() const;
@@ -95,7 +95,7 @@ namespace pcr
         void                        RemoveEntry( const OUString& _rName );
         void                        ChangeEntry( const OLineDescriptor& );
 
-        void                        setPageActivationHandler(const Link<const OString&,void>& _rHdl) { m_aPageActivationHandler = _rHdl; }
+        void                        setPageActivationHandler(const Link<const OUString&,void>& _rHdl) { m_aPageActivationHandler = _rHdl; }
 
         Size                        get_preferred_size() const;
 
@@ -122,8 +122,8 @@ namespace pcr
         void    enableHelpSection( OBrowserPage& _rPage, const void* );
         static void setHelpSectionText( OBrowserPage& _rPage, const void* _pPointerToOUString );
 
-        DECL_LINK(OnPageDeactivate, const OString&, bool);
-        DECL_LINK(OnPageActivate, const OString&, void);
+        DECL_LINK(OnPageDeactivate, const OUString&, bool);
+        DECL_LINK(OnPageActivate, const OUString&, void);
     };