diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 12:32:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 12:32:36 +0000 |
| commit | 71094858fd1403a1747f3ca36ce83a9146e17207 (patch) | |
| tree | 86d130095a8ec90a0221592f9f24f3d3cb228d8b /sc/source/filter/excel/xiname.cxx | |
| parent | 776f2b3dd1db8f293de3a4151a8807c5ca912630 (diff) | |
INTEGRATION: CWS dr32 (1.2.2); FILE MERGED
2005/01/31 14:00:50 dr 1.2.2.3: #b6219324# #i23079# #i27871# #i35812# #i37725# new ScExtDocOptions, new Excel import/export of view settings
2005/01/19 15:00:11 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/xiname.cxx')
| -rw-r--r-- | sc/source/filter/excel/xiname.cxx | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index 078e91ffa9b0..bd9c533ac727 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -2,9 +2,9 @@ * * $RCSfile: xiname.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kz $ $Date: 2005-01-14 12:05:56 $ + * last change: $Author: vg $ $Date: 2005-02-21 13:32:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -101,7 +101,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nScIndex ) : switch( GetBiff() ) { - case xlBiff2: + case EXC_BIFF2: { sal_uInt8 nFlagsBiff2; rStrm >> nFlagsBiff2; @@ -112,16 +112,15 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nScIndex ) : } break; - case xlBiff3: - case xlBiff4: + case EXC_BIFF3: + case EXC_BIFF4: { rStrm >> nFlags >> nShortCut >> nNameLen >> nFmlaSize; } break; - case xlBiff5: - case xlBiff7: - case xlBiff8: + case EXC_BIFF5: + case EXC_BIFF8: { rStrm >> nFlags >> nShortCut >> nNameLen >> nFmlaSize; rStrm.Ignore( 2 ); @@ -133,7 +132,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nScIndex ) : default: DBG_ERROR_BIFF(); } - if( GetBiff() < xlBiff8 ) + if( GetBiff() <= EXC_BIFF5 ) maXclName = rStrm.ReadRawByteString( nNameLen ); else maXclName = rStrm.ReadUniString( nNameLen ); @@ -147,8 +146,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nScIndex ) : bool bBuiltIn = ::get_flag( nFlags, EXC_NAME_BUILTIN ); // special case for BIFF5 filter range - name appears as plain text without built-in flag - if( ((GetBiff() == xlBiff5) || (GetBiff() == xlBiff7)) && - (maXclName == XclTools::GetXclBuiltInDefName( EXC_BUILTIN_FILTERDATABASE )) ) + if( (GetBiff() == EXC_BIFF5) && (maXclName == XclTools::GetXclBuiltInDefName( EXC_BUILTIN_FILTERDATABASE )) ) { bBuiltIn = true; maXclName.Assign( EXC_BUILTIN_FILTERDATABASE ); @@ -223,7 +221,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nScIndex ) : rFmlaConv.Convert( pTokArr, nFmlaSize, FT_RangeName ); // --- auto or advanced filter --- - if( (GetBiff() >= xlBiff8) && pTokArr && bBuiltIn ) + if( (GetBiff() == EXC_BIFF8) && pTokArr && bBuiltIn ) { ScRange aRange; if( pTokArr->IsReference( aRange ) ) @@ -231,7 +229,7 @@ XclImpName::XclImpName( XclImpStream& rStrm, sal_uInt16 nScIndex ) : switch( mcBuiltIn ) { case EXC_BUILTIN_FILTERDATABASE: - GetFilterManager().Insert( mpRD, aRange, maScName ); + GetFilterManager().Insert( &GetOldRoot(), aRange, maScName ); break; case EXC_BUILTIN_CRITERIA: GetFilterManager().AddAdvancedRange( aRange ); |