diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-06 13:10:19 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-07-06 20:23:09 +0200 |
| commit | 8c77b5670ec0ee6d550d5adba51b8ae76fe2c162 (patch) | |
| tree | 9a905004341f2fae7bee3b45bd8826d95f801353 /extensions/source | |
| parent | 1dea7fb6be5f1ba64f680e3ad885afa1c99030bf (diff) | |
use OString::operator== in preference to ::equals
Change-Id: Ib291521963a791a9c6175964571e9d9895072acf
Reviewed-on: https://gerrit.libreoffice.org/39646
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/scanner/sane.cxx | 4 | ||||
| -rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/scanner/sane.cxx b/extensions/source/scanner/sane.cxx index a790375485b9..7ed2a978c42c 100644 --- a/extensions/source/scanner/sane.cxx +++ b/extensions/source/scanner/sane.cxx @@ -296,7 +296,7 @@ bool Sane::Open( const char* name ) OString aDevice( name ); for( int i = 0; i < nDevices; i++ ) { - if( aDevice.equals( ppDevices[i]->name ) ) + if( aDevice == ppDevices[i]->name ) { mnDevice = i; break; @@ -335,7 +335,7 @@ int Sane::GetOptionByName( const char* rName ) OString aOption( rName ); for( i = 0; i < mnOptions; i++ ) { - if( mppOptions[i]->name && aOption.equals( mppOptions[i]->name ) ) + if( mppOptions[i]->name && aOption == mppOptions[i]->name ) return i; } return -1; diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 3813f58eea5e..48c9dc6e52f0 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -1320,7 +1320,7 @@ bool SaneDlg::LoadState() aConfig.SetGroup( "SANE" ); OString aString = aConfig.ReadKey( "SO_LastSaneDevice" ); - for( i = 0; i < Sane::CountDevices() && !aString.equals(OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding())); i++ ) ; + for( i = 0; i < Sane::CountDevices() && aString != OUStringToOString(Sane::GetName(i), osl_getThreadTextEncoding()); i++ ) ; if( i == Sane::CountDevices() ) return false; |