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>

46 files changed, 67 insertions, 67 deletions

diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 668ddfd673f8..a649420a8c00 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -553,7 +553,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA
 {
     OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed.");
 
-    OString sHelpId;
+    OUString sHelpId;
     switch( _eType )
     {
         case E_FORM:
@@ -670,7 +670,7 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine
     }
 }
 
-std::unique_ptr<DBTreeViewBase> OAppDetailPageHelper::createSimpleTree(const OString& rHelpId, ElementType eType)
+std::unique_ptr<DBTreeViewBase> OAppDetailPageHelper::createSimpleTree(const OUString& rHelpId, ElementType eType)
 {
     const bool bSQLType = eType == E_TABLE || eType == E_QUERY;
     std::unique_ptr<DBTreeViewBase> xTreeView(new DBTreeView(m_xBox.get(), bSQLType));
@@ -1079,7 +1079,7 @@ namespace
             if (!rEvent.IsEnabled)
             {
                 const OUString &rURL = rEvent.FeatureURL.Complete;
-                m_rMBPreview.remove_item(rURL.toUtf8());
+                m_rMBPreview.remove_item(rURL);
             }
         }
 
@@ -1152,13 +1152,13 @@ IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, weld::Toggleable&, voi
         xComponent->dispose();
 }
 
-IMPL_LINK(OAppDetailPageHelper, MenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(OAppDetailPageHelper, MenuSelectHdl, const OUString&, rIdent, void)
 {
     if (rIdent.isEmpty())
         return;
 
     css::util::URL aURL;
-    aURL.Complete = OUString::fromUtf8(rIdent);
+    aURL.Complete = rIdent;
 
     Reference<XDispatchProvider> xProvider(getBorderWin().getView()->getAppController().getFrame(), UNO_QUERY);
     Reference<XDispatch> xDisp = xProvider->queryDispatch(aURL, "_self", 0);
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index 25cc3229a2d4..fb47cb70c558 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -144,7 +144,7 @@ namespace dbaui
             @return
                 The new tree.
         */
-        std::unique_ptr<DBTreeViewBase> createSimpleTree(const OString& rHelpId, ElementType eType);
+        std::unique_ptr<DBTreeViewBase> createSimpleTree(const OUString& rHelpId, ElementType eType);
 
         DECL_LINK( OnEntryDoubleClick,    weld::TreeView&, bool );
         DECL_LINK( OnEntrySelChange,      LinkParamNone*, void );
@@ -154,7 +154,7 @@ namespace dbaui
         DECL_LINK( OnDeleteEntry,         LinkParamNone*, void );
 
         DECL_LINK(OnDropdownClickHdl, weld::Toggleable&, void);
-        DECL_LINK(MenuSelectHdl, const OString&, void);
+        DECL_LINK(MenuSelectHdl, const OUString&, void);
 
         OAppBorderWindow& getBorderWin() const { return m_rBorderWin; }
 
diff --git a/dbaccess/source/ui/app/ChildWindow.cxx b/dbaccess/source/ui/app/ChildWindow.cxx
index a8091c8637a5..2f27ccb30b46 100644
--- a/dbaccess/source/ui/app/ChildWindow.cxx
+++ b/dbaccess/source/ui/app/ChildWindow.cxx
@@ -13,7 +13,7 @@
 namespace dbaui
 {
 OChildWindow::OChildWindow(weld::Container* pParent, const OUString& rUIXMLDescription,
-                           const OString& rID)
+                           const OUString& rID)
     : m_xBuilder(Application::CreateBuilder(pParent, rUIXMLDescription))
     , m_xContainer(m_xBuilder->weld_container(rID))
 {
diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx
index 99ee5c30eb73..bec17b409519 100644
--- a/dbaccess/source/ui/browser/sbagrid.cxx
+++ b/dbaccess/source/ui/browser/sbagrid.cxx
@@ -593,7 +593,7 @@ void SbaGridHeader::PreExecuteColumnContextMenu(sal_uInt16 nColId, weld::Menu& r
     rMenu.insert_separator(nPos++, "separator2");
 }
 
-void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult)
+void SbaGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OUString& rExecutionResult)
 {
     if (rExecutionResult == "colwidth")
         static_cast<SbaGridControl*>(GetParent())->SetColWidth(nColId);
@@ -790,7 +790,7 @@ void SbaGridControl::SetBrowserAttrs()
     }
 }
 
-void SbaGridControl::PostExecuteRowContextMenu(const OString& rExecutionResult)
+void SbaGridControl::PostExecuteRowContextMenu(const OUString& rExecutionResult)
 {
     if (rExecutionResult == "tableattr")
         SetBrowserAttrs();
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 1416b43fc2ed..f341482ea92f 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -585,7 +585,7 @@ void OFieldDescControl::ActivateAggregate( EControlType eType )
     }
 }
 
-void OFieldDescControl::InitializeControl(OPropListBoxCtrl* _pControl,const OString& _sHelpId,bool _bAddChangeHandler)
+void OFieldDescControl::InitializeControl(OPropListBoxCtrl* _pControl,const OUString& _sHelpId,bool _bAddChangeHandler)
 {
     if ( _bAddChangeHandler )
         _pControl->GetComboBox().connect_changed(LINK(this,OFieldDescControl,ChangeHdl));
@@ -593,7 +593,7 @@ void OFieldDescControl::InitializeControl(OPropListBoxCtrl* _pControl,const OStr
     InitializeControl(_pControl->GetWidget(), _sHelpId);
 }
 
-void OFieldDescControl::InitializeControl(weld::Widget* pControl,const OString& _sHelpId)
+void OFieldDescControl::InitializeControl(weld::Widget* pControl,const OUString& _sHelpId)
 {
     pControl->set_help_id(_sHelpId);
     pControl->connect_focus_in(LINK(this, OFieldDescControl, OnControlFocusGot));
@@ -606,7 +606,7 @@ void OFieldDescControl::InitializeControl(weld::Widget* pControl,const OString&
     }
 }
 
-std::unique_ptr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(const OString& rId, TranslateId pHelpId, short _nProperty, const OString& _sHelpId)
+std::unique_ptr<OPropNumericEditCtrl> OFieldDescControl::CreateNumericControl(const OUString& rId, TranslateId pHelpId, short _nProperty, const OUString& _sHelpId)
 {
     auto xControl = std::make_unique<OPropNumericEditCtrl>(
             m_xBuilder->weld_spin_button(rId), pHelpId, _nProperty);
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index d033aebf7e1a..d6e3b3d87f44 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -285,7 +285,7 @@ namespace dbaui
     void ORelationControl::InitController( CellControllerRef& /*rController*/, sal_Int32 nRow, sal_uInt16 nColumnId )
     {
 
-        OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL );
+        OUString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL );
 
         Reference< XPropertySet> xDef;
         switch ( getColumnIdent(nColumnId) )
diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx
index 86bb65c7b6cb..5997e5b80e17 100644
--- a/dbaccess/source/ui/control/sqledit.cxx
+++ b/dbaccess/source/ui/control/sqledit.cxx
@@ -403,7 +403,7 @@ bool SQLEditView::Command(const CommandEvent& rCEvt)
         xContextMenu->set_visible("undo", false);
         xContextMenu->set_visible("specialchar", vcl::GetGetSpecialCharsFunction() != nullptr);
 
-        OString sCommand = xContextMenu->popup_at_rect(pPopupParent, aRect);
+        OUString sCommand = xContextMenu->popup_at_rect(pPopupParent, aRect);
 
         if (sCommand == "cut")
             pEditView->Cut();
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 0a7364fe60b4..81922a88beec 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -72,7 +72,7 @@ namespace dbaui
     using namespace ::dbtools;
     using namespace ::svt;
 
-    OConnectionHelper::OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs)
+    OConnectionHelper::OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs)
         : OGenericAdministrationPage(pPage, pController, _rUIXMLDescription, _rId, _rCoreAttrs)
         , m_bUserGrabFocus(false)
         , m_pCollection(nullptr)
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index b4c00548f682..bbcf24783355 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -38,7 +38,7 @@ namespace dbaui
         bool            m_bUserGrabFocus;
 
     public:
-        OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs);
+        OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs);
         virtual ~OConnectionHelper() override;
 
         OUString     m_eType;          // the type can't be changed in this class, so we hold it as member.
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index 7ff32140e933..e867ba266688 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -128,7 +128,7 @@ namespace dbaui
             case  ::dbaccess::DST_MYSQL_ODBC:
             case  ::dbaccess::DST_ODBC:
                 m_xFT_Connection->set_label(DBA_RES(STR_NAME_OF_ODBC_DATASOURCE));
-                m_xConnectionURL->set_help_id( eType ==  ::dbaccess::DST_MYSQL_ODBC ? OString(HID_DSADMIN_MYSQL_ODBC_DATASOURCE) : OString(HID_DSADMIN_ODBC_DATASOURCE));
+                m_xConnectionURL->set_help_id( eType ==  ::dbaccess::DST_MYSQL_ODBC ? OUString(HID_DSADMIN_MYSQL_ODBC_DATASOURCE) : OUString(HID_DSADMIN_ODBC_DATASOURCE));
                 break;
             case  ::dbaccess::DST_LDAP:
                 m_xFT_Connection->set_label(DBA_RES(STR_HOSTNAME));
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 8f57c24f99eb..33ea535a1dd8 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -61,7 +61,7 @@ namespace dbaui
         return std::make_unique<OConnectionTabPageSetup>(pPage, pController, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, TranslateId(), TranslateId(), STR_COMMONURL);
     }
 
-    OConnectionTabPageSetup::OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId)
+    OConnectionTabPageSetup::OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId)
         : OConnectionHelper(pPage, pController, _rUIXMLDescription, _rId, _rCoreAttrs)
         , m_xHelpText(m_xBuilder->weld_label("helptext"))
         , m_xHeaderText(m_xBuilder->weld_label("header"))
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index 0039a7160a6e..27b8eab284ae 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -39,7 +39,7 @@ namespace dbaui
         DECL_LINK(OnEditModified, weld::Entry&, void);
 
     public:
-        OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId);
+        OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OUString& _rId, const SfxItemSet& _rCoreAttrs, TranslateId pHelpTextResId, TranslateId pHeaderResId, TranslateId pUrlResId);
         virtual ~OConnectionTabPageSetup() override;
 
         static std::unique_ptr<OGenericAdministrationPage> CreateDbaseTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index d7396dc4970f..da6ec80c2763 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -131,7 +131,7 @@ OUserAdmin::OUserAdmin(weld::Container* pPage, weld::DialogController* pControll
     m_xUSER->connect_changed(LINK(this, OUserAdmin, ListDblClickHdl));
 }
 
-IMPL_LINK(OUserAdmin, MenuSelectHdl, const OString&, rIdent, void)
+IMPL_LINK(OUserAdmin, MenuSelectHdl, const OUString&, rIdent, void)
 {
     try
     {
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 045d8c39806f..76460a8468e7 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -46,7 +46,7 @@ class OUserAdmin final : public OGenericAdministrationPage
 
     // methods
     DECL_LINK(ListDblClickHdl, weld::ComboBox&, void);
-    DECL_LINK(MenuSelectHdl, const OString&, void);
+    DECL_LINK(MenuSelectHdl, const OUString&, void);
 
     void        FillUserNames();
 
diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
index e623f9945424..b4cf62f3be22 100644
--- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx
+++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx
@@ -108,7 +108,7 @@ namespace dbaui
             m_pImpl->saveChanges(*GetOutputItemSet());
         return nRet;
     }
-    void OUserAdminDlg::PageCreated(const OString& rId, SfxTabPage& _rPage)
+    void OUserAdminDlg::PageCreated(const OUString& rId, SfxTabPage& _rPage)
     {
         // register ourself as modified listener
         static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( m_pImpl->getORB() );
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 5f0eedbb0496..def0e05fcc87 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -48,7 +48,7 @@ namespace dbaui
     {
     }
 
-    OGenericAdministrationPage::OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet)
+    OGenericAdministrationPage::OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rId, const SfxItemSet& rAttrSet)
         : SfxTabPage(pPage, pController, rUIXMLDescription, rId, &rAttrSet)
         , m_abEnableRoadmap(false)
         , m_pAdminDialog(nullptr)
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index de8265751992..63d4a1cbadab 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -94,7 +94,7 @@ namespace dbaui
         css::uno::Reference< css::uno::XComponentContext >
                                    m_xORB;
     public:
-        OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet);
+        OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rId, const SfxItemSet& rAttrSet);
         /// set a handler which gets called every time something on the page has been modified
         void SetModifiedHandler(const Link<OGenericAdministrationPage const *, void>& _rHandler) { m_aModifiedHandler = _rHandler; }
 
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 1cf713ce3d23..0770970d1b7e 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -46,7 +46,7 @@ namespace dbaui
     struct BooleanSettingDesc
     {
         std::unique_ptr<weld::CheckButton>& xControl; // the dialog's control which displays this setting
-        OString     sControlId;         // the widget name of the control in the .ui
+        OUString    sControlId;         // the widget name of the control in the .ui
         sal_uInt16  nItemId;            // the ID of the item (in an SfxItemSet) which corresponds to this setting
         bool        bInvertedDisplay;   // true if and only if the checkbox is checked when the item is sal_False, and vice versa
         bool        bOptionalBool;      // type is OptionalBool
@@ -410,7 +410,7 @@ namespace dbaui
         return nRet;
     }
 
-    void AdvancedSettingsDialog::PageCreated(const OString& rId, SfxTabPage& _rPage)
+    void AdvancedSettingsDialog::PageCreated(const OUString& rId, SfxTabPage& _rPage)
     {
         // register ourself as modified listener
         static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() );
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 3f8ddcfa3996..a8a1ce1e51bd 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -71,7 +71,7 @@ short ODbAdminDialog::Ok()
         // TODO : AR_ERROR is not handled correctly, we always close the dialog here
 }
 
-void ODbAdminDialog::PageCreated(const OString& rId, SfxTabPage& _rPage)
+void ODbAdminDialog::PageCreated(const OUString& rId, SfxTabPage& _rPage)
 {
     // register ourself as modified listener
     static_cast<OGenericAdministrationPage&>(_rPage).SetServiceFactory( getORB() );
@@ -80,7 +80,7 @@ void ODbAdminDialog::PageCreated(const OString& rId, SfxTabPage& _rPage)
     SfxTabDialogController::PageCreated(rId, _rPage);
 }
 
-void ODbAdminDialog::addDetailPage(const OString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc)
+void ODbAdminDialog::addDetailPage(const OUString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc)
 {
     AddTabPage(rPageId, DBA_RES(pTextId), pCreateFunc);
 }
@@ -142,7 +142,7 @@ void ODbAdminDialog::impl_selectDataSource(const css::uno::Any& _aDataSourceName
         case  ::dbaccess::DST_USERDEFINE10:
             {
                 OUString aTitle(DBA_RES(STR_PAGETITLE_ADVANCED));
-                AddTabPage("user" + OString::number(eType - dbaccess::DST_USERDEFINE1 + 1), aTitle, ODriversSettings::CreateUser);
+                AddTabPage("user" + OUString::number(eType - dbaccess::DST_USERDEFINE1 + 1), aTitle, ODriversSettings::CreateUser);
             }
             break;
         default:
@@ -183,7 +183,7 @@ void ODbAdminDialog::impl_resetPages(const Reference< XPropertySet >& _rxDatasou
     ::dbaccess::ODsnTypeCollection* pCollection = pCollectionItem->getCollection();
     if ( pCollection->determineType(getDatasourceType( *m_xExampleSet )) == ::dbaccess::DST_MYSQL_NATIVE )
     {
-        OString sMySqlNative("mysqlnative");
+        OUString sMySqlNative("mysqlnative");
         AddTabPage(sMySqlNative, DBA_RES(STR_PAGETITLE_CONNECTION), ODriversSettings::CreateMySQLNATIVE);
         RemoveTabPage("advanced");
         m_sMainPageID = sMySqlNative;
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index fa06535022e0..8d1f737c52c5 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -218,7 +218,7 @@ std::unique_ptr<BuilderPage> ODbTypeWizDialog::createPage(WizardState _nState)
     TranslateId pStringId = STR_PAGETITLE_ADVANCED;
     std::unique_ptr<BuilderPage> xPage;
 
-    OString sIdent(OString::number(_nState));
+    OUString sIdent(OUString::number(_nState));
     weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
 
     switch(_nState)
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index d3d4c1dbde16..8bee3588952e 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -460,7 +460,7 @@ std::unique_ptr<BuilderPage> ODbTypeWizDialogSetup::createPage(WizardState _nSta
 {
     std::unique_ptr<OGenericAdministrationPage> xPage;
 
-    OString sIdent(OString::number(_nState));
+    OUString sIdent(OUString::number(_nState));
     weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
 
     switch(_nState)
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 8a06d7de1c18..57ae3bd59fd7 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -52,7 +52,7 @@ namespace dbaui
     using namespace ::dbtools;
 
     OCommonBehaviourTabPage::OCommonBehaviourTabPage(weld::Container* pPage, weld::DialogController* pController,
-        const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rCoreAttrs,
+        const OUString& rUIXMLDescription, const OUString& rId, const SfxItemSet& rCoreAttrs,
         OCommonBehaviourTabPageFlags nControlFlags)
         : OGenericAdministrationPage(pPage, pController, rUIXMLDescription, rId, rCoreAttrs)
         , m_nControlFlags(nControlFlags)
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index cd570594afdb..3ebfcff1ef26 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -57,7 +57,7 @@ namespace dbaui
     public:
         virtual bool        FillItemSet (SfxItemSet* _rCoreAttrs) override;
 
-        OCommonBehaviourTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& _rCoreAttrs, OCommonBehaviourTabPageFlags nControlFlags);
+        OCommonBehaviourTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OUString& rId, const SfxItemSet& _rCoreAttrs, OCommonBehaviourTabPageFlags nControlFlags);
     protected:
 
         virtual ~OCommonBehaviourTabPage() override;
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 1df2acc20a77..24a1c4e81c2d 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -47,7 +47,7 @@ SbaSbAttrDlg::~SbaSbAttrDlg()
 {
 }
 
-void SbaSbAttrDlg::PageCreated(const OString& rPageId, SfxTabPage& rTabPage)
+void SbaSbAttrDlg::PageCreated(const OUString& rPageId, SfxTabPage& rTabPage)
 {
     SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
     if (rPageId == "format")
diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx
index 544d9577fdd9..be9e96612a83 100644
--- a/dbaccess/source/ui/dlg/dlgsize.cxx
+++ b/dbaccess/source/ui/dlg/dlgsize.cxx
@@ -27,7 +27,7 @@ namespace dbaui
 
 DlgSize::DlgSize(weld::Window* pParent, sal_Int32 nVal, bool bRow, sal_Int32 _nAlternativeStandard )
     : GenericDialogController(pParent, bRow ? OUString("dbaccess/ui/rowheightdialog.ui") : OUString("dbaccess/ui/colwidthdialog.ui"),
-                              bRow ? OString("RowHeightDialog") : OString("ColWidthDialog"))
+                              bRow ? OUString("RowHeightDialog") : OUString("ColWidthDialog"))
     , m_nPrevValue(nVal)
     , m_xMF_VALUE(m_xBuilder->weld_metric_spin_button("value", FieldUnit::CM))
     , m_xCB_STANDARD(m_xBuilder->weld_check_button("automatic"))
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index 4c93128482d5..d12602ce2eec 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -409,7 +409,7 @@ namespace dbaui
         updateToolbox();
     }
 
-    IMPL_LINK(DbaIndexDialog, OnIndexAction, const OString&, rClicked, void)
+    IMPL_LINK(DbaIndexDialog, OnIndexAction, const OUString&, rClicked, void)
     {
         if (rClicked == "ID_INDEX_NEW")
             OnNewIndex();
diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx
index 81fa5100d0ef..b54bc8280839 100644
--- a/dbaccess/source/ui/dlg/sqlmessage.cxx
+++ b/dbaccess/source/ui/dlg/sqlmessage.cxx
@@ -482,7 +482,7 @@ void OSQLMessageBox::impl_createStandardButtons( MessBoxStyle _nStyle )
     else
         aTmp = m_sHelpURL;
 
-    m_xDialog->set_help_id(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8));
+    m_xDialog->set_help_id(aTmp);
 }
 
 void OSQLMessageBox::impl_addDetailsButton()
diff --git a/dbaccess/source/ui/inc/ChildWindow.hxx b/dbaccess/source/ui/inc/ChildWindow.hxx
index 8da6c8570dea..c2f68ac46f78 100644
--- a/dbaccess/source/ui/inc/ChildWindow.hxx
+++ b/dbaccess/source/ui/inc/ChildWindow.hxx
@@ -16,7 +16,7 @@ namespace dbaui
 class OChildWindow
 {
 protected:
-    OChildWindow(weld::Container* pParent, const OUString& rUIXMLDescription, const OString& rID);
+    OChildWindow(weld::Container* pParent, const OUString& rUIXMLDescription, const OUString& rID);
     std::unique_ptr<weld::Builder> m_xBuilder;
     std::unique_ptr<weld::Container> m_xContainer;
 
@@ -29,7 +29,7 @@ public:
 
     void Enable(bool bEnable) { m_xContainer->set_sensitive(bEnable); }
 
-    void SetHelpId(const OString& rHelpId) { m_xContainer->set_help_id(rHelpId); }
+    void SetHelpId(const OUString& rHelpId) { m_xContainer->set_help_id(rHelpId); }
 
     void Show() { m_xContainer->show(); }
 };
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 478a41070f73..410e086116fe 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -117,9 +117,9 @@ namespace dbaui
         void                UpdateFormatSample(OFieldDescription const * pFieldDescr);
 
         bool                isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const;
-        std::unique_ptr<OPropNumericEditCtrl> CreateNumericControl(const OString& rId, TranslateId pHelpId, short _nProperty, const OString& _sHelpId);
-        void                InitializeControl(weld::Widget* _pControl,const OString& _sHelpId);
-        void                InitializeControl(OPropListBoxCtrl* _pControl,const OString& _sHelpId,bool _bAddChangeHandler);
+        std::unique_ptr<OPropNumericEditCtrl> CreateNumericControl(const OUString& rId, TranslateId pHelpId, short _nProperty, const OUString& _sHelpId);
+        void                InitializeControl(weld::Widget* _pControl,const OUString& _sHelpId);
+        void                InitializeControl(OPropListBoxCtrl* _pControl,const OUString& _sHelpId,bool _bAddChangeHandler);
 
         bool                IsFocusInEditableWidget() const;
 
@@ -165,7 +165,7 @@ namespace dbaui
         void                SetReadOnly( bool bReadOnly );
 
         void                Enable(bool bEnable) { m_xContainer->set_sensitive(bEnable); }
-        void                SetHelpId(const OString& rId) { m_xContainer->set_help_id(rId); }
+        void                SetHelpId(const OUString& rId) { m_xContainer->set_help_id(rId); }
 
         virtual bool        isCutAllowed() override;
         virtual bool        isCopyAllowed() override;
diff --git a/dbaccess/source/ui/inc/UserAdminDlg.hxx b/dbaccess/source/ui/inc/UserAdminDlg.hxx
index 941eab5faed3..95edbe5f5527 100644
--- a/dbaccess/source/ui/inc/UserAdminDlg.hxx
+++ b/dbaccess/source/ui/inc/UserAdminDlg.hxx
@@ -47,7 +47,7 @@ namespace dbaui
         css::uno::Reference< css::sdbc::XConnection>          m_xConnection;
         bool          m_bOwnConnection;
     protected:
-        virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
+        virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override;
     public:
         OUserAdminDlg(weld::Window* pParent, SfxItemSet* pItems,
                       const css::uno::Reference< css::uno::XComponentContext >& rxORB,
diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx
index cc7564cbae59..ef3d7f23b20c 100644
--- a/dbaccess/source/ui/inc/WTabPage.hxx
+++ b/dbaccess/source/ui/inc/WTabPage.hxx
@@ -31,7 +31,7 @@ namespace dbaui
         OCopyTableWizard*       m_pParent;
         bool                    m_bFirstTime;   // Page is called the first time; should be set in the reset method
 
-        OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID);
+        OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID);
 
     public:
         virtual ~OWizardPage() override;
diff --git a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
index b28fe5ce3857..7c38562145a5 100644
--- a/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
+++ b/dbaccess/source/ui/inc/advancedsettingsdlg.hxx
@@ -37,7 +37,7 @@ namespace dbaui
         std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 
     protected:
-        virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
+        virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override;
         virtual short Ok() override;
 
     public:
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index a99c2c3affe3..6042f761ce2f 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -43,7 +43,7 @@ public:
 public:
     bool get_visible() const { return m_xEntry->get_visible(); }
     void connect_changed(const Link<weld::Entry&, void>& rLink) { m_xEntry->connect_changed(rLink); }
-    void set_help_id(const OString& rName) { m_xEntry->set_help_id(rName); }
+    void set_help_id(const OUString& rName) { m_xEntry->set_help_id(rName); }
     void hide()
     {
         m_xEntry->hide();
diff --git a/dbaccess/source/ui/inc/dbadmin.hxx b/dbaccess/source/ui/inc/dbadmin.hxx
index 8caf3c129102..53222a6afca2 100644
--- a/dbaccess/source/ui/inc/dbadmin.hxx
+++ b/dbaccess/source/ui/inc/dbadmin.hxx
@@ -49,7 +49,7 @@ class ODbAdminDialog final : public SfxTabDialogController, public IItemSetHelpe
 private:
     std::unique_ptr<ODbDataSourceAdministrationHelper>  m_pImpl;
 
-    OString             m_sMainPageID;
+    OUString             m_sMainPageID;
 
 public:
     /** ctor. The itemset given should have been created by <method>createItemSet</method> and should be destroyed
@@ -89,9 +89,9 @@ public:
 
 private:
     // adds a new detail page and remove all the old ones
-    void addDetailPage(const OString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc);
+    void addDetailPage(const OUString& rPageId, TranslateId pTextId, CreateTabPage pCreateFunc);
 
-    virtual void PageCreated(const OString& rId, SfxTabPage& _rPage) override;
+    virtual void PageCreated(const OUString& rId, SfxTabPage& _rPage) override;
     virtual short Ok() override;
 
     /// select a datasource with a given name, adjust the item set accordingly, and everything like that ..
diff --git a/dbaccess/source/ui/inc/dlgattr.hxx b/dbaccess/source/ui/inc/dlgattr.hxx
index 6c3a00f95472..83fe0466e4f8 100644
--- a/dbaccess/source/ui/inc/dlgattr.hxx
+++ b/dbaccess/source/ui/inc/dlgattr.hxx
@@ -34,7 +34,7 @@ namespace dbaui
         SbaSbAttrDlg(weld::Widget* pParent, const SfxItemSet*, SvNumberFormatter*, bool bHasFormat);
         virtual ~SbaSbAttrDlg() override;
 
-        virtual void  PageCreated(const OString& rPageId, SfxTabPage& rTabPage) override;
+        virtual void  PageCreated(const OUString& rPageId, SfxTabPage& rTabPage) override;
     };
 }   // namespace dbaui
 
diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx
index f03b04f6f0b8..b3ba37936e79 100644
--- a/dbaccess/source/ui/inc/indexdialog.hxx
+++ b/dbaccess/source/ui/inc/indexdialog.hxx
@@ -74,7 +74,7 @@ namespace dbaui
         void IndexSelected();
 
         DECL_LINK( OnIndexSelected, weld::TreeView&, void );
-        DECL_LINK( OnIndexAction, const OString&, void );
+        DECL_LINK( OnIndexAction, const OUString&, void );
         DECL_LINK( OnEntryEditing, const weld::TreeIter&, bool );
         DECL_LINK( OnEntryEdited, const IterString&, bool );
         DECL_LINK( OnModifiedClick, weld::Toggleable&, void );
diff --git a/dbaccess/source/ui/inc/sbagrid.hxx b/dbaccess/source/ui/inc/sbagrid.hxx
index 4c0f37654647..ae96bb291bbb 100644
--- a/dbaccess/source/ui/inc/sbagrid.hxx
+++ b/dbaccess/source/ui/inc/sbagrid.hxx
@@ -163,7 +163,7 @@ namespace dbaui
         virtual void    PreExecuteColumnContextMenu(sal_uInt16 nColId, weld::Menu& rMenu,
                                                     weld::Menu& rInsertMenu, weld::Menu& rChangeMenu,
                                                     weld::Menu& rShowMenu) override;
-        virtual void    PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OString& rExecutionResult) override;
+        virtual void    PostExecuteColumnContextMenu(sal_uInt16 nColId, const weld::Menu& rMenu, const OUString& rExecutionResult) override;
 
     private:
         // DragSourceHelper overridables
@@ -254,7 +254,7 @@ namespace dbaui
 
         // DbGridControl overridables
         virtual void PreExecuteRowContextMenu(weld::Menu& rMenu) override;
-        virtual void PostExecuteRowContextMenu(const OString& rExecutionResult) override;
+        virtual void PostExecuteRowContextMenu(const OUString& rExecutionResult) override;
 
         // DbGridControl overridables
         virtual void onRowChange() override;
diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx
index ad6cb25b4d63..481732985d12 100644
--- a/dbaccess/source/ui/inc/sqlmessage.hxx
+++ b/dbaccess/source/ui/inc/sqlmessage.hxx
@@ -106,7 +106,7 @@ public:
                 const ::dbtools::SQLExceptionInfo* _pAdditionalErrorInfo = nullptr );
 
     void set_title(const OUString& rTitle) { m_xDialog->set_title(rTitle); }
-    void add_button(const OUString& rText, int nResponse, const OString& rHelpId = OString()) { m_xDialog->add_button(rText, nResponse, rHelpId); }
+    void add_button(const OUString& rText, int nResponse, const OUString& rHelpId = {}) { m_xDialog->add_button(rText, nResponse, rHelpId); }
     void set_default_response(int nResponse) { m_xDialog->set_default_response(nResponse); }
 
     virtual ~OSQLMessageBox() override;
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 8937cfb2d78d..3ad6d58a3149 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -36,7 +36,7 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper
 
 OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITLE); }
 
-OWizardPage::OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+OWizardPage::OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OUString& rID)
     : ::vcl::OWizardPage(pPage, pWizard, rUIXMLDescription, rID)
     , m_pParent(pWizard)
     , m_bFirstTime(true)
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index 4d8e73141a5c..590b3f9adce5 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -578,7 +578,7 @@ OCopyTableWizard::OCopyTableWizard(weld::Window* pParent, const OUString& _rDefa
 
 weld::Container* OCopyTableWizard::CreatePageContainer()
 {
-    OString sIdent(OString::number(m_nPageCount));
+    OUString sIdent(OUString::number(m_nPageCount));
     weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
     return pPageContainer;
 }
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 830a30bac02c..f5b4ee4baafc 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -389,7 +389,7 @@ IMPL_LINK(OWizTypeSelectList, CommandHdl, const CommandEvent&, rCEvt, bool)
     if (bCheckOk)
         xContextMenu->set_active("primarykey", true);
 
-    OString sCommand(xContextMenu->popup_at_rect(m_xControl.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
+    OUString sCommand(xContextMenu->popup_at_rect(m_xControl.get(), tools::Rectangle(rCEvt.GetMousePosPixel(), Size(1,1))));
     if (sCommand != "primarykey")
         return true;
 
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index e816dfa9e585..1be2fd39d9b7 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1122,7 +1122,7 @@ void OJoinTableView::executePopup(const Point& rPos, VclPtr<OTableConnection>& r
     weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect);
     std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/joinviewmenu.ui"));
     std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu"));
-    OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
+    OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
     if (sIdent == "delete")
         RemoveConnection(rSelConnection, true);
     else if (sIdent == "edit")
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
index 2ab69afb13c0..f053d4b43dd1 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx
@@ -1953,7 +1953,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
                     weld::Window* pPopupParent = weld::GetPopupParent(*this, aRect);
                     std::unique_ptr<weld::Builder> xBuilder(Application::CreateBuilder(pPopupParent, "dbaccess/ui/querycolmenu.ui"));
                     std::unique_ptr<weld::Menu> xContextMenu(xBuilder->weld_menu("menu"));
-                    OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
+                    OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
                     if (sIdent == "delete")
                        RemoveField(nColId);
                     else if (sIdent == "width")
@@ -1973,7 +1973,7 @@ void OSelectionBrowseBox::Command(const CommandEvent& rEvt)
                     xContextMenu->set_active("alias", m_bVisibleRow[BROW_COLUMNALIAS_ROW]);
                     xContextMenu->set_active("distinct", static_cast<OQueryController&>(getDesignView()->getController()).isDistinct());
 
-                    OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
+                    OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
                     if (sIdent == "functions")
                     {
                         SetRowVisible(BROW_FUNCTION_ROW, !IsRowVisible(BROW_FUNCTION_ROW));
@@ -2536,7 +2536,7 @@ void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window
     _pControl->EnableInput(bEnable);
 }
 
-void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OString& _sHelpId)
+void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OUString& _sHelpId)
 {
     weld::Entry& rEntry = m_pTextCell->get_widget();
     rEntry.set_text(_sText);
diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
index 761870fb8180..3bddd9a9c996 100644
--- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
+++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx
@@ -227,7 +227,7 @@ namespace dbaui
         void            appendUndoAction(const OUString& _rOldValue,std::u16string_view _rNewValue,sal_Int32 _nRow);
         OTableFields&   getFields() const;
         static void     enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl);
-        void            setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OString& _sHelpId);
+        void            setTextCellContext(const OTableFieldDescRef& _rEntry,const OUString& _sText,const OUString& _sHelpId);
         void            invalidateUndoRedo();
         OTableFieldDescRef getEntry(OTableFields::size_type _nPos);
 
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index db33d26fcd81..241efe597ef4 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1424,7 +1424,7 @@ void OTableEditorCtrl::Command(const CommandEvent& rEvt)
                     // All actions which change the number of rows must be run asynchronously
                     // otherwise there may be problems between the Context menu and the Browser
                     m_nDataPos = GetCurRow();
-                    OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
+                    OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
                     if (sIdent == "cut")
                         cut();
                     else if (sIdent == "copy")
diff --git a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
index 1526682eddd7..18e24c3d5e12 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignControl.cxx
@@ -116,7 +116,7 @@ void OTableRowView::Command(const CommandEvent& rEvt)
                 sal_Int32 nSelectRowCount = GetSelectRowCount();
                 xContextMenu->set_sensitive("cut", nSelectRowCount != 0);
                 xContextMenu->set_sensitive("copy", nSelectRowCount  != 0);
-                OString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
+                OUString sIdent = xContextMenu->popup_at_rect(pPopupParent, aRect);
                 if (sIdent == "cut")
                     cut();
                 else if (sIdent == "copy")