View | Details | Raw Unified | Return to issue 124293
Collapse All | Expand All

(-)a/main/sc/source/core/tool/rangeutl.cxx (-1 / +9 lines)
Lines 286-292 sal_Bool ScRangeUtil::MakeRangeFromName ( Link Here
286
		ScRangeName& rRangeNames = *(pDoc->GetRangeName());
286
		ScRangeName& rRangeNames = *(pDoc->GetRangeName());
287
		sal_uInt16		 nAt		 = 0;
287
		sal_uInt16		 nAt		 = 0;
288
288
289
		if ( rRangeNames.SearchName( rName, nAt ) )
289
        OUString sName (rName);
290
        const sal_Int32 nSeparatorIndex (sName.indexOf('_'));
291
        SCTAB nSheet (MAXTABCOUNT);
292
        if (nSeparatorIndex >= 0)
293
        {
294
            nSheet = static_cast<SCTAB>(sName.copy(nSeparatorIndex+1).toInt32());
295
            sName = sName.copy(0, nSeparatorIndex);
296
        }
297
		if ( rRangeNames.SearchName( sName, nAt, nSheet ) )
290
		{
298
		{
291
			ScRangeData* pData = rRangeNames[nAt];
299
			ScRangeData* pData = rRangeNames[nAt];
292
			String		 aStrArea;
300
			String		 aStrArea;
(-)a/main/sc/source/ui/app/inputwin.cxx (-1 / +9 lines)
Lines 1500-1506 void ScPosWnd::FillRangeNames() Link Here
1500
					ICCQsortNameCompare );
1500
					ICCQsortNameCompare );
1501
#endif
1501
#endif
1502
				for ( j=0; j<nValidCount; j++ )
1502
				for ( j=0; j<nValidCount; j++ )
1503
					InsertEntry( ppSortArray[j]->GetName() );
1503
                {
1504
                    const SCTAB nSheet (ppSortArray[j]->GetRangeScope());
1505
                    if (nSheet == MAXTABCOUNT)
1506
                        InsertEntry( ppSortArray[j]->GetName());
1507
                    else
1508
                        InsertEntry( ppSortArray[j]->GetName()
1509
                            + rtl::OUString::createFromAscii("_")
1510
                            + rtl::OUString::valueOf(static_cast<sal_Int32>(nSheet)));
1511
                }
1504
				delete [] ppSortArray;
1512
				delete [] ppSortArray;
1505
			}
1513
			}
1506
		}
1514
		}

Return to issue 124293