remove unnecessary use of OUString::getStr

Change-Id: I3d13e1c0bb6aa4a7aacc463198747c1368ebc9b4
Reviewed-on: https://gerrit.libreoffice.org/38114
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

6 files changed, 14 insertions, 16 deletions

diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index af29b8667527..1711206e1036 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -172,7 +172,7 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView const * pView,
     if (xSet.is())
     {
         if (::comphelper::hasProperty(FM_PROP_HELPTEXT, xSet))
-            aHelpText = ::comphelper::getString(xSet->getPropertyValue(FM_PROP_HELPTEXT)).getStr();
+            aHelpText = ::comphelper::getString(xSet->getPropertyValue(FM_PROP_HELPTEXT));
 
         if (aHelpText.isEmpty() && ::comphelper::hasProperty(FM_PROP_TARGET_URL, xSet))
         {
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index be74781a1508..a9117cc06822 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -411,7 +411,7 @@ namespace
                     if (nTokens)
                         aListener = aListener.getToken(nTokens - 1, '.');
 
-                    if (aListener == pCurrent->ListenerType.getStr())
+                    if (aListener == pCurrent->ListenerType)
                         // the current ScriptEventDescriptor doesn't match the current listeners class
                         continue;
 
@@ -1513,8 +1513,8 @@ void FmXFormShell::ExecuteSearch()
                 Reference< XTextComponent> xText(xActiveControl, UNO_QUERY);
                 if (xText.is())
                 {
-                    strActiveField = getLabelName(xProperties).getStr();
-                    strInitialText = xText->getText().getStr();
+                    strActiveField = getLabelName(xProperties);
+                    strInitialText = xText->getText();
                 }
             }
         }
@@ -1537,7 +1537,7 @@ void FmXFormShell::ExecuteSearch()
                 if(xColumns.is())
                     xColumns->getByIndex(nModelCol) >>= xCurrentCol;
                 if (xCurrentCol.is())
-                    strActiveField = ::comphelper::getString(xCurrentCol->getPropertyValue(FM_PROP_LABEL)).getStr();
+                    strActiveField = ::comphelper::getString(xCurrentCol->getPropertyValue(FM_PROP_LABEL));
 
                 // the text fo the current column
                 Reference< XIndexAccess> xColControls(xGridPeer, UNO_QUERY);
@@ -1545,7 +1545,7 @@ void FmXFormShell::ExecuteSearch()
                 xColControls->getByIndex(nViewCol) >>= xCurControl;
                 OUString sInitialText;
                 if (IsSearchableControl(xCurControl, &sInitialText))
-                    strInitialText = sInitialText.getStr();
+                    strInitialText = sInitialText;
             }
         }
     }
@@ -2417,10 +2417,10 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextIn
                         // the cursor has a field matching the control source ?
                         if (xValidFormFields->hasByName(aName))
                         {
-                            strFieldList = strFieldList + OUString(aName.getStr()) + ";";
+                            strFieldList = strFieldList + aName + ";";
 
                             sFieldDisplayNames = sFieldDisplayNames +
-                                    OUString(::comphelper::getString(xCurrentColModel->getPropertyValue(FM_PROP_LABEL)).getStr()) +
+                                    ::comphelper::getString(xCurrentColModel->getPropertyValue(FM_PROP_LABEL)) +
                                     ";";
 
                             rfmscContextInfo.arrFields.push_back(xCurrentColumn);
@@ -2447,11 +2447,11 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext&, rfmscContextIn
                     if (IsSearchableControl(xControl))
                     {
                         // all tests passed -> take along in the list
-                        strFieldList = strFieldList + OUString(sControlSource.getStr()) + ";";
+                        strFieldList = strFieldList + sControlSource + ";";
 
                         // the label which should appear for the control :
                         sFieldDisplayNames = sFieldDisplayNames +
-                                OUString(getLabelName(Reference< XPropertySet>(xControlModel, UNO_QUERY)).getStr()) +
+                                getLabelName(Reference< XPropertySet>(xControlModel, UNO_QUERY)) +
                                 ";";
 
                         // mark the SdrObject (accelerates the treatment in OnFoundData)
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 0db270f0660a..eb05a3676639 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -724,11 +724,10 @@ void FmSearchEngine::Init(const OUString& sVisibleFields)
 
 
         OUString sCurrentField;
-        OUString sVis(sVisibleFields.getStr());
         sal_Int32 nIndex = 0;
         do
         {
-            sCurrentField = sVis.getToken(0, ';' , nIndex);
+            sCurrentField = sVisibleFields.getToken(0, ';' , nIndex);
 
             // search in the field collection
             sal_Int32 nFoundIndex = -1;
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 8793ca58dde4..3a25f3d57f2a 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -1432,8 +1432,7 @@ namespace svxform
             aNewName = aBaseName;
             if( i>0 )
             {
-                aNewName += " ";
-                aNewName += OUString::number(i).getStr();
+                aNewName += " " + OUString::number(i);
             }
 
             if( GetNavModel()->FindData(aNewName, pFormParentData,false) == nullptr )
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index e983f2e5234f..26e6c0ce790c 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -358,7 +358,7 @@ void FmFieldWin::UpdateContent(const css::uno::Reference< css::form::XForm > & x
         m_pChangeListener->addProperty(FM_PROP_COMMANDTYPE);
 
         // set title
-        aTitle = aTitle + " " + aPrefix + " " + OUString(m_aObjectName.getStr());
+        aTitle += " " + aPrefix + " " + m_aObjectName;
         SetText( aTitle );
     }
     catch( const Exception& )
diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx
index 18a33e734f0f..513a3b9673ac 100644
--- a/svx/source/items/hlnkitem.cxx
+++ b/svx/source/items/hlnkitem.cxx
@@ -165,7 +165,7 @@ bool SvxHyperlinkItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId
         case MID_HLINK_URL:
             if(!(rVal >>= aStr))
                 return false;
-            sURL = aStr.getStr();
+            sURL = aStr;
         break;
         case MID_HLINK_TARGET:
             if(!(rVal >>= aStr))