diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:54:16 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-05-14 08:54:16 +0000 |
| commit | d9c576358639c7b4e49096ad3598505fe0fcc0de (patch) | |
| tree | f416248c8c8a00ac669dee6991ec5aae84c8759d /sc | |
| parent | d5b555b4b147ebfb8bfa2c513f7e6e159f97c0ac (diff) | |
INTEGRATION: CWS koheiformula01 (1.55.12); FILE MERGED
2008/04/23 15:07:23 kohei 1.55.12.2: RESYNC: (1.55-1.57); FILE MERGED
2008/03/20 23:19:57 kohei 1.55.12.1: Use the current address convention everywhere instead of always using the OOo convention.
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/app/inputwin.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 2e8a81adff44..0fa656a199d8 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: inputwin.cxx,v $ - * $Revision: 1.57 $ + * $Revision: 1.58 $ * * This file is part of OpenOffice.org. * @@ -1544,6 +1544,7 @@ ScNameInputType lcl_GetInputType( const String& rText ) ScViewData* pViewData = pViewSh->GetViewData(); ScDocument* pDoc = pViewData->GetDocument(); SCTAB nTab = pViewData->GetTabNo(); + ScAddress::Convention eConv = pDoc->GetAddressConvention(); // test in same order as in SID_CURRENTCELL execute @@ -1553,13 +1554,13 @@ ScNameInputType lcl_GetInputType( const String& rText ) SCTAB nNameTab; sal_Int32 nNumeric; - if ( aRange.Parse( rText, pDoc ) & SCA_VALID ) + if ( aRange.Parse( rText, pDoc, eConv ) & SCA_VALID ) eRet = SC_NAME_INPUT_NAMEDRANGE; - else if ( aAddress.Parse( rText, pDoc ) & SCA_VALID ) + else if ( aAddress.Parse( rText, pDoc, eConv ) & SCA_VALID ) eRet = SC_NAME_INPUT_CELL; - else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_NAMES ) ) + else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_NAMES, eConv ) ) eRet = SC_NAME_INPUT_NAMEDRANGE; - else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_DBASE ) ) + else if ( aRangeUtil.MakeRangeFromName( rText, pDoc, nTab, aRange, RUTL_DBASE, eConv ) ) eRet = SC_NAME_INPUT_DATABASE; else if ( ByteString( rText, RTL_TEXTENCODING_ASCII_US ).IsNumericAscii() && ( nNumeric = rText.ToInt32() ) > 0 && nNumeric <= MAXROW+1 ) |