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>

5 files changed, 7 insertions, 7 deletions

diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx
index 764cdba9d8f5..225cef3c7be0 100644
--- a/formula/source/ui/dlg/FormulaHelper.cxx
+++ b/formula/source/ui/dlg/FormulaHelper.cxx
@@ -44,7 +44,7 @@ namespace formula
             virtual void fillVisibleArgumentMapping(::std::vector<sal_uInt16>& ) const override {}
             virtual void initArgumentInfo()  const override {}
             virtual OUString getSignature() const override { return OUString(); }
-            virtual OString getHelpId() const override { return ""; }
+            virtual OUString getHelpId() const override { return ""; }
             virtual bool isHidden() const override { return false; }
             virtual sal_uInt32 getParameterCount() const override { return 0; }
             virtual sal_uInt32 getVarArgsStart() const override { return 0; }
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 2e4ffaf512dc..65301ac0450c 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -141,9 +141,9 @@ public:
     const OUString          m_aTitle2;
     FormulaHelper           m_aFormulaHelper;
 
-    OString                 m_aEditHelpId;
+    OUString                m_aEditHelpId;
 
-    OString                 m_aOldHelp;
+    OUString                 m_aOldHelp;
     bool                    m_bMakingTree;  // in method of constructing tree
 
     bool                    m_bEditFlag;
@@ -869,7 +869,7 @@ void FormulaDlg_Impl::FillControls( bool &rbNext, bool &rbPrev)
             m_xFtEditName->set_label( m_pFuncDesc->getFunctionName() );
             m_xFtEditName->show();
             m_xParaWinBox->show();
-            const OString aHelpId = m_pFuncDesc->getHelpId();
+            const OUString aHelpId = m_pFuncDesc->getHelpId();
             if ( !aHelpId.isEmpty() )
                 m_xMEdit->set_help_id(aHelpId);
         }
diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx
index d90bf9ca951b..3013b84c06b6 100644
--- a/formula/source/ui/dlg/funcpage.cxx
+++ b/formula/source/ui/dlg/funcpage.cxx
@@ -194,7 +194,7 @@ IMPL_LINK_NOARG(FuncPage, SelTreeViewHdl, weld::TreeView&, void)
     const IFunctionDescription* pDesc = GetFuncDesc(GetFunction());
     if (pDesc)
     {
-        const OString sHelpId = pDesc->getHelpId();
+        const OUString sHelpId = pDesc->getHelpId();
         if (!sHelpId.isEmpty())
             m_xLbFunction->set_help_id(sHelpId);
     }
diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx
index 6254dfc8a6a7..1e91b610ec0d 100644
--- a/formula/source/ui/dlg/funcpage.hxx
+++ b/formula/source/ui/dlg/funcpage.hxx
@@ -46,7 +46,7 @@ private:
     const IFunctionManager*  m_pFunctionManager;
 
     ::std::vector< TFunctionDesc >  aLRUList;
-    OString    m_aHelpId;
+    OUString    m_aHelpId;
 
     void impl_addFunctions(const IFunctionCategory* _pCategory);
 
diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx
index 1eaba4d1982f..f09c0e51ec01 100644
--- a/formula/source/ui/dlg/parawin.cxx
+++ b/formula/source/ui/dlg/parawin.cxx
@@ -322,7 +322,7 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc)
         pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping);
         m_xSlider->set_vpolicy(VclPolicyType::NEVER);
         m_xSlider->set_size_request(-1, -1);
-        OString sHelpId = pFuncDesc->getHelpId();
+        OUString sHelpId = pFuncDesc->getHelpId();
         m_xContainer->set_help_id(sHelpId);
         m_xEdArg1->GetWidget()->set_help_id(sHelpId);
         m_xEdArg2->GetWidget()->set_help_id(sHelpId);