diff options
| author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-05 03:01:22 -0500 |
|---|---|---|
| committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-05 15:21:08 -0500 |
| commit | 7b8504627a7392dc430a5a98a298ae440c0d0e29 (patch) | |
| tree | a0b93f14726746206d41549d103c466da8ac0bbb | |
| parent | 4af2fdbb9adc87193196146ea0a81fa3a48e253b (diff) | |
Adjusted the excel export code.
| -rw-r--r-- | sc/source/filter/excel/xename.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 035a84bcf0a0..6103b42ff34e 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -671,24 +671,14 @@ void XclExpNameManagerImpl::CreateBuiltInNames() void XclExpNameManagerImpl::CreateUserNames() { -#if NEW_RANGE_NAME const ScRangeName& rNamedRanges = GetNamedRanges(); ScRangeName::const_iterator itr = rNamedRanges.begin(), itrEnd = rNamedRanges.end(); for (; itr != itrEnd; ++itr) { - // TODO: re-implement maNameMap to map name to excel index. - } -#else - const ScRangeName& rNamedRanges = GetNamedRanges(); - for( USHORT nNameIdx = 0, nNameCount = rNamedRanges.GetCount(); nNameIdx < nNameCount; ++nNameIdx ) - { - const ScRangeData* pRangeData = rNamedRanges[ nNameIdx ]; - DBG_ASSERT( rNamedRanges[ nNameIdx ], "XclExpNameManagerImpl::CreateUserNames - missing defined name" ); // skip definitions of shared formulas - if( pRangeData && !pRangeData->HasType( RT_SHARED ) && !FindNameIdx( maNameMap, pRangeData->GetIndex() ) ) - CreateName( *pRangeData ); + if (!itr->HasType(RT_SHARED) && !FindNameIdx(maNameMap, itr->GetIndex())) + CreateName(*itr); } -#endif } void XclExpNameManagerImpl::CreateDatabaseNames() |