diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2019-02-10 18:10:40 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2019-02-16 13:14:26 +0100 |
| commit | 097d76b110be2595e1c0bbd3fde171ae849bb361 (patch) | |
| tree | 0b6e56225fe094f21d5877df0d100091a50e07bc /sc | |
| parent | 16d2876b61520a765a111d7c38d60b143e669a37 (diff) | |
Simplify name validation in ScVbaNames::Add
Change-Id: Idd73659fdd76a1efd9ceb9fdc221622367d4922c
Reviewed-on: https://gerrit.libreoffice.org/67652
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/vba/vbanames.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sc/source/ui/vba/vbanames.cxx b/sc/source/ui/vba/vbanames.cxx index 1ad4f824ec3c..4f2f774b1172 100644 --- a/sc/source/ui/vba/vbanames.cxx +++ b/sc/source/ui/vba/vbanames.cxx @@ -105,13 +105,9 @@ ScVbaNames::Add( const css::uno::Any& Name , { if ( ScRangeData::IsNameValid( sName , getScDocument() ) != ScRangeData::NAME_VALID ) { - sal_Int32 nIndex = 0; - OUString sResult = sName.getToken( 0 , '!' , nIndex ); - if ( -1 == nIndex ) - sResult = sName; - else - sResult = sName.copy( nIndex ); - sName = sResult ; + const sal_Int32 nIndex{ sName.indexOf('!') }; + if (nIndex>=0) + sName = sName.copy(nIndex+1); if ( ScRangeData::IsNameValid( sName , getScDocument() ) != ScRangeData::NAME_VALID ) throw uno::RuntimeException( "This Name is not valid ." ); } |