diff options
| author | Eike Rathke <erack@redhat.com> | 2021-10-12 13:59:34 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2021-10-12 16:18:50 +0200 |
| commit | 7cad3ed2042a17081b56fb2c4a4f4f0b785590f9 (patch) | |
| tree | 9be841dd9099fe846c4804996dd2bbefbc843430 /sc/source | |
| parent | 9498ec72394dd2a87bde10a181587036cab7b388 (diff) | |
Construct ScAddress::Details only once
... instead of 4 times with the implicit conversion ctor.
Change-Id: Ib5df0c278d5a3c7fedf9ddf1d7a52ad01fd67dea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123451
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'sc/source')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 7296eb15a5cd..1747639c611a 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -2378,7 +2378,7 @@ static ScNameInputType lcl_GetInputType( const OUString& rText ) ScViewData& rViewData = pViewSh->GetViewData(); ScDocument& rDoc = rViewData.GetDocument(); SCTAB nTab = rViewData.GetTabNo(); - formula::FormulaGrammar::AddressConvention eConv = rDoc.GetAddressConvention(); + ScAddress::Details aDetails( rDoc.GetAddressConvention()); // test in same order as in SID_CURRENTCELL execute @@ -2395,16 +2395,16 @@ static ScNameInputType lcl_GetInputType( const OUString& rText ) if (rText == ScResId(STR_MANAGE_NAMES)) eRet = SC_MANAGE_NAMES; - else if ( aRange.Parse( rText, rDoc, eConv ) & ScRefFlags::VALID ) + else if ( aRange.Parse( rText, rDoc, aDetails ) & ScRefFlags::VALID ) eRet = SC_NAME_INPUT_RANGE; - else if ( aAddress.Parse( rText, rDoc, eConv ) & ScRefFlags::VALID ) + else if ( aAddress.Parse( rText, rDoc, aDetails ) & ScRefFlags::VALID ) eRet = SC_NAME_INPUT_CELL; - else if ( ScRangeUtil::MakeRangeFromName( rText, rDoc, nTab, aRange, eNameScope, eConv ) ) + else if ( ScRangeUtil::MakeRangeFromName( rText, rDoc, nTab, aRange, eNameScope, aDetails ) ) { eRet = ((eNameScope == RUTL_NAMES_LOCAL) ? SC_NAME_INPUT_NAMEDRANGE_LOCAL : SC_NAME_INPUT_NAMEDRANGE_GLOBAL); } - else if ( ScRangeUtil::MakeRangeFromName( rText, rDoc, nTab, aRange, RUTL_DBASE, eConv ) ) + else if ( ScRangeUtil::MakeRangeFromName( rText, rDoc, nTab, aRange, RUTL_DBASE, aDetails ) ) eRet = SC_NAME_INPUT_DATABASE; else if ( comphelper::string::isdigitAsciiString( rText ) && ( nNumeric = rText.toInt32() ) > 0 && nNumeric <= rDoc.MaxRow()+1 ) |