[Libreoffice-commits] core.git: sc/source

[Eike Rathke (via logerrit)]

 sc/source/ui/app/inputwin.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 7cad3ed2042a17081b56fb2c4a4f4f0b785590f9
Author:     Eike Rathke <er...@redhat.com>
AuthorDate: Tue Oct 12 13:59:34 2021 +0200
Commit:     Eike Rathke <er...@redhat.com>
CommitDate: Tue Oct 12 16:18:50 2021 +0200

    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 <er...@redhat.com>
    Tested-by: Jenkins

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 )