From 9881bea8d41997fb46579eb5f0314300159c96cc Mon Sep 17 00:00:00 2001
From: Noel Grandin <noelgrandin@gmail.com>
Date: Sun, 28 May 2017 19:41:52 +0200
Subject: 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>
---
 extensions/source/dbpilots/gridwizard.cxx         | 2 +-
 extensions/source/propctrlr/eventhandler.cxx      | 6 +-----
 extensions/source/propctrlr/pcrcommon.cxx         | 2 +-
 extensions/source/propctrlr/selectlabeldialog.cxx | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

(limited to 'extensions')

diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index efb95571eed2..94880bd20a2f 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -214,7 +214,7 @@ namespace dbp
                 {
                     SAL_WARN( "extensions.dbpilots", "OGridWizard::implApplySettings: "
                               "unexpected exception while creating the grid column for field " <<
-                              pFormFieldName->getStr() << "!" );
+                              *pFormFieldName );
                 }
             }
         }
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index fe01b84ba6aa..35fb2a3ae551 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -216,11 +216,7 @@ namespace pcr
 
         OUString lcl_getEventPropertyName( const OUString& _rListenerClassName, const OUString& _rMethodName )
         {
-            OUStringBuffer aPropertyName;
-            aPropertyName.append( _rListenerClassName );
-            aPropertyName.append( ';' );
-            aPropertyName.append( _rMethodName.getStr() );
-            return aPropertyName.makeStringAndClear();
+            return _rListenerClassName + OUStringLiteral1(';') + _rMethodName;
         }
 
         ScriptEventDescriptor lcl_getAssignedScriptEvent( const EventDescription& _rEvent, const std::vector< ScriptEventDescriptor >& _rAllAssignedMacros )
diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx
index 6dbfae996320..cc47c64515fa 100644
--- a/extensions/source/propctrlr/pcrcommon.cxx
+++ b/extensions/source/propctrlr/pcrcommon.cxx
@@ -53,7 +53,7 @@ namespace pcr
         INetURLObject aHID( aTmp );
         if ( aHID.GetProtocol() == INetProtocol::NotValid )
             aBuffer.append( INET_HID_SCHEME );
-        aBuffer.append( aTmp.getStr() );
+        aBuffer.append( aTmp );
         return aBuffer.makeStringAndClear();
     }
 
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index f38ce6c48777..a2ef815cdfff 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -187,7 +187,7 @@ namespace pcr
             if (!::comphelper::hasProperty(PROPERTY_NAME, xAsSet))
                 // we need at least a name for displaying ...
                 continue;
-            sName = ::comphelper::getString(xAsSet->getPropertyValue(PROPERTY_NAME)).getStr();
+            sName = ::comphelper::getString(xAsSet->getPropertyValue(PROPERTY_NAME));
 
             // we need to check if the control model supports the required service
             Reference< XServiceInfo >  xInfo(xAsSet, UNO_QUERY);
-- 
cgit