diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-10 20:17:54 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-04-11 14:45:38 +0200 |
| commit | 85c2ed8dc790689ce69ff0a08ff5a4de98df54b7 (patch) | |
| tree | f7d7f6fce51d1a4443608971da7d9c42b1201fa3 /sfx2/source/appl | |
| parent | 117688bd3f51a7a50b2620aa7dcc0c065f29d402 (diff) | |
loplugin:stringview add check for getToken().toInt32
where we can convert that to
o3tl::toInt32(o3tl::getToken(
and avoid the heap allocation of a temporary string
Change-Id: Ib11c19c6e6cdc0de3e551affd3578d181e292de4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132810
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2/source/appl')
| -rw-r--r-- | sfx2/source/appl/childwin.cxx | 14 | ||||
| -rw-r--r-- | sfx2/source/appl/newhelp.cxx | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 097ab1a5aee7..5cc448b2ccc3 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -106,16 +106,16 @@ class DisposeListener : public ::cppu::WeakImplHelper< css::lang::XEventListener } -bool GetPosSizeFromString( const OUString& rStr, Point& rPos, Size& rSize ) +bool GetPosSizeFromString( std::u16string_view rStr, Point& rPos, Size& rSize ) { if ( comphelper::string::getTokenCount(rStr, '/') != 4 ) return false; sal_Int32 nIdx = 0; - rPos.setX( rStr.getToken(0, '/', nIdx).toInt32() ); - rPos.setY( rStr.getToken(0, '/', nIdx).toInt32() ); - rSize.setWidth( rStr.getToken(0, '/', nIdx).toInt32() ); - rSize.setHeight( rStr.getToken(0, '/', nIdx).toInt32() ); + rPos.setX( o3tl::toInt32(o3tl::getToken(rStr, 0, '/', nIdx)) ); + rPos.setY( o3tl::toInt32(o3tl::getToken(rStr, 0, '/', nIdx)) ); + rSize.setWidth( o3tl::toInt32(o3tl::getToken(rStr, 0, '/', nIdx)) ); + rSize.setHeight( o3tl::toInt32(o3tl::getToken(rStr, 0, '/', nIdx)) ); // negative sizes are invalid return rSize.Width() >= 0 && rSize.Height() >= 0; @@ -133,8 +133,8 @@ bool GetSplitSizeFromString( const OUString& rStr, Size& rSize ) return false; sal_Int32 nIdx{ 0 }; - rSize.setWidth( aStr.getToken(0, ';', nIdx ).toInt32() ); - rSize.setHeight( aStr.getToken(0, ';', nIdx ).toInt32() ); + rSize.setWidth( o3tl::toInt32(o3tl::getToken(aStr, 0, ';', nIdx )) ); + rSize.setHeight( o3tl::toInt32(o3tl::getToken(aStr, 0, ';', nIdx )) ); // negative sizes are invalid return rSize.Width() >= 0 && rSize.Height() >= 0; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index e175b7458726..58818c3a248d 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -933,9 +933,9 @@ SearchTabPage_Impl::SearchTabPage_Impl(weld::Widget* pParent, SfxHelpIndexWindow if ( aUserItem >>= aUserData ) { sal_Int32 nIdx {0}; - bool bChecked = aUserData.getToken(0, ';', nIdx).toInt32() == 1; + bool bChecked = o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx)) == 1; m_xFullWordsCB->set_active(bChecked); - bChecked = aUserData.getToken(0, ';', nIdx).toInt32() == 1; + bChecked = o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx)) == 1; m_xScopeCB->set_active(bChecked); while ( nIdx > 0 ) @@ -2257,13 +2257,13 @@ void SfxHelpWindow_Impl::LoadConfig() { DBG_ASSERT( comphelper::string::getTokenCount(aUserData, ';') == 6, "invalid user data" ); sal_Int32 nIdx = 0; - nIndexSize = aUserData.getToken( 0, ';', nIdx ).toInt32(); + nIndexSize = o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx )); aUserData.getToken(0, ';', nIdx); // ignore nTextSize - sal_Int32 nOldWidth = aUserData.getToken( 0, ';', nIdx ).toInt32(); - sal_Int32 nOldHeight = aUserData.getToken( 0, ';', nIdx ).toInt32(); + sal_Int32 nOldWidth = o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx )); + sal_Int32 nOldHeight = o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx )); aWinSize = Size(nOldWidth, nOldHeight); - aWinPos.setX( aUserData.getToken( 0, ';', nIdx ).toInt32() ); - aWinPos.setY( aUserData.getToken( 0, ';', nIdx ).toInt32() ); + aWinPos.setX( o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx )) ); + aWinPos.setY( o3tl::toInt32(o3tl::getToken(aUserData, 0, ';', nIdx )) ); } pTextWin->ToggleIndex( bIndex ); |