diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 12:43:20 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-13 15:20:58 +0200 |
commit | 3697b87b70c69e17e1d0398e0192a11dab179fe3 (patch) | |
tree | a498cce1f1351e6f92385aa9245c66c0724b6430 /reportdesign | |
parent | 9bc95521aaa35b533894b3934519acdbd7a47815 (diff) |
use more OUString::operator== in forms..sal
Change-Id: I70d7e50f8c1e019524ccad915f0cca912c5035dc
Reviewed-on: https://gerrit.libreoffice.org/39899
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'reportdesign')
-rw-r--r-- | reportdesign/source/core/sdr/RptObject.cxx | 2 | ||||
-rw-r--r-- | reportdesign/source/ui/inspection/GeometryHandler.cxx | 10 | ||||
-rw-r--r-- | reportdesign/source/ui/report/ReportController.cxx | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/reportdesign/source/core/sdr/RptObject.cxx b/reportdesign/source/core/sdr/RptObject.cxx index be3651aba776..d82f4a457851 100644 --- a/reportdesign/source/core/sdr/RptObject.cxx +++ b/reportdesign/source/core/sdr/RptObject.cxx @@ -819,7 +819,7 @@ void OUnoObject::_propertyChange( const beans::PropertyChangeEvent& evt ) OUString aNewName; evt.NewValue >>= aNewName; - if ( !aNewName.equals(aOldName) ) + if ( aNewName != aOldName ) { // set old name property OObjectBase::EndListening(); diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index 73a162b74f0e..c865a1293f8b 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -922,7 +922,7 @@ beans::Property GeometryHandler::getProperty(const OUString & PropertyName) const beans::Property* pEnd = pIter + aProps.getLength(); const beans::Property* pFind = ::std::find_if(pIter, pEnd, [&PropertyName] (const beans::Property& x) -> bool { - return x.Name.equals(PropertyName); + return x.Name == PropertyName; }); if ( pFind == pEnd ) return beans::Property(); @@ -1336,13 +1336,11 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie const uno::Sequence< beans::Property> aSeq = xInfo->getProperties(); for (const auto & rIncludeProp : pIncludeProperties) { - const beans::Property* pIter = aSeq.getConstArray(); - const beans::Property* pEnd = pIter + aSeq.getLength(); - const beans::Property* pFind = ::std::find_if(pIter, pEnd, + const beans::Property* pFind = ::std::find_if(aSeq.begin(), aSeq.end(), [&rIncludeProp] (const beans::Property& x) -> bool { - return x.Name.equals(rIncludeProp); + return x.Name == rIncludeProp; }); - if ( pFind != pEnd ) + if ( pFind != aSeq.end() ) { // special case for controls which contain a data field if ( PROPERTY_DATAFIELD == rIncludeProp ) diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 07ad27198690..d23550f9de16 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -3941,7 +3941,7 @@ void OReportController::createDefaultControl(const uno::Sequence< beans::Propert const beans::PropertyValue* pEnd = pIter + _aArgs.getLength(); const beans::PropertyValue* pKeyModifier = ::std::find_if(pIter, pEnd, [&sKeyModifier] (const beans::PropertyValue& x) -> bool { - return x.Name.equals(sKeyModifier); + return x.Name == sKeyModifier; }); sal_Int16 nKeyModifier = 0; if ( pKeyModifier == pEnd || ((pKeyModifier->Value >>= nKeyModifier) && nKeyModifier == KEY_MOD1) ) @@ -4040,7 +4040,7 @@ sal_Bool SAL_CALL OReportController::supportsMode( const OUString& aMode ) const OUString* pEnd = pIter + aModes.getLength(); for(;pIter != pEnd;++pIter) { - if ( pIter->equals(aMode ) ) + if ( *pIter == aMode ) break; } return pIter != pEnd; |