diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 12:29:17 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 12:29:17 +0000 |
| commit | 23c915556e72111bfe30138930bd41384c126846 (patch) | |
| tree | 42bd6dafda150868636994c93107a2d6d07395f7 /sc/source/filter/excel/xename.cxx | |
| parent | decc41d5cb5b6f68a7c7786467585159162a051d (diff) | |
INTEGRATION: CWS dr32 (1.2.2); FILE MERGED
2005/02/02 14:14:52 dr 1.2.2.4: #b6219324# #i23079# #i27871# #i35812# #i37725# new address converter, import/export of view settings
2005/01/31 14:00:44 dr 1.2.2.3: #b6219324# #i23079# #i27871# #i35812# #i37725# new ScExtDocOptions, new Excel import/export of view settings
2005/01/19 15:00:07 dr 1.2.2.2: #i40570# removed/changed constants and enums
2005/01/18 16:34:33 dr 1.2.2.1: #i10000# merge errors
Diffstat (limited to 'sc/source/filter/excel/xename.cxx')
| -rw-r--r-- | sc/source/filter/excel/xename.cxx | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 864f3a30f479..d365f7fd7103 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xename.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2005-01-14 12:03:38 $ + * last change: $Author: vg $ $Date: 2005-02-21 13:29:17 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -257,7 +257,7 @@ XclExpName::XclExpName( const XclExpRoot& rRoot, sal_Unicode cBuiltIn ) : SetHidden(); // special case for BIFF5/7 filter source range - name appears as plain text without built-in flag - if( (GetBiff() <= xlBiff7) && (cBuiltIn == EXC_BUILTIN_FILTERDATABASE) ) + if( (GetBiff() <= EXC_BIFF5) && (cBuiltIn == EXC_BUILTIN_FILTERDATABASE) ) { String aName( XclTools::GetXclBuiltInDefName( EXC_BUILTIN_FILTERDATABASE ) ); mxName = XclExpStringHelper::CreateString( rRoot, aName, EXC_STR_8BITLENGTH ); @@ -285,11 +285,10 @@ void XclExpName::SetLocalTab( SCTAB nScTab ) // special handling for NAME record switch( GetBiff() ) { - case xlBiff5: - case xlBiff7: // EXTERNSHEET index is positive in NAME record + case EXC_BIFF5: // EXTERNSHEET index is positive in NAME record mnExtSheet = ~mnExtSheet + 1; break; - case xlBiff8: // EXTERNSHEET index not used, but must be created in link table + case EXC_BIFF8: // EXTERNSHEET index not used, but must be created in link table mnExtSheet = 0; break; default: DBG_ERROR_BIFF(); @@ -588,7 +587,7 @@ void XclExpNameManagerImpl::CreateBuiltInNames() aRange.aEnd.SetTab( nScTab ); aRangeList.Append( aRange ); } - CheckCellRangeList( aRangeList ); + GetAddressConverter().ValidateRangeList( aRangeList, true ); GetNameManager().InsertBuiltInName( EXC_BUILTIN_PRINTAREA, aRangeList ); } @@ -599,19 +598,19 @@ void XclExpNameManagerImpl::CreateBuiltInNames() if( const ScRange* pColRange = rDoc.GetRepeatColRange( nScTab ) ) aTitleList.Append( ScRange( pColRange->aStart.Col(), 0, nScTab, - pColRange->aEnd.Col(), GetMaxPos().Row(), nScTab ) ); + pColRange->aEnd.Col(), GetXclMaxPos().Row(), nScTab ) ); // repeated rows if( const ScRange* pRowRange = rDoc.GetRepeatRowRange( nScTab ) ) aTitleList.Append( ScRange( 0, pRowRange->aStart.Row(), nScTab, - GetMaxPos().Col(), pRowRange->aEnd.Row(), nScTab ) ); + GetXclMaxPos().Col(), pRowRange->aEnd.Row(), nScTab ) ); // create the NAME record - CheckCellRangeList( aTitleList ); + GetAddressConverter().ValidateRangeList( aTitleList, true ); GetNameManager().InsertBuiltInName( EXC_BUILTIN_PRINTTITLES, aTitleList ); // *** 3) filter ranges *** --------------------------------------- - if( GetBiff() >= xlBiff8 ) + if( GetBiff() == EXC_BIFF8 ) GetFilterManager().InitTabFilter( nScTab ); } } |