diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-04 11:14:11 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-05-05 12:57:00 +0200 |
| commit | 9f1701d01d9f664828356976d8592492f85b30f5 (patch) | |
| tree | a91eaef0674591af87b06096fdd186283559a8de /oox | |
| parent | b8bb44161aeb6e00526a38343b63e678ce7d4a1a (diff) | |
use more o3tl::getToken
found by inspecting call sites of OUString::getToken
Change-Id: I4269c7476c7aa46fac39528227e350568f0eb34a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132644
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/ole/axcontrol.cxx | 8 | ||||
| -rw-r--r-- | oox/source/vml/vmlshape.cxx | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/oox/source/ole/axcontrol.cxx b/oox/source/ole/axcontrol.cxx index d2ec8b9b95ef..a3573b395204 100644 --- a/oox/source/ole/axcontrol.cxx +++ b/oox/source/ole/axcontrol.cxx @@ -2586,13 +2586,13 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm ) { for (;;) { - OUString sLine( data.getToken( 0, '\n', nLineIdx ) ); + std::u16string_view sLine( o3tl::getToken(data, 0, '\n', nLineIdx ) ); if (nLineIdx<0) break; // skip last line - if ( !sLine.isEmpty() ) + if ( !sLine.empty() ) { - OUString displayValue = sLine.getToken( 1, '>' ); + OUString displayValue( o3tl::getToken(sLine, 1, '>' ) ); if ( displayValue.getLength() ) { // Really we should be using a proper html parser @@ -2602,7 +2602,7 @@ HtmlSelectModel::importBinaryModel( BinaryInputStream& rInStrm ) displayValue = displayValue.replaceAll( """, "\"" ); displayValue = displayValue.replaceAll( "&", "&" ); listValues.push_back( displayValue ); - if( sLine.indexOf( "OPTION SELECTED" ) != -1 ) + if( sLine.find( u"OPTION SELECTED" ) != std::u16string_view::npos ) selectedIndices.push_back( static_cast< sal_Int16 >( listValues.size() ) - 1 ); } } diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index ecc23746d7ed..31fbbade4256 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -881,12 +881,12 @@ Reference< XShape > SimpleShape::implConvertAndInsert( const Reference< XShapes sal_Int32 nIndex = 0; do { - OUString aToken = maTypeModel.maAdjustments.getToken(0, ',', nIndex); + std::u16string_view aToken = o3tl::getToken(maTypeModel.maAdjustments, 0, ',', nIndex); drawing::EnhancedCustomShapeAdjustmentValue aAdjustmentValue; - if (aToken.isEmpty()) + if (aToken.empty()) aAdjustmentValue.State = css::beans::PropertyState::PropertyState_DEFAULT_VALUE; else - aAdjustmentValue.Value <<= aToken.toInt32(); + aAdjustmentValue.Value <<= o3tl::toInt32(aToken); aAdjustmentValues.push_back(aAdjustmentValue); } while (nIndex >= 0); |