diff options
Diffstat (limited to 'sc/source/filter/excel')
53 files changed, 898 insertions, 889 deletions
diff --git a/sc/source/filter/excel/colrowst.cxx b/sc/source/filter/excel/colrowst.cxx index 6905d295009d..b6e310fa831e 100644 --- a/sc/source/filter/excel/colrowst.cxx +++ b/sc/source/filter/excel/colrowst.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/excdoc.cxx b/sc/source/filter/excel/excdoc.cxx index 085f38129c33..281b7cbe901a 100644 --- a/sc/source/filter/excel/excdoc.cxx +++ b/sc/source/filter/excel/excdoc.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -93,7 +93,7 @@ using ::rtl::OString; static String lcl_GetVbaTabName( SCTAB n ) { - String aRet( RTL_CONSTASCII_USTRINGPARAM( "__VBA__" ) ); + String aRet( RTL_CONSTASCII_USTRINGPARAM( "__VBA__" ) ); aRet += String::CreateFromInt32( static_cast<sal_uInt16>(n) ); return aRet; } @@ -192,8 +192,8 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) else Add( new ExcBofW8 ); - SCTAB nC; - String aTmpString; + SCTAB nC; + String aTmpString; SCTAB nScTabCount = rTabInfo.GetScTabCount(); UINT16 nExcTabCount = rTabInfo.GetXclTabCount(); UINT16 nCodenames = static_cast< UINT16 >( GetExtDocOptions().GetCodeNameCount() ); @@ -248,7 +248,7 @@ void ExcTable::FillAsHeader( ExcBoundsheetList& rBoundsheetList ) Add( new XclExpUInt16Record( EXC_ID_FNGROUPCOUNT, 14 ) ); // erst Namen- und Tabellen-Eintraege aufbauen - String aName; + String aName; for( nC = 0 ; nC < nScTabCount ; nC++ ) if( rTabInfo.IsExportTab( nC ) ) diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index c0012c5519f7..c4c823066e77 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/excform.cxx b/sc/source/filter/excel/excform.cxx index 16807b7bf4ad..4d19e26d3831 100644 --- a/sc/source/filter/excel/excform.cxx +++ b/sc/source/filter/excel/excform.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,14 +56,14 @@ void ImportExcel::Formula25() { XclAddress aXclPos; UINT16 nXF = 0, nFormLen; - double fCurVal; - BYTE nAttr0, nFlag0; - BOOL bShrFmla; + double fCurVal; + BYTE nAttr0, nFlag0; + BOOL bShrFmla; aIn >> aXclPos; if( GetBiff() == EXC_BIFF2 ) - {// BIFF2 + {// BIFF2 BYTE nDummy; aIn.Ignore( 3 ); @@ -73,16 +73,16 @@ void ImportExcel::Formula25() aIn >> nDummy; nFormLen = nDummy; bShrFmla = FALSE; - nAttr0 = 0x01; // Always calculate + nAttr0 = 0x01; // Always calculate } else - {// BIFF5 + {// BIFF5 aIn >> nXF >> fCurVal >> nFlag0; aIn.Ignore( 5 ); aIn >> nFormLen; - bShrFmla = nFlag0 & 0x08; // shared or not shared + bShrFmla = nFlag0 & 0x08; // shared or not shared } nLastXF = nXF; @@ -101,8 +101,8 @@ void ImportExcel::Formula4() { XclAddress aXclPos; UINT16 nXF, nFormLen; - double fCurVal; - BYTE nFlag0; + double fCurVal; + BYTE nFlag0; aIn >> aXclPos >> nXF >> fCurVal >> nFlag0; aIn.Ignore( 1 ); @@ -124,7 +124,7 @@ void ImportExcel::Formula( const XclAddress& rXclPos, { // jetzt steht Lesemarke auf Formel, Laenge in nFormLen const ScTokenArray* pErgebnis = 0; - BOOL bConvert; + BOOL bConvert; pFormConv->Reset( aScPos ); @@ -136,7 +136,7 @@ void ImportExcel::Formula( const XclAddress& rXclPos, if( bConvert ) eErr = pFormConv->Convert( pErgebnis, maStrm, nFormLen, true, FT_CellFormula); - ScFormulaCell* pZelle = NULL; + ScFormulaCell* pZelle = NULL; if( pErgebnis ) { @@ -145,8 +145,8 @@ void ImportExcel::Formula( const XclAddress& rXclPos, } else { - CellType eCellType; - ScBaseCell* pBaseCell; + CellType eCellType; + ScBaseCell* pBaseCell; pD->GetCellType( aScPos.Col(), aScPos.Row(), aScPos.Tab(), eCellType ); if( eCellType == CELLTYPE_FORMULA ) { @@ -197,20 +197,20 @@ void ExcelToSc::GetDummy( const ScTokenArray*& pErgebnis ) ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT ) { RootData& rR = GetOldRoot(); - BYTE nOp, nLen, nByte; + BYTE nOp, nLen, nByte; UINT16 nUINT16; - INT16 nINT16; - double fDouble; - String aString; - BOOL bError = FALSE; - BOOL bArrayFormula = FALSE; - TokenId nMerk0; - const BOOL bRangeName = eFT == FT_RangeName; - const BOOL bSharedFormula = eFT == FT_SharedFormula; - const BOOL bRNorSF = bRangeName || bSharedFormula; - - ScSingleRefData aSRD; - ScComplexRefData aCRD; + INT16 nINT16; + double fDouble; + String aString; + BOOL bError = FALSE; + BOOL bArrayFormula = FALSE; + TokenId nMerk0; + const BOOL bRangeName = eFT == FT_RangeName; + const BOOL bSharedFormula = eFT == FT_SharedFormula; + const BOOL bRNorSF = bRangeName || bSharedFormula; + + ScSingleRefData aSRD; + ScComplexRefData aCRD; ExtensionTypeVec aExtensions; bExternName = FALSE; @@ -239,11 +239,11 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s aSRD.InitFlags(); aCRD.InitFlags(); - switch( nOp ) // Buch Seite: - { // SDK4 SDK5 - case 0x01: // Array Formula [325 ] - // Array Formula or Shared Formula [ 277] - case 0x02: // Data Table [325 277] + switch( nOp ) // Buch Seite: + { // SDK4 SDK5 + case 0x01: // Array Formula [325 ] + // Array Formula or Shared Formula [ 277] + case 0x02: // Data Table [325 277] nUINT16 = 3; if( meBiff != EXC_BIFF2 ) @@ -253,82 +253,82 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s bArrayFormula = TRUE; break; - case 0x03: // Addition [312 264] + case 0x03: // Addition [312 264] aStack >> nMerk0; aPool << aStack << ocAdd << nMerk0; aPool >> aStack; break; - case 0x04: // Subtraction [313 264] + case 0x04: // Subtraction [313 264] // SECOMD-TOP minus TOP aStack >> nMerk0; aPool << aStack << ocSub << nMerk0; aPool >> aStack; break; - case 0x05: // Multiplication [313 264] + case 0x05: // Multiplication [313 264] aStack >> nMerk0; aPool << aStack << ocMul << nMerk0; aPool >> aStack; break; - case 0x06: // Division [313 264] + case 0x06: // Division [313 264] // divide TOP by SECOND-TOP aStack >> nMerk0; aPool << aStack << ocDiv << nMerk0; aPool >> aStack; break; - case 0x07: // Exponetiation [313 265] + case 0x07: // Exponetiation [313 265] // raise SECOND-TOP to power of TOP aStack >> nMerk0; aPool << aStack << ocPow << nMerk0; aPool >> aStack; break; - case 0x08: // Concatenation [313 265] + case 0x08: // Concatenation [313 265] // append TOP to SECOND-TOP aStack >> nMerk0; aPool << aStack << ocAmpersand << nMerk0; aPool >> aStack; break; - case 0x09: // Less Than [313 265] + case 0x09: // Less Than [313 265] // SECOND-TOP < TOP aStack >> nMerk0; aPool << aStack << ocLess << nMerk0; aPool >> aStack; break; - case 0x0A: // Less Than or Equal [313 265] + case 0x0A: // Less Than or Equal [313 265] // SECOND-TOP <= TOP aStack >> nMerk0; aPool << aStack << ocLessEqual << nMerk0; aPool >> aStack; break; - case 0x0B: // Equal [313 265] + case 0x0B: // Equal [313 265] // SECOND-TOP == TOP aStack >> nMerk0; aPool << aStack << ocEqual << nMerk0; aPool >> aStack; break; - case 0x0C: // Greater Than or Equal [313 265] + case 0x0C: // Greater Than or Equal [313 265] // SECOND-TOP == TOP aStack >> nMerk0; aPool << aStack << ocGreaterEqual << nMerk0; aPool >> aStack; break; - case 0x0D: // Greater Than [313 265] + case 0x0D: // Greater Than [313 265] // SECOND-TOP == TOP aStack >> nMerk0; aPool << aStack << ocGreater << nMerk0; aPool >> aStack; break; - case 0x0E: // Not Equal [313 265] + case 0x0E: // Not Equal [313 265] // SECOND-TOP == TOP aStack >> nMerk0; aPool << aStack << ocNotEqual << nMerk0; aPool >> aStack; break; - case 0x0F: // Intersection [314 265] + case 0x0F: // Intersection [314 265] aStack >> nMerk0; aPool << aStack << ocIntersect << nMerk0; aPool >> aStack; break; - case 0x10: // Union [314 265] + case 0x10: // Union [314 265] // ocSep behelfsweise statt 'ocUnion' aStack >> nMerk0; //#100928# aPool << ocOpen << aStack << ocSep << nMerk0 << ocClose; @@ -336,42 +336,42 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s // doesn't fit exactly, but is more Excel-like aPool >> aStack; break; - case 0x11: // Range [314 265] + case 0x11: // Range [314 265] aStack >> nMerk0; aPool << aStack << ocRange << nMerk0; aPool >> aStack; break; - case 0x12: // Unary Plus [312 264] + case 0x12: // Unary Plus [312 264] aPool << ocAdd << aStack; aPool >> aStack; break; - case 0x13: // Unary Minus [312 264] + case 0x13: // Unary Minus [312 264] aPool << ocNegSub << aStack; aPool >> aStack; break; - case 0x14: // Percent Sign [312 264] + case 0x14: // Percent Sign [312 264] aPool << aStack << ocPercentSign; aPool >> aStack; break; - case 0x15: // Parenthesis [326 278] + case 0x15: // Parenthesis [326 278] aPool << ocOpen << aStack << ocClose; aPool >> aStack; break; - case 0x16: // Missing Argument [314 266] + case 0x16: // Missing Argument [314 266] aPool << ocMissing; aPool >> aStack; GetTracer().TraceFormulaMissingArg(); break; - case 0x17: // String Constant [314 266] + case 0x17: // String Constant [314 266] aIn >> nLen; aString = aIn.ReadRawByteString( nLen ); aStack << aPool.Store( aString ); break; - case 0x19: // Special Attribute [327 279] + case 0x19: // Special Attribute [327 279] { - UINT16 nData, nFakt; - BYTE nOpt; + UINT16 nData, nFakt; + BYTE nOpt; aIn >> nOpt; @@ -387,15 +387,15 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s } if( nOpt & 0x04 ) - {// nFakt -> Bytes oder Words ueberlesen AttrChoose + {// nFakt -> Bytes oder Words ueberlesen AttrChoose nData++; aIn.Ignore( nData * nFakt ); } - else if( nOpt & 0x10 ) // AttrSum + else if( nOpt & 0x10 ) // AttrSum DoMulArgs( ocSum, 1 ); } break; - case 0x1A: // External Reference [330 ] + case 0x1A: // External Reference [330 ] switch( meBiff ) { case EXC_BIFF2: aIn.Ignore( 7 ); break; @@ -407,7 +407,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s DBG_WARNING( "-ExcelToSc::Convert(): Ein wenig vergesslich, was?" ); } break; - case 0x1B: // End External Reference [330 ] + case 0x1B: // End External Reference [330 ] switch( meBiff ) { case EXC_BIFF2: aIn.Ignore( 3 ); break; @@ -419,10 +419,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s DBG_WARNING( "-ExcelToSc::Convert(): Ein wenig vergesslich, was?" ); } break; - case 0x1C: // Error Value [314 266] + case 0x1C: // Error Value [314 266] { aIn >> nByte; - DefTokenId eOc; + DefTokenId eOc; switch( nByte ) { case EXC_ERR_NULL: @@ -440,7 +440,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s aPool >> aStack; } break; - case 0x1D: // Boolean [315 266] + case 0x1D: // Boolean [315 266] aIn >> nByte; if( nByte == 0 ) aPool << ocFalse << ocOpen << ocClose; @@ -448,17 +448,17 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s aPool << ocTrue << ocOpen << ocClose; aPool >> aStack; break; - case 0x1E: // Integer [315 266] + case 0x1E: // Integer [315 266] aIn >> nUINT16; aStack << aPool.Store( ( double ) nUINT16 ); break; - case 0x1F: // Number [315 266] + case 0x1F: // Number [315 266] aIn >> fDouble; aStack << aPool.Store( fDouble ); break; case 0x40: case 0x60: - case 0x20: // Array Constant [317 268] + case 0x20: // Array Constant [317 268] aIn >> nByte >> nUINT16; aIn.Ignore( (meBiff == EXC_BIFF2) ? 3 : 4 ); if( bAllowArrays ) @@ -474,7 +474,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x41: case 0x61: - case 0x21: // Function, Fixed Number of Arguments [333 282] + case 0x21: // Function, Fixed Number of Arguments [333 282] { sal_uInt16 nXclFunc; if( meBiff <= EXC_BIFF3 ) @@ -489,7 +489,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x42: case 0x62: - case 0x22: // Function, Variable Number of Arg. [333 283] + case 0x22: // Function, Variable Number of Arg. [333 283] { sal_uInt16 nXclFunc; sal_uInt8 nParamCount; @@ -507,7 +507,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x43: case 0x63: - case 0x23: // Name [318 269] + case 0x23: // Name [318 269] { aIn >> nUINT16; switch( meBiff ) @@ -529,10 +529,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x44: case 0x64: - case 0x24: // Cell Reference [319 270] + case 0x24: // Cell Reference [319 270] case 0x4A: case 0x6A: - case 0x2A: // Deleted Cell Reference [323 273] + case 0x2A: // Deleted Cell Reference [323 273] aIn >> nUINT16 >> nByte; aSRD.nCol = static_cast<SCsCOL>(nByte); aSRD.nRow = nUINT16 & 0x3FFF; @@ -546,7 +546,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s { case 0x4A: case 0x6A: - case 0x2A: // Deleted Cell Reference [323 273] + case 0x2A: // Deleted Cell Reference [323 273] // no information which part is deleted, set both aSRD.SetColDeleted( TRUE ); aSRD.SetRowDeleted( TRUE ); @@ -556,15 +556,15 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x45: case 0x65: - case 0x25: // Area Reference [320 270] + case 0x25: // Area Reference [320 270] case 0x4B: case 0x6B: - case 0x2B: // Deleted Area Refernce [323 273] + case 0x2B: // Deleted Area Refernce [323 273] { - UINT16 nRowFirst, nRowLast; - UINT8 nColFirst, nColLast; - ScSingleRefData& rSRef1 = aCRD.Ref1; - ScSingleRefData& rSRef2 = aCRD.Ref2; + UINT16 nRowFirst, nRowLast; + UINT8 nColFirst, nColLast; + ScSingleRefData& rSRef1 = aCRD.Ref1; + ScSingleRefData& rSRef2 = aCRD.Ref2; aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast; @@ -586,7 +586,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s { case 0x4B: case 0x6B: - case 0x2B: // Deleted Area Refernce [323 273] + case 0x2B: // Deleted Area Refernce [323 273] // no information which part is deleted, set all rSRef1.SetColDeleted( TRUE ); rSRef1.SetRowDeleted( TRUE ); @@ -599,13 +599,13 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x46: case 0x66: - case 0x26: // Constant Reference Subexpression [321 271] + case 0x26: // Constant Reference Subexpression [321 271] aExtensions.push_back( EXTENSION_MEMAREA ); // fall through case 0x47: case 0x67: - case 0x27: // Erroneous Constant Reference Subexpr. [322 272] + case 0x27: // Erroneous Constant Reference Subexpr. [322 272] case 0x48: case 0x68: case 0x28: // Incomplete Constant Reference Subexpr.[331 281] @@ -613,10 +613,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x4C: case 0x6C: - case 0x2C: // Cell Reference Within a Name [323 ] + case 0x2C: // Cell Reference Within a Name [323 ] // Cell Reference Within a Shared Formula[ 273] { - aIn >> nUINT16 >> nByte; // >> Attribute, Row >> Col + aIn >> nUINT16 >> nByte; // >> Attribute, Row >> Col aSRD.nRelTab = 0; aSRD.SetTabRel( TRUE ); @@ -629,10 +629,10 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x4D: case 0x6D: - case 0x2D: // Area Reference Within a Name [324 ] - { // Area Reference Within a Shared Formula[ 274] - UINT16 nRowFirst, nRowLast; - UINT8 nColFirst, nColLast; + case 0x2D: // Area Reference Within a Name [324 ] + { // Area Reference Within a Shared Formula[ 274] + UINT16 nRowFirst, nRowLast; + UINT8 nColFirst, nColLast; aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0; aCRD.Ref1.SetTabRel( TRUE ); @@ -658,15 +658,15 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s case 0x29: // Variable Reference Subexpression [331 281] case 0x4E: case 0x6E: - case 0x2E: // Reference Subexpression Within a Name [332 282] + case 0x2E: // Reference Subexpression Within a Name [332 282] case 0x4F: case 0x6F: - case 0x2F: // Incomplete Reference Subexpression... [332 282] + case 0x2F: // Incomplete Reference Subexpression... [332 282] aIn.Ignore( (meBiff == EXC_BIFF2) ? 1 : 2 ); break; case 0x58: case 0x78: - case 0x38: // Command-Equivalent Function [333 ] + case 0x38: // Command-Equivalent Function [333 ] aString.AssignAscii( "COMM_EQU_FUNC" ); aIn >> nByte; aString += String::CreateFromInt32( nByte ); @@ -676,7 +676,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x59: case 0x79: - case 0x39: // Name or External Name [ 275] + case 0x39: // Name or External Name [ 275] aIn >> nINT16; aIn.Ignore( 8 ); aIn >> nUINT16; @@ -686,14 +686,14 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s if( pExtName && pExtName->IsDDE() && rR.pExtSheetBuff->IsLink( ( UINT16 ) nINT16 ) ) { - String aAppl, aExtDoc; - TokenId nPar1, nPar2; + String aAppl, aExtDoc; + TokenId nPar1, nPar2; rR.pExtSheetBuff->GetLink( ( UINT16 ) nINT16 , aAppl, aExtDoc ); nPar1 = aPool.Store( aAppl ); nPar2 = aPool.Store( aExtDoc ); nMerk0 = aPool.Store( pExtName->aName ); - aPool << ocDde << ocOpen << nPar1 << ocSep << nPar2 << ocSep + aPool << ocDde << ocOpen << nPar1 << ocSep << nPar2 << ocSep << nMerk0 << ocClose; GetDoc().CreateDdeLink( aAppl, aExtDoc, pExtName->aName, SC_DDE_DEFAULT ); @@ -709,36 +709,36 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x5A: case 0x7A: - case 0x3A: // 3-D Cell Reference [ 275] + case 0x3A: // 3-D Cell Reference [ 275] case 0x5C: case 0x7C: - case 0x3C: // Deleted 3-D Cell Reference [ 277] + case 0x3C: // Deleted 3-D Cell Reference [ 277] { - UINT16 nTabFirst, nTabLast, nRow; - INT16 nExtSheet; - BYTE nCol; + UINT16 nTabFirst, nTabLast, nRow; + INT16 nExtSheet; + BYTE nCol; aIn >> nExtSheet; aIn.Ignore( 8 ); aIn >> nTabFirst >> nTabLast >> nRow >> nCol; if( nExtSheet >= 0 ) - { // von extern + { // von extern if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) ) { nTabFirst = nTabLast; - nExtSheet = 0; // gefunden + nExtSheet = 0; // gefunden } else { aPool << ocBad; aPool >> aStack; - nExtSheet = 1; // verhindert Erzeugung einer SingleRef + nExtSheet = 1; // verhindert Erzeugung einer SingleRef } } if( nExtSheet <= 0 ) - { // in aktuellem Workbook + { // in aktuellem Workbook aSRD.nTab = static_cast<SCTAB>(nTabFirst); aSRD.SetFlag3D( TRUE ); aSRD.SetTabRel( FALSE ); @@ -749,7 +749,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s { case 0x5C: case 0x7C: - case 0x3C: // Deleted 3-D Cell Reference [ 277] + case 0x3C: // Deleted 3-D Cell Reference [ 277] // no information which part is deleted, set both aSRD.SetColDeleted( TRUE ); aSRD.SetRowDeleted( TRUE ); @@ -772,14 +772,14 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s break; case 0x5B: case 0x7B: - case 0x3B: // 3-D Area Reference [ 276] + case 0x3B: // 3-D Area Reference [ 276] case 0x5D: case 0x7D: - case 0x3D: // Deleted 3-D Area Reference [ 277] + case 0x3D: // Deleted 3-D Area Reference [ 277] { - UINT16 nTabFirst, nTabLast, nRowFirst, nRowLast; - INT16 nExtSheet; - BYTE nColFirst, nColLast; + UINT16 nTabFirst, nTabLast, nRowFirst, nRowLast; + INT16 nExtSheet; + BYTE nColFirst, nColLast; aIn >> nExtSheet; aIn.Ignore( 8 ); @@ -792,21 +792,21 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) ) { nTabFirst = nTabLast; - nExtSheet = 0; // gefunden + nExtSheet = 0; // gefunden } else { aPool << ocBad; aPool >> aStack; - nExtSheet = 1; // verhindert Erzeugung einer CompleteRef + nExtSheet = 1; // verhindert Erzeugung einer CompleteRef } } if( nExtSheet <= 0 ) {// in aktuellem Workbook // erster Teil des Bereichs - ScSingleRefData& rR1 = aCRD.Ref1; - ScSingleRefData& rR2 = aCRD.Ref2; + ScSingleRefData& rR1 = aCRD.Ref1; + ScSingleRefData& rR2 = aCRD.Ref2; rR1.nTab = static_cast<SCTAB>(nTabFirst); rR2.nTab = static_cast<SCTAB>(nTabLast); @@ -827,7 +827,7 @@ ConvErr ExcelToSc::Convert( const ScTokenArray*& pErgebnis, XclImpStream& aIn, s { case 0x5D: case 0x7D: - case 0x3D: // Deleted 3-D Area Reference [ 277] + case 0x3D: // Deleted 3-D Area Reference [ 277] // no information which part is deleted, set all rR1.SetColDeleted( TRUE ); rR1.SetRowDeleted( TRUE ); @@ -894,18 +894,18 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal SCsTAB nTab, const FORMULA_TYPE eFT ) { RootData& rR = GetOldRoot(); - BYTE nOp, nLen; + BYTE nOp, nLen; sal_Size nIgnore; - UINT16 nUINT16; - UINT8 nByte; - BOOL bError = FALSE; - BOOL bArrayFormula = FALSE; - const BOOL bRangeName = eFT == FT_RangeName; - const BOOL bSharedFormula = eFT == FT_SharedFormula; - const BOOL bRNorSF = bRangeName || bSharedFormula; - - ScSingleRefData aSRD; - ScComplexRefData aCRD; + UINT16 nUINT16; + UINT8 nByte; + BOOL bError = FALSE; + BOOL bArrayFormula = FALSE; + const BOOL bRangeName = eFT == FT_RangeName; + const BOOL bSharedFormula = eFT == FT_SharedFormula; + const BOOL bRNorSF = bRangeName || bSharedFormula; + + ScSingleRefData aSRD; + ScComplexRefData aCRD; aCRD.Ref1.nTab = aCRD.Ref2.nTab = aEingPos.Tab(); bExternName = FALSE; @@ -930,42 +930,42 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal aSRD.InitFlags(); aCRD.InitFlags(); - switch( nOp ) // Buch Seite: - { // SDK4 SDK5 - case 0x01: // Array Formula [325 ] - // Array Formula or Shared Formula [ 277] + switch( nOp ) // Buch Seite: + { // SDK4 SDK5 + case 0x01: // Array Formula [325 ] + // Array Formula or Shared Formula [ 277] nIgnore = (meBiff == EXC_BIFF2) ? 3 : 4; bArrayFormula = TRUE; break; - case 0x02: // Data Table [325 277] + case 0x02: // Data Table [325 277] nIgnore = (meBiff == EXC_BIFF2) ? 3 : 4; break; - case 0x03: // Addition [312 264] - case 0x04: // Subtraction [313 264] - case 0x05: // Multiplication [313 264] - case 0x06: // Division [313 264] - case 0x07: // Exponetiation [313 265] - case 0x08: // Concatenation [313 265] - case 0x09: // Less Than [313 265] - case 0x0A: // Less Than or Equal [313 265] - case 0x0B: // Equal [313 265] - case 0x0C: // Greater Than or Equal [313 265] - case 0x0D: // Greater Than [313 265] - case 0x0E: // Not Equal [313 265] - case 0x0F: // Intersection [314 265] - case 0x10: // Union [314 265] - case 0x11: // Range [314 265] - case 0x12: // Unary Plus [312 264] - case 0x13: // Unary Minus [312 264] - case 0x14: // Percent Sign [312 264] - case 0x15: // Parenthesis [326 278] - case 0x16: // Missing Argument [314 266] - break; - case 0x17: // String Constant [314 266] + case 0x03: // Addition [312 264] + case 0x04: // Subtraction [313 264] + case 0x05: // Multiplication [313 264] + case 0x06: // Division [313 264] + case 0x07: // Exponetiation [313 265] + case 0x08: // Concatenation [313 265] + case 0x09: // Less Than [313 265] + case 0x0A: // Less Than or Equal [313 265] + case 0x0B: // Equal [313 265] + case 0x0C: // Greater Than or Equal [313 265] + case 0x0D: // Greater Than [313 265] + case 0x0E: // Not Equal [313 265] + case 0x0F: // Intersection [314 265] + case 0x10: // Union [314 265] + case 0x11: // Range [314 265] + case 0x12: // Unary Plus [312 264] + case 0x13: // Unary Minus [312 264] + case 0x14: // Percent Sign [312 264] + case 0x15: // Parenthesis [326 278] + case 0x16: // Missing Argument [314 266] + break; + case 0x17: // String Constant [314 266] aIn >> nLen; nIgnore = nLen; break; - case 0x19: // Special Attribute [327 279] + case 0x19: // Special Attribute [327 279] { UINT16 nData, nFakt; BYTE nOpt; @@ -984,13 +984,13 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal } if( nOpt & 0x04 ) - {// nFakt -> Bytes oder Words ueberlesen AttrChoose + {// nFakt -> Bytes oder Words ueberlesen AttrChoose nData++; aIn.Ignore( nData * nFakt ); } } break; - case 0x1A: // External Reference [330 ] + case 0x1A: // External Reference [330 ] switch( meBiff ) { case EXC_BIFF2: nIgnore = 7; break; @@ -1000,7 +1000,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal default: DBG_WARNING( "-ExcelToSc::Convert(): Ein wenig vergesslich, was?" ); } break; - case 0x1B: // End External Reference [330 ] + case 0x1B: // End External Reference [330 ] switch( meBiff ) { case EXC_BIFF2: nIgnore = 3; break; @@ -1010,34 +1010,34 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal default: DBG_WARNING( "-ExcelToSc::Convert(): Ein wenig vergesslich, was?" ); } break; - case 0x1C: // Error Value [314 266] - case 0x1D: // Boolean [315 266] + case 0x1C: // Error Value [314 266] + case 0x1D: // Boolean [315 266] nIgnore = 1; break; - case 0x1E: // Integer [315 266] + case 0x1E: // Integer [315 266] nIgnore = 2; break; - case 0x1F: // Number [315 266] + case 0x1F: // Number [315 266] nIgnore = 8; break; case 0x40: case 0x60: - case 0x20: // Array Constant [317 268] + case 0x20: // Array Constant [317 268] nIgnore = (meBiff == EXC_BIFF2) ? 6 : 7; break; case 0x41: case 0x61: - case 0x21: // Function, Fixed Number of Arguments [333 282] + case 0x21: // Function, Fixed Number of Arguments [333 282] nIgnore = (meBiff <= EXC_BIFF3) ? 1 : 2; break; case 0x42: case 0x62: - case 0x22: // Function, Variable Number of Arg. [333 283] + case 0x22: // Function, Variable Number of Arg. [333 283] nIgnore = (meBiff <= EXC_BIFF3) ? 2 : 3; break; case 0x43: case 0x63: - case 0x23: // Name [318 269] + case 0x23: // Name [318 269] switch( meBiff ) { case EXC_BIFF2: nIgnore = 7; break; @@ -1049,7 +1049,7 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal break; case 0x44: case 0x64: - case 0x24: // Cell Reference [319 270] + case 0x24: // Cell Reference [319 270] aIn >> nUINT16 >> nByte; aSRD.nCol = static_cast<SCsCOL>(nByte); aSRD.nRow = nUINT16 & 0x3FFF; @@ -1063,12 +1063,12 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal break; case 0x45: case 0x65: - case 0x25: // Area Reference [320 270] + case 0x25: // Area Reference [320 270] { - UINT16 nRowFirst, nRowLast; - UINT8 nColFirst, nColLast; - ScSingleRefData &rSRef1 = aCRD.Ref1; - ScSingleRefData &rSRef2 = aCRD.Ref2; + UINT16 nRowFirst, nRowLast; + UINT8 nColFirst, nColLast; + ScSingleRefData &rSRef1 = aCRD.Ref1; + ScSingleRefData &rSRef2 = aCRD.Ref2; aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast; @@ -1091,10 +1091,10 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal break; case 0x46: case 0x66: - case 0x26: // Constant Reference Subexpression [321 271] + case 0x26: // Constant Reference Subexpression [321 271] case 0x47: case 0x67: - case 0x27: // Erroneous Constant Reference Subexpr. [322 272] + case 0x27: // Erroneous Constant Reference Subexpr. [322 272] case 0x48: case 0x68: case 0x28: // Incomplete Constant Reference Subexpr.[331 281] @@ -1102,20 +1102,20 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal break; case 0x4A: case 0x6A: - case 0x2A: // Deleted Cell Reference [323 273] + case 0x2A: // Deleted Cell Reference [323 273] nIgnore = 3; break; case 0x4B: case 0x6B: - case 0x2B: // Deleted Area Refernce [323 273] + case 0x2B: // Deleted Area Refernce [323 273] nIgnore = 6; break; case 0x4C: case 0x6C: - case 0x2C: // Cell Reference Within a Name [323 ] + case 0x2C: // Cell Reference Within a Name [323 ] // Cell Reference Within a Shared Formula[ 273] { - aIn >> nUINT16 >> nByte; // >> Attribute, Row >> Col + aIn >> nUINT16 >> nByte; // >> Attribute, Row >> Col aSRD.nRelTab = 0; aSRD.SetTabRel( TRUE ); @@ -1128,10 +1128,10 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal break; case 0x4D: case 0x6D: - case 0x2D: // Area Reference Within a Name [324 ] - { // Area Reference Within a Shared Formula[ 274] - UINT16 nRowFirst, nRowLast; - UINT8 nColFirst, nColLast; + case 0x2D: // Area Reference Within a Name [324 ] + { // Area Reference Within a Shared Formula[ 274] + UINT16 nRowFirst, nRowLast; + UINT8 nColFirst, nColLast; aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0; aCRD.Ref1.SetTabRel( TRUE ); @@ -1157,29 +1157,29 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal case 0x29: // Variable Reference Subexpression [331 281] case 0x4E: case 0x6E: - case 0x2E: // Reference Subexpression Within a Name [332 282] + case 0x2E: // Reference Subexpression Within a Name [332 282] case 0x4F: case 0x6F: - case 0x2F: // Incomplete Reference Subexpression... [332 282] + case 0x2F: // Incomplete Reference Subexpression... [332 282] nIgnore = (meBiff == EXC_BIFF2) ? 1 : 2; break; case 0x58: case 0x78: - case 0x38: // Command-Equivalent Function [333 ] + case 0x38: // Command-Equivalent Function [333 ] nIgnore = 2; break; case 0x59: case 0x79: - case 0x39: // Name or External Name [ 275] + case 0x39: // Name or External Name [ 275] nIgnore = 24; break; case 0x5A: case 0x7A: - case 0x3A: // 3-D Cell Reference [ 275] + case 0x3A: // 3-D Cell Reference [ 275] { - UINT16 nTabFirst, nTabLast, nRow; - INT16 nExtSheet; - BYTE nCol; + UINT16 nTabFirst, nTabLast, nRow; + INT16 nExtSheet; + BYTE nCol; aIn >> nExtSheet; aIn.Ignore( 8 ); @@ -1191,13 +1191,13 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) ) { nTabFirst = nTabLast; - nExtSheet = 0; // gefunden + nExtSheet = 0; // gefunden } else { aPool << ocBad; aPool >> aStack; - nExtSheet = 1; // verhindert Erzeugung einer SingleRef + nExtSheet = 1; // verhindert Erzeugung einer SingleRef } } @@ -1229,11 +1229,11 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal break; case 0x5B: case 0x7B: - case 0x3B: // 3-D Area Reference [ 276] + case 0x3B: // 3-D Area Reference [ 276] { - UINT16 nTabFirst, nTabLast, nRowFirst, nRowLast; - INT16 nExtSheet; - BYTE nColFirst, nColLast; + UINT16 nTabFirst, nTabLast, nRowFirst, nRowLast; + INT16 nExtSheet; + BYTE nColFirst, nColLast; aIn >> nExtSheet; aIn.Ignore( 8 ); @@ -1246,21 +1246,21 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal if( rR.pExtSheetBuff->GetScTabIndex( nExtSheet, nTabLast ) ) { nTabFirst = nTabLast; - nExtSheet = 0; // gefunden + nExtSheet = 0; // gefunden } else { aPool << ocBad; aPool >> aStack; - nExtSheet = 1; // verhindert Erzeugung einer CompleteRef + nExtSheet = 1; // verhindert Erzeugung einer CompleteRef } } if( nExtSheet <= 0 ) {// in aktuellem Workbook // erster Teil des Bereichs - ScSingleRefData &rR1 = aCRD.Ref1; - ScSingleRefData &rR2 = aCRD.Ref2; + ScSingleRefData &rR1 = aCRD.Ref1; + ScSingleRefData &rR2 = aCRD.Ref2; rR1.nTab = static_cast<SCTAB>(nTabFirst); rR2.nTab = static_cast<SCTAB>(nTabLast); @@ -1283,12 +1283,12 @@ ConvErr ExcelToSc::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal break; case 0x5C: case 0x7C: - case 0x3C: // Deleted 3-D Cell Reference [ 277] + case 0x3C: // Deleted 3-D Cell Reference [ 277] nIgnore = 17; break; case 0x5D: case 0x7D: - case 0x3D: // Deleted 3-D Area Reference [ 277] + case 0x3D: // Deleted 3-D Area Reference [ 277] nIgnore = 20; break; default: bError = TRUE; @@ -1529,12 +1529,12 @@ BOOL ExcelToSc::GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Si void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCount ) { - TokenId eParam[ 256 ]; - INT32 nLauf; + TokenId eParam[ 256 ]; + INT32 nLauf; if( eId == ocCeil || eId == ocFloor ) { - aStack << aPool.Store( 1.0 ); // default, da in Excel nicht vorhanden + aStack << aPool.Store( 1.0 ); // default, da in Excel nicht vorhanden nAnz++; } @@ -1546,7 +1546,7 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo if( nAnz > 0 && eId == ocExternal ) { - TokenId n = eParam[ nAnz - 1 ]; + TokenId n = eParam[ nAnz - 1 ]; //##### GRUETZE FUER BASIC-FUNCS RICHTEN! if( const String* pExt = aPool.GetExternal( n ) ) { @@ -1567,19 +1567,19 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo if( nAnz > 0 ) { // attention: 0 = last parameter, nAnz-1 = first parameter - INT16 nNull = -1; // skip this parameter - INT16 nSkipEnd = -1; // skip all parameters <= nSkipEnd + INT16 nNull = -1; // skip this parameter + INT16 nSkipEnd = -1; // skip all parameters <= nSkipEnd INT16 nLast = nAnz - 1; // Funktionen, bei denen Parameter wegfallen muessen if( eId == ocPercentrank && nAnz == 3 ) - nSkipEnd = 0; // letzten Parameter bei Bedarf weglassen + nSkipEnd = 0; // letzten Parameter bei Bedarf weglassen // Joost-Spezialfaelle else if( eId == ocIf ) { - UINT16 nNullParam = 0; + UINT16 nNullParam = 0; for( nLauf = 0 ; nLauf < nAnz ; nLauf++ ) { if( aPool.IsSingleOp( eParam[ nLauf ], ocMissing ) ) @@ -1601,8 +1601,8 @@ void ExcelToSc::DoMulArgs( DefTokenId eId, sal_uInt8 nAnz, sal_uInt8 nMinParamCo aPool.IsSingleOp( eParam[ nSkipEnd + 1 ], ocMissing ) ) nSkipEnd++; -// fprintf (stderr, "Fn %d nSkipEnd %d nLast %d nMinParamCnt %d %d\n", -// eId, nSkipEnd, nLast, nMinParamCount, nLastRemovable); +// fprintf (stderr, "Fn %d nSkipEnd %d nLast %d nMinParamCnt %d %d\n", +// eId, nSkipEnd, nLast, nMinParamCount, nLastRemovable); // [Parameter{;Parameter}] if( nLast > nSkipEnd ) @@ -1627,29 +1627,29 @@ void ExcelToSc::ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData &rSRD, c { // C O L if( nRow & 0x4000 ) - {// rel Col + {// rel Col rSRD.SetColRel( TRUE ); rSRD.nRelCol = static_cast<SCsCOL>(static_cast<INT8>(nCol)); } else - {// abs Col + {// abs Col rSRD.SetColRel( FALSE ); rSRD.nCol = static_cast<SCCOL>(nCol); } // R O W if( nRow & 0x8000 ) - {// rel Row + {// rel Row rSRD.SetRowRel( TRUE ); - if( nRow & 0x2000 ) // Bit 13 gesetzt? - // -> Row negativ + if( nRow & 0x2000 ) // Bit 13 gesetzt? + // -> Row negativ rSRD.nRelRow = static_cast<SCsROW>(static_cast<INT16>(nRow | 0xC000)); else - // -> Row positiv + // -> Row positiv rSRD.nRelRow = static_cast<SCsROW>(nRow & nRowMask); } else - {// abs Row + {// abs Row rSRD.SetRowRel( FALSE ); rSRD.nRow = static_cast<SCROW>(nRow & nRowMask); } @@ -1684,11 +1684,11 @@ void ExcelToSc::ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData &rSRD, c const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType ) { - UINT16 nError; + UINT16 nError; aPool.Reset(); aStack.Reset(); - DefTokenId eOc; + DefTokenId eOc; switch( eType ) { @@ -1714,7 +1714,7 @@ const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType ) aPool >> aStack; - const ScTokenArray* pErgebnis = aPool[ aStack.Get() ]; + const ScTokenArray* pErgebnis = aPool[ aStack.Get() ]; if( nError ) ( ( ScTokenArray* ) pErgebnis )->SetCodeError( nError ); @@ -1728,8 +1728,8 @@ const ScTokenArray* ExcelToSc::GetBoolErr( XclBoolError eType ) // else stream pointer stays unchanged BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn, sal_Size nFormulaLen ) { - BYTE nOp; - BOOL bRet = TRUE; + BYTE nOp; + BOOL bRet = TRUE; if( nFormulaLen == 0 ) bRet = FALSE; @@ -1739,7 +1739,7 @@ BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn, aIn >> nOp; - if( nOp == 0x01 ) // Shared Formula [ 277] + if( nOp == 0x01 ) // Shared Formula [ 277] { UINT16 nCol, nRow; @@ -1770,15 +1770,15 @@ BOOL ExcelToSc::GetShrFmla( const ScTokenArray*& rpErgebnis, XclImpStream& aIn, void ExcelToSc::SetError( ScFormulaCell &rCell, const ConvErr eErr ) { - UINT16 nInd; + UINT16 nInd; switch( eErr ) { - case ConvErrNi: nInd = errUnknownToken; break; - case ConvErrNoMem: nInd = errCodeOverflow; break; - case ConvErrExternal: nInd = errNoName; break; - case ConvErrCount: nInd = errCodeOverflow; break; - default: nInd = errNoCode; // hier fiel mir nichts + case ConvErrNi: nInd = errUnknownToken; break; + case ConvErrNoMem: nInd = errCodeOverflow; break; + case ConvErrExternal: nInd = errNoName; break; + case ConvErrCount: nInd = errCodeOverflow; break; + default: nInd = errNoCode; // hier fiel mir nichts // Besseres ein... } @@ -1788,7 +1788,7 @@ void ExcelToSc::SetError( ScFormulaCell &rCell, const ConvErr eErr ) void ExcelToSc::SetComplCol( ScComplexRefData &rCRD ) { - ScSingleRefData &rSRD = rCRD.Ref2; + ScSingleRefData &rSRD = rCRD.Ref2; if( rSRD.IsColRel() ) rSRD.nRelCol = MAXCOL - aEingPos.Col(); else @@ -1798,7 +1798,7 @@ void ExcelToSc::SetComplCol( ScComplexRefData &rCRD ) void ExcelToSc::SetComplRow( ScComplexRefData &rCRD ) { - ScSingleRefData &rSRD = rCRD.Ref2; + ScSingleRefData &rSRD = rCRD.Ref2; if( rSRD.IsRowRel() ) rSRD.nRelRow = MAXROW - aEingPos.Row(); else diff --git a/sc/source/filter/excel/excform8.cxx b/sc/source/filter/excel/excform8.cxx index b542a9bdd580..e66855dadeae 100644 --- a/sc/source/filter/excel/excform8.cxx +++ b/sc/source/filter/excel/excform8.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -97,20 +97,20 @@ bool ExcelToSc8::Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLas // otherwise it will seek to the first byte past additional content after <nFormulaLen> ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT ) { - BYTE nOp, nLen, nByte; + BYTE nOp, nLen, nByte; UINT16 nUINT16; - double fDouble; - String aString; - BOOL bError = FALSE; - BOOL bArrayFormula = FALSE; - TokenId nMerk0; - const BOOL bRangeName = eFT == FT_RangeName; - const BOOL bSharedFormula = eFT == FT_SharedFormula; - const BOOL bRNorSF = bRangeName || bSharedFormula; - - ScSingleRefData aSRD; - ScComplexRefData aCRD; - ExtensionTypeVec aExtensions; + double fDouble; + String aString; + BOOL bError = FALSE; + BOOL bArrayFormula = FALSE; + TokenId nMerk0; + const BOOL bRangeName = eFT == FT_RangeName; + const BOOL bSharedFormula = eFT == FT_SharedFormula; + const BOOL bRNorSF = bRangeName || bSharedFormula; + + ScSingleRefData aSRD; + ScComplexRefData aCRD; + ExtensionTypeVec aExtensions; if( eStatus != ConvOK ) { @@ -136,91 +136,91 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aSRD.InitFlags(); aCRD.InitFlags(); - switch( nOp ) // Buch Seite: - { // SDK4 SDK5 - case 0x01: // Array Formula [325 ] - // Array Formula or Shared Formula [ 277] - case 0x02: // Data Table [325 277] + switch( nOp ) // Buch Seite: + { // SDK4 SDK5 + case 0x01: // Array Formula [325 ] + // Array Formula or Shared Formula [ 277] + case 0x02: // Data Table [325 277] aIn.Ignore( 4 ); bArrayFormula = TRUE; break; - case 0x03: // Addition [312 264] + case 0x03: // Addition [312 264] aStack >> nMerk0; aPool << aStack << ocAdd << nMerk0; aPool >> aStack; break; - case 0x04: // Subtraction [313 264] + case 0x04: // Subtraction [313 264] // SECOMD-TOP minus TOP aStack >> nMerk0; aPool << aStack << ocSub << nMerk0; aPool >> aStack; break; - case 0x05: // Multiplication [313 264] + case 0x05: // Multiplication [313 264] aStack >> nMerk0; aPool << aStack << ocMul << nMerk0; aPool >> aStack; break; - case 0x06: // Division [313 264] + case 0x06: // Division [313 264] // divide TOP by SECOND-TOP aStack >> nMerk0; aPool << aStack << ocDiv << nMerk0; aPool >> aStack; break; - case 0x07: // Exponetiation [313 265] + case 0x07: // Exponetiation [313 265] // raise SECOND-TOP to power of TOP aStack >> nMerk0; aPool << aStack << ocPow << nMerk0; aPool >> aStack; break; - case 0x08: // Concatenation [313 265] + case 0x08: // Concatenation [313 265] // append TOP to SECOND-TOP aStack >> nMerk0; aPool << aStack << ocAmpersand << nMerk0; aPool >> aStack; break; - case 0x09: // Less Than [313 265] + case 0x09: // Less Than [313 265] // SECOND-TOP < TOP aStack >> nMerk0; aPool << aStack << ocLess << nMerk0; aPool >> aStack; break; - case 0x0A: // Less Than or Equal [313 265] + case 0x0A: // Less Than or Equal [313 265] // SECOND-TOP <= TOP aStack >> nMerk0; aPool << aStack << ocLessEqual << nMerk0; aPool >> aStack; break; - case 0x0B: // Equal [313 265] + case 0x0B: // Equal [313 265] // SECOND-TOP == TOP aStack >> nMerk0; aPool << aStack << ocEqual << nMerk0; aPool >> aStack; break; - case 0x0C: // Greater Than or Equal [313 265] + case 0x0C: // Greater Than or Equal [313 265] // SECOND-TOP == TOP aStack >> nMerk0; aPool << aStack << ocGreaterEqual << nMerk0; aPool >> aStack; break; - case 0x0D: // Greater Than [313 265] + case 0x0D: // Greater Than [313 265] // SECOND-TOP == TOP aStack >> nMerk0; aPool << aStack << ocGreater << nMerk0; aPool >> aStack; break; - case 0x0E: // Not Equal [313 265] + case 0x0E: // Not Equal [313 265] // SECOND-TOP == TOP aStack >> nMerk0; aPool << aStack << ocNotEqual << nMerk0; aPool >> aStack; break; - case 0x0F: // Intersection [314 265] + case 0x0F: // Intersection [314 265] aStack >> nMerk0; aPool << aStack << ocIntersect << nMerk0; aPool >> aStack; break; - case 0x10: // Union [314 265] + case 0x10: // Union [314 265] // ocSep behelfsweise statt 'ocUnion' aStack >> nMerk0; //#100928# aPool << ocOpen << aStack << ocSep << nMerk0 << ocClose; @@ -228,54 +228,54 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, // doesn't fit exactly, but is more Excel-like aPool >> aStack; break; - case 0x11: // Range [314 265] + case 0x11: // Range [314 265] aStack >> nMerk0; aPool << aStack << ocRange << nMerk0; aPool >> aStack; break; - case 0x12: // Unary Plus [312 264] + case 0x12: // Unary Plus [312 264] aPool << ocAdd << aStack; aPool >> aStack; break; - case 0x13: // Unary Minus [312 264] + case 0x13: // Unary Minus [312 264] aPool << ocNegSub << aStack; aPool >> aStack; break; - case 0x14: // Percent Sign [312 264] + case 0x14: // Percent Sign [312 264] aPool << aStack << ocPercentSign; aPool >> aStack; break; - case 0x15: // Parenthesis [326 278] + case 0x15: // Parenthesis [326 278] aPool << ocOpen << aStack << ocClose; aPool >> aStack; break; - case 0x16: // Missing Argument [314 266] + case 0x16: // Missing Argument [314 266] aPool << ocMissing; aPool >> aStack; GetTracer().TraceFormulaMissingArg(); break; - case 0x17: // String Constant [314 266] - aIn >> nLen; // und? + case 0x17: // String Constant [314 266] + aIn >> nLen; // und? aString = aIn.ReadUniString( nLen ); // reads Grbit even if nLen==0 aStack << aPool.Store( aString ); break; - case 0x18: // natural language formula + case 0x18: // natural language formula { - UINT8 nEptg; - UINT16 nCol, nRow; + UINT8 nEptg; + UINT16 nCol, nRow; aIn >> nEptg; switch( nEptg ) - { // name size ext type - case 0x01: // Lel 4 - err + { // name size ext type + case 0x01: // Lel 4 - err aIn.Ignore( 4 ); aPool << ocBad; aPool >> aStack; break; - case 0x02: // Rw 4 - ref - case 0x03: // Col 4 - ref - case 0x06: // RwV 4 - val - case 0x07: // ColV 4 - val + case 0x02: // Rw 4 - ref + case 0x03: // Col 4 - ref + case 0x06: // RwV 4 - val + case 0x07: // ColV 4 - val aIn >> nRow >> nCol; aSRD.InitAddress( ScAddress( static_cast<SCCOL>(nCol & 0xFF), static_cast<SCROW>(nRow), aEingPos.Tab() ) ); @@ -289,7 +289,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aStack << aPool.StoreNlf( aSRD ); break; - case 0x0A: // Radical 13 - ref + case 0x0A: // Radical 13 - ref aIn >> nRow >> nCol; aIn.Ignore( 9 ); @@ -301,13 +301,13 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aStack << aPool.StoreNlf( aSRD ); break; - case 0x0B: // RadicalS 13 x ref + case 0x0B: // RadicalS 13 x ref aIn.Ignore( 13 ); aExtensions.push_back( EXTENSION_NLR ); aPool << ocBad; aPool >> aStack; break; - case 0x0C: // RwS 4 x ref + case 0x0C: // RwS 4 x ref case 0x0D: // ColS 4 x ref case 0x0E: // RwSV 4 x val case 0x0F: // ColSV 4 x val @@ -316,7 +316,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aPool << ocBad; aPool >> aStack; break; - case 0x10: // RadicalLel 4 - err + case 0x10: // RadicalLel 4 - err case 0x1D: // SxName 4 - val aIn.Ignore( 4 ); aPool << ocBad; @@ -328,7 +328,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, } } break; - case 0x19: // Special Attribute [327 279] + case 0x19: // Special Attribute [327 279] { UINT16 nData, nFakt; BYTE nOpt; @@ -337,19 +337,19 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, nFakt = 2; if( nOpt & 0x04 ) - {// nFakt -> Bytes oder Words ueberlesen AttrChoose + {// nFakt -> Bytes oder Words ueberlesen AttrChoose nData++; aIn.Ignore( nData * nFakt ); } - else if( nOpt & 0x10 ) // AttrSum + else if( nOpt & 0x10 ) // AttrSum DoMulArgs( ocSum, 1 ); } break; - case 0x1C: // Error Value [314 266] + case 0x1C: // Error Value [314 266] { aIn >> nByte; - DefTokenId eOc; + DefTokenId eOc; switch( nByte ) { case EXC_ERR_NULL: @@ -367,7 +367,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aPool >> aStack; } break; - case 0x1D: // Boolean [315 266] + case 0x1D: // Boolean [315 266] aIn >> nByte; if( nByte == 0 ) aPool << ocFalse << ocOpen << ocClose; @@ -375,17 +375,17 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aPool << ocTrue << ocOpen << ocClose; aPool >> aStack; break; - case 0x1E: // Integer [315 266] + case 0x1E: // Integer [315 266] aIn >> nUINT16; aStack << aPool.Store( ( double ) nUINT16 ); break; - case 0x1F: // Number [315 266] + case 0x1F: // Number [315 266] aIn >> fDouble; aStack << aPool.Store( fDouble ); break; case 0x40: case 0x60: - case 0x20: // Array Constant [317 268] + case 0x20: // Array Constant [317 268] aIn >> nByte >> nUINT16; aIn.Ignore( 4 ); if( bAllowArrays ) @@ -401,7 +401,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x41: case 0x61: - case 0x21: // Function, Fixed Number of Arguments [333 282] + case 0x21: // Function, Fixed Number of Arguments [333 282] { sal_uInt16 nXclFunc; aIn >> nXclFunc; @@ -413,7 +413,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x42: case 0x62: - case 0x22: // Function, Variable Number of Arg. [333 283] + case 0x22: // Function, Variable Number of Arg. [333 283] { sal_uInt16 nXclFunc; sal_uInt8 nParamCount; @@ -427,7 +427,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x43: case 0x63: - case 0x23: // Name [318 269] + case 0x23: // Name [318 269] aIn >> nUINT16; { aIn.Ignore( 2 ); @@ -441,12 +441,12 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x44: case 0x64: - case 0x24: // Cell Reference [319 270] + case 0x24: // Cell Reference [319 270] case 0x4A: case 0x6A: - case 0x2A: // Deleted Cell Reference [323 273] + case 0x2A: // Deleted Cell Reference [323 273] { - UINT16 nCol, nRow; + UINT16 nCol, nRow; aIn >> nRow >> nCol; @@ -462,7 +462,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, { case 0x4A: case 0x6A: - case 0x2A: // Deleted Cell Reference [323 273] + case 0x2A: // Deleted Cell Reference [323 273] // no information which part is deleted, set both aSRD.SetColDeleted( TRUE ); aSRD.SetRowDeleted( TRUE ); @@ -473,15 +473,15 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x45: case 0x65: - case 0x25: // Area Reference [320 270] + case 0x25: // Area Reference [320 270] case 0x4B: case 0x6B: - case 0x2B: // Deleted Area Refernce [323 273] + case 0x2B: // Deleted Area Refernce [323 273] { - UINT16 nRowFirst, nRowLast; - UINT16 nColFirst, nColLast; - ScSingleRefData &rSRef1 = aCRD.Ref1; - ScSingleRefData &rSRef2 = aCRD.Ref2; + UINT16 nRowFirst, nRowLast; + UINT16 nColFirst, nColLast; + ScSingleRefData &rSRef1 = aCRD.Ref1; + ScSingleRefData &rSRef2 = aCRD.Ref2; aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast; @@ -503,7 +503,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, { case 0x4B: case 0x6B: - case 0x2B: // Deleted Area Refernce [323 273] + case 0x2B: // Deleted Area Refernce [323 273] // no information which part is deleted, set all rSRef1.SetColDeleted( TRUE ); rSRef1.SetRowDeleted( TRUE ); @@ -516,13 +516,13 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x46: case 0x66: - case 0x26: // Constant Reference Subexpression [321 271] + case 0x26: // Constant Reference Subexpression [321 271] aExtensions.push_back( EXTENSION_MEMAREA ); aIn.Ignore( 6 ); // mehr steht da nicht! break; case 0x47: case 0x67: - case 0x27: // Erroneous Constant Reference Subexpr. [322 272] + case 0x27: // Erroneous Constant Reference Subexpr. [322 272] aIn.Ignore( 6 ); // mehr steht da nicht! // aPool << ocBad; // aPool >> aStack; @@ -536,15 +536,15 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x49: case 0x69: - case 0x29: // Variable Reference Subexpression [331 281] + case 0x29: // Variable Reference Subexpression [331 281] aIn.Ignore( 2 ); // mehr steht da nicht! break; case 0x4C: case 0x6C: - case 0x2C: // Cell Reference Within a Name [323 ] + case 0x2C: // Cell Reference Within a Name [323 ] // Cell Reference Within a Shared Formula[ 273] { - UINT16 nRow, nCol; + UINT16 nRow, nCol; aIn >> nRow >> nCol; @@ -559,10 +559,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x4D: case 0x6D: - case 0x2D: // Area Reference Within a Name [324 ] - { // Area Reference Within a Shared Formula[ 274] - UINT16 nRowFirst, nRowLast; - UINT16 nColFirst, nColLast; + case 0x2D: // Area Reference Within a Name [324 ] + { // Area Reference Within a Shared Formula[ 274] + UINT16 nRowFirst, nRowLast; + UINT16 nColFirst, nColLast; aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0; aCRD.Ref1.SetTabRel( TRUE ); @@ -585,21 +585,21 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x4E: case 0x6E: - case 0x2E: // Reference Subexpression Within a Name [332 282] + case 0x2E: // Reference Subexpression Within a Name [332 282] aIn.Ignore( 2 ); // mehr steht da nicht! // aPool << ocBad; // aPool >> aStack; break; case 0x4F: case 0x6F: - case 0x2F: // Incomplete Reference Subexpression... [332 282] + case 0x2F: // Incomplete Reference Subexpression... [332 282] aIn.Ignore( 2 ); // mehr steht da nicht! // aPool << ocBad; // aPool >> aStack; break; case 0x58: case 0x78: - case 0x38: // Command-Equivalent Function [333 ] + case 0x38: // Command-Equivalent Function [333 ] aString.AssignAscii( "COMM_EQU_FUNC" ); aIn >> nByte; aString += String::CreateFromInt32( nByte ); @@ -609,7 +609,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x59: case 0x79: - case 0x39: // Name or External Name [ 275] + case 0x39: // Name or External Name [ 275] { sal_uInt16 nXtiIndex, nNameIdx; aIn >> nXtiIndex >> nNameIdx; @@ -695,10 +695,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x5A: case 0x7A: - case 0x3A: // 3-D Cell Reference [ 275] + case 0x3A: // 3-D Cell Reference [ 275] case 0x5C: case 0x7C: - case 0x3C: // Deleted 3-D Cell Reference [ 277] + case 0x3C: // Deleted 3-D Cell Reference [ 277] { UINT16 nIxti, nRw, nGrbitCol; SCTAB nTabFirst, nTabLast; @@ -723,7 +723,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, { case 0x5C: case 0x7C: - case 0x3C: // Deleted 3-D Cell Reference [ 277] + case 0x3C: // Deleted 3-D Cell Reference [ 277] // no information which part is deleted, set both aSRD.SetColDeleted( TRUE ); aSRD.SetRowDeleted( TRUE ); @@ -765,10 +765,10 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, break; case 0x5B: case 0x7B: - case 0x3B: // 3-D Area Reference [ 276] + case 0x3B: // 3-D Area Reference [ 276] case 0x5D: case 0x7D: - case 0x3D: // Deleted 3-D Area Reference [ 277] + case 0x3D: // Deleted 3-D Area Reference [ 277] { UINT16 nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2; SCTAB nTabFirst, nTabLast; @@ -781,8 +781,8 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, aPool >> aStack; break; } - ScSingleRefData &rR1 = aCRD.Ref1; - ScSingleRefData &rR2 = aCRD.Ref2; + ScSingleRefData &rR1 = aCRD.Ref1; + ScSingleRefData &rR2 = aCRD.Ref2; rR1.nTab = nTabFirst; @@ -804,7 +804,7 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, { case 0x5D: case 0x7D: - case 0x3D: // Deleted 3-D Area Reference [ 277] + case 0x3D: // Deleted 3-D Area Reference [ 277] // no information which part is deleted, set all rR1.SetColDeleted( TRUE ); rR1.SetRowDeleted( TRUE ); @@ -872,15 +872,15 @@ ConvErr ExcelToSc8::Convert( const ScTokenArray*& rpTokArray, XclImpStream& aIn, ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sal_Size nFormulaLen, SCsTAB nTab, const FORMULA_TYPE eFT ) { - BYTE nOp, nLen;//, nByte; - BOOL bError = FALSE; - BOOL bArrayFormula = FALSE; - const BOOL bRangeName = eFT == FT_RangeName; - const BOOL bSharedFormula = eFT == FT_SharedFormula; - const BOOL bRNorSF = bRangeName || bSharedFormula; - - ScSingleRefData aSRD; - ScComplexRefData aCRD; + BYTE nOp, nLen;//, nByte; + BOOL bError = FALSE; + BOOL bArrayFormula = FALSE; + const BOOL bRangeName = eFT == FT_RangeName; + const BOOL bSharedFormula = eFT == FT_SharedFormula; + const BOOL bRNorSF = bRangeName || bSharedFormula; + + ScSingleRefData aSRD; + ScComplexRefData aCRD; bExternName = FALSE; @@ -903,44 +903,44 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa aSRD.InitFlags(); aCRD.InitFlags(); - switch( nOp ) // Buch Seite: - { // SDK4 SDK5 - case 0x01: // Array Formula [325 ] - // Array Formula or Shared Formula [ 277] + switch( nOp ) // Buch Seite: + { // SDK4 SDK5 + case 0x01: // Array Formula [325 ] + // Array Formula or Shared Formula [ 277] aIn.Ignore( 4 ); bArrayFormula = TRUE; break; - case 0x02: // Data Table [325 277] + case 0x02: // Data Table [325 277] aIn.Ignore( 4 ); break; - case 0x03: // Addition [312 264] - case 0x04: // Subtraction [313 264] - case 0x05: // Multiplication [313 264] - case 0x06: // Division [313 264] - case 0x07: // Exponetiation [313 265] - case 0x08: // Concatenation [313 265] - case 0x09: // Less Than [313 265] - case 0x0A: // Less Than or Equal [313 265] - case 0x0B: // Equal [313 265] - case 0x0C: // Greater Than or Equal [313 265] - case 0x0D: // Greater Than [313 265] - case 0x0E: // Not Equal [313 265] - case 0x0F: // Intersection [314 265] - case 0x10: // Union [314 265] - case 0x11: // Range [314 265] - case 0x12: // Unary Plus [312 264] - case 0x13: // Unary Minus [312 264] - case 0x14: // Percent Sign [312 264] - case 0x15: // Parenthesis [326 278] - case 0x16: // Missing Argument [314 266] - break; - case 0x17: // String Constant [314 266] - aIn >> nLen; // und? - - aIn.IgnoreUniString( nLen ); // reads Grbit even if nLen==0 - break; - case 0x19: // Special Attribute [327 279] + case 0x03: // Addition [312 264] + case 0x04: // Subtraction [313 264] + case 0x05: // Multiplication [313 264] + case 0x06: // Division [313 264] + case 0x07: // Exponetiation [313 265] + case 0x08: // Concatenation [313 265] + case 0x09: // Less Than [313 265] + case 0x0A: // Less Than or Equal [313 265] + case 0x0B: // Equal [313 265] + case 0x0C: // Greater Than or Equal [313 265] + case 0x0D: // Greater Than [313 265] + case 0x0E: // Not Equal [313 265] + case 0x0F: // Intersection [314 265] + case 0x10: // Union [314 265] + case 0x11: // Range [314 265] + case 0x12: // Unary Plus [312 264] + case 0x13: // Unary Minus [312 264] + case 0x14: // Percent Sign [312 264] + case 0x15: // Parenthesis [326 278] + case 0x16: // Missing Argument [314 266] + break; + case 0x17: // String Constant [314 266] + aIn >> nLen; // und? + + aIn.IgnoreUniString( nLen ); // reads Grbit even if nLen==0 + break; + case 0x19: // Special Attribute [327 279] { UINT16 nData, nFakt; BYTE nOpt; @@ -949,47 +949,47 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa nFakt = 2; if( nOpt & 0x04 ) - {// nFakt -> Bytes oder Words ueberlesen AttrChoose + {// nFakt -> Bytes oder Words ueberlesen AttrChoose nData++; aIn.Ignore( nData * nFakt ); } } break; - case 0x1C: // Error Value [314 266] - case 0x1D: // Boolean [315 266] + case 0x1C: // Error Value [314 266] + case 0x1D: // Boolean [315 266] aIn.Ignore( 1 ); break; - case 0x1E: // Integer [315 266] + case 0x1E: // Integer [315 266] aIn.Ignore( 2 ); break; - case 0x1F: // Number [315 266] + case 0x1F: // Number [315 266] aIn.Ignore( 8 ); break; case 0x40: case 0x60: - case 0x20: // Array Constant [317 268] + case 0x20: // Array Constant [317 268] aIn.Ignore( 7 ); break; case 0x41: case 0x61: - case 0x21: // Function, Fixed Number of Arguments [333 282] + case 0x21: // Function, Fixed Number of Arguments [333 282] aIn.Ignore( 2 ); break; case 0x42: case 0x62: - case 0x22: // Function, Variable Number of Arg. [333 283] + case 0x22: // Function, Variable Number of Arg. [333 283] aIn.Ignore( 3 ); break; case 0x43: case 0x63: - case 0x23: // Name [318 269] + case 0x23: // Name [318 269] aIn.Ignore( 4 ); break; case 0x44: case 0x64: - case 0x24: // Cell Reference [319 270] + case 0x24: // Cell Reference [319 270] { - UINT16 nCol, nRow; + UINT16 nCol, nRow; aIn >> nRow >> nCol; @@ -1006,12 +1006,12 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa break; case 0x45: case 0x65: - case 0x25: // Area Reference [320 270] + case 0x25: // Area Reference [320 270] { - UINT16 nRowFirst, nRowLast; - UINT16 nColFirst, nColLast; - ScSingleRefData &rSRef1 = aCRD.Ref1; - ScSingleRefData &rSRef2 = aCRD.Ref2; + UINT16 nRowFirst, nRowLast; + UINT16 nColFirst, nColLast; + ScSingleRefData &rSRef1 = aCRD.Ref1; + ScSingleRefData &rSRef2 = aCRD.Ref2; aIn >> nRowFirst >> nRowLast >> nColFirst >> nColLast; @@ -1034,10 +1034,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa break; case 0x46: case 0x66: - case 0x26: // Constant Reference Subexpression [321 271] + case 0x26: // Constant Reference Subexpression [321 271] case 0x47: case 0x67: - case 0x27: // Erroneous Constant Reference Subexpr. [322 272] + case 0x27: // Erroneous Constant Reference Subexpr. [322 272] case 0x48: case 0x68: case 0x28: // Incomplete Constant Reference Subexpr.[331 281] @@ -1045,25 +1045,25 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa break; case 0x49: case 0x69: - case 0x29: // Variable Reference Subexpression [331 281] + case 0x29: // Variable Reference Subexpression [331 281] aIn.Ignore( 2 ); // mehr steht da nicht! break; case 0x4A: case 0x6A: - case 0x2A: // Deleted Cell Reference [323 273] + case 0x2A: // Deleted Cell Reference [323 273] aIn.Ignore( 3 ); break; case 0x4B: case 0x6B: - case 0x2B: // Deleted Area Refernce [323 273] + case 0x2B: // Deleted Area Refernce [323 273] aIn.Ignore( 6 ); break; case 0x4C: case 0x6C: - case 0x2C: // Cell Reference Within a Name [323 ] + case 0x2C: // Cell Reference Within a Name [323 ] // Cell Reference Within a Shared Formula[ 273] { - UINT16 nRow, nCol; + UINT16 nRow, nCol; aIn >> nRow >> nCol; @@ -1078,10 +1078,10 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa break; case 0x4D: case 0x6D: - case 0x2D: // Area Reference Within a Name [324 ] - { // Area Reference Within a Shared Formula[ 274] - UINT16 nRowFirst, nRowLast; - UINT16 nColFirst, nColLast; + case 0x2D: // Area Reference Within a Name [324 ] + { // Area Reference Within a Shared Formula[ 274] + UINT16 nRowFirst, nRowLast; + UINT16 nColFirst, nColLast; aCRD.Ref1.nRelTab = aCRD.Ref2.nRelTab = 0; aCRD.Ref1.SetTabRel( TRUE ); @@ -1104,25 +1104,25 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa break; case 0x4E: case 0x6E: - case 0x2E: // Reference Subexpression Within a Name [332 282] + case 0x2E: // Reference Subexpression Within a Name [332 282] case 0x4F: case 0x6F: - case 0x2F: // Incomplete Reference Subexpression... [332 282] + case 0x2F: // Incomplete Reference Subexpression... [332 282] case 0x58: case 0x78: - case 0x38: // Command-Equivalent Function [333 ] + case 0x38: // Command-Equivalent Function [333 ] aIn.Ignore( 2 ); break; case 0x59: case 0x79: - case 0x39: // Name or External Name [ 275] + case 0x39: // Name or External Name [ 275] aIn.Ignore( 24 ); break; case 0x5A: case 0x7A: - case 0x3A: // 3-D Cell Reference [ 275] + case 0x3A: // 3-D Cell Reference [ 275] { - UINT16 nIxti, nRw, nGrbitCol; + UINT16 nIxti, nRw, nGrbitCol; aIn >> nIxti >> nRw >> nGrbitCol; @@ -1150,17 +1150,17 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa break; case 0x5B: case 0x7B: - case 0x3B: // 3-D Area Reference [ 276] + case 0x3B: // 3-D Area Reference [ 276] { - UINT16 nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2; + UINT16 nIxti, nRw1, nGrbitCol1, nRw2, nGrbitCol2; aIn >> nIxti >> nRw1 >> nRw2 >> nGrbitCol1 >> nGrbitCol2; SCTAB nFirstScTab, nLastScTab; if( rLinkMan.GetScTabRange( nFirstScTab, nLastScTab, nIxti ) ) { - ScSingleRefData &rR1 = aCRD.Ref1; - ScSingleRefData &rR2 = aCRD.Ref2; + ScSingleRefData &rR1 = aCRD.Ref1; + ScSingleRefData &rR2 = aCRD.Ref2; rR1.nTab = nFirstScTab; rR2.nTab = nLastScTab; @@ -1183,12 +1183,12 @@ ConvErr ExcelToSc8::Convert( _ScRangeListTabs& rRangeList, XclImpStream& aIn, sa break; case 0x5C: case 0x7C: - case 0x3C: // Deleted 3-D Cell Reference [ 277] + case 0x3C: // Deleted 3-D Cell Reference [ 277] aIn.Ignore( 6 ); break; case 0x5D: case 0x7D: - case 0x3D: // Deleted 3-D Area Reference [ 277] + case 0x3D: // Deleted 3-D Area Reference [ 277] aIn.Ignore( 10 ); break; default: @@ -1364,9 +1364,9 @@ ConvErr ExcelToSc8::ConvertExternName( const ScTokenArray*& rpArray, XclImpStrea void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD, const BOOL bName ) { - const BOOL bColRel = ( nC & 0x4000 ) != 0; - const BOOL bRowRel = ( nC & 0x8000 ) != 0; - const UINT8 nCol = static_cast<UINT8>(nC); + const BOOL bColRel = ( nC & 0x4000 ) != 0; + const BOOL bRowRel = ( nC & 0x8000 ) != 0; + const UINT8 nCol = static_cast<UINT8>(nC); rSRD.SetColRel( bColRel ); rSRD.SetRowRel( bRowRel ); @@ -1375,18 +1375,18 @@ void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD, { // C O L if( bColRel ) - // rel Col + // rel Col rSRD.nRelCol = static_cast<SCsCOL>(static_cast<INT8>(nC)); else - // abs Col + // abs Col rSRD.nCol = static_cast<SCCOL>(nCol); // R O W if( bRowRel ) - // rel Row + // rel Row rSRD.nRelRow = static_cast<SCsROW>(static_cast<INT16>(nRow)); else - // abs Row + // abs Row rSRD.nRow = Min( static_cast<SCROW>(nRow), MAXROW); // T A B @@ -1419,10 +1419,10 @@ void ExcelToSc8::ExcRelToScRel8( UINT16 nRow, UINT16 nC, ScSingleRefData &rSRD, // stream seeks to first byte after <nLen> BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) { - UINT8 nOp; - UINT16 nRow1, nRow2, nCol1, nCol2; + UINT8 nOp; + UINT16 nRow1, nRow2, nCol1, nCol2; SCTAB nTab1, nTab2; - UINT16 nIxti; + UINT16 nIxti; sal_Size nSeek; @@ -1437,10 +1437,10 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) { case 0x44: case 0x64: - case 0x24: // Cell Reference [319 270] + case 0x24: // Cell Reference [319 270] case 0x4C: case 0x6C: - case 0x2C: // Cell Reference Within a Name [323 ] + case 0x2C: // Cell Reference Within a Name [323 ] // Cell Reference Within a Shared Formula[ 273] aIn >> nRow1 >> nCol1; @@ -1450,10 +1450,10 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) goto _common; case 0x45: case 0x65: - case 0x25: // Area Reference [320 270] + case 0x25: // Area Reference [320 270] case 0x4D: case 0x6D: - case 0x2D: // Area Reference Within a Name [324 ] + case 0x2D: // Area Reference Within a Name [324 ] // Area Reference Within a Shared Formula[ 274] aIn >> nRow1 >> nRow2 >> nCol1 >> nCol2; @@ -1461,7 +1461,7 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) goto _common; case 0x5A: case 0x7A: - case 0x3A: // 3-D Cell Reference [ 275] + case 0x3A: // 3-D Cell Reference [ 275] aIn >> nIxti >> nRow1 >> nCol1; nRow2 = nRow1; @@ -1470,7 +1470,7 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) goto _3d_common; case 0x5B: case 0x7B: - case 0x3B: // 3-D Area Reference [ 276] + case 0x3B: // 3-D Area Reference [ 276] aIn >> nIxti >> nRow1 >> nRow2 >> nCol1 >> nCol2; _3d_common: @@ -1490,55 +1490,55 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) r.Append( aScRange ); } break; - case 0x1C: // Error Value [314 266] - case 0x1D: // Boolean [315 266] + case 0x1C: // Error Value [314 266] + case 0x1D: // Boolean [315 266] nSeek = 1; break; - case 0x1E: // Integer [315 266] + case 0x1E: // Integer [315 266] case 0x41: case 0x61: - case 0x21: // Function, Fixed Number of Arguments [333 282] + case 0x21: // Function, Fixed Number of Arguments [333 282] case 0x49: case 0x69: - case 0x29: // Variable Reference Subexpression [331 281] + case 0x29: // Variable Reference Subexpression [331 281] case 0x4E: case 0x6E: - case 0x2E: // Reference Subexpression Within a Name [332 282] + case 0x2E: // Reference Subexpression Within a Name [332 282] case 0x4F: case 0x6F: - case 0x2F: // Incomplete Reference Subexpression... [332 282] + case 0x2F: // Incomplete Reference Subexpression... [332 282] case 0x58: case 0x78: - case 0x38: // Command-Equivalent Function [333 ] + case 0x38: // Command-Equivalent Function [333 ] nSeek = 2; break; case 0x42: case 0x62: - case 0x22: // Function, Variable Number of Arg. [333 283] + case 0x22: // Function, Variable Number of Arg. [333 283] nSeek = 3; break; - case 0x01: // Array Formula [325 ] - case 0x02: // Data Table [325 277] + case 0x01: // Array Formula [325 ] + case 0x02: // Data Table [325 277] case 0x43: case 0x63: - case 0x23: // Name [318 269] + case 0x23: // Name [318 269] case 0x4A: case 0x6A: - case 0x2A: // Deleted Cell Reference [323 273] + case 0x2A: // Deleted Cell Reference [323 273] nSeek = 4; break; case 0x46: case 0x66: - case 0x26: // Constant Reference Subexpression [321 271] + case 0x26: // Constant Reference Subexpression [321 271] case 0x47: case 0x67: - case 0x27: // Erroneous Constant Reference Subexpr. [322 272] + case 0x27: // Erroneous Constant Reference Subexpr. [322 272] case 0x48: case 0x68: case 0x28: // Incomplete Constant Reference Subexpr.[331 281] case 0x5C: case 0x7C: - case 0x3C: // Deleted 3-D Cell Reference [ 277] + case 0x3C: // Deleted 3-D Cell Reference [ 277] case 0x59: case 0x79: case 0x39: // Name or External Name [ 275] @@ -1546,21 +1546,21 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) break; case 0x40: case 0x60: - case 0x20: // Array Constant [317 268] + case 0x20: // Array Constant [317 268] nSeek = 7; break; - case 0x1F: // Number [315 266] + case 0x1F: // Number [315 266] case 0x4B: case 0x6B: - case 0x2B: // Deleted Area Refernce [323 273] + case 0x2B: // Deleted Area Refernce [323 273] nSeek = 8; break; case 0x5D: case 0x7D: - case 0x3D: // Deleted 3-D Area Reference [ 277] + case 0x3D: // Deleted 3-D Area Reference [ 277] nSeek = 10; break; - case 0x17: // String Constant [314 266] + case 0x17: // String Constant [314 266] { UINT8 nStrLen; aIn >> nStrLen; @@ -1568,13 +1568,13 @@ BOOL ExcelToSc8::GetAbsRefs( ScRangeList& r, XclImpStream& aIn, sal_Size nLen ) nSeek = 0; } break; - case 0x19: // Special Attribute [327 279] + case 0x19: // Special Attribute [327 279] { - UINT16 nData; - UINT8 nOpt; + UINT16 nData; + UINT8 nOpt; aIn >> nOpt >> nData; if( nOpt & 0x04 ) - {// nFakt -> Bytes oder Words ueberlesen AttrChoose + {// nFakt -> Bytes oder Words ueberlesen AttrChoose nData++; nSeek = nData * 2; } diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx index 92eb3b565666..7f2a772dccbb 100644 --- a/sc/source/filter/excel/excimp8.cxx +++ b/sc/source/filter/excel/excimp8.cxx @@ -131,7 +131,7 @@ ImportExcel8::~ImportExcel8() void ImportExcel8::Calccount( void ) { - ScDocOptions aOpt = pD->GetDocOptions(); + ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIterCount( aIn.ReaduInt16() ); pD->SetDocOptions( aOpt ); } @@ -147,7 +147,7 @@ void ImportExcel8::Precision( void ) void ImportExcel8::Delta( void ) { - ScDocOptions aOpt = pD->GetDocOptions(); + ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIterEps( aIn.ReadDouble() ); pD->SetDocOptions( aOpt ); } @@ -155,7 +155,7 @@ void ImportExcel8::Delta( void ) void ImportExcel8::Iteration( void ) { - ScDocOptions aOpt = pD->GetDocOptions(); + ScDocOptions aOpt = pD->GetDocOptions(); aOpt.SetIter( aIn.ReaduInt16() == 1 ); pD->SetDocOptions( aOpt ); } @@ -163,8 +163,8 @@ void ImportExcel8::Iteration( void ) void ImportExcel8::Boundsheet( void ) { - UINT8 nLen; - UINT16 nGrbit; + UINT8 nLen; + UINT16 nGrbit; aIn.DisableDecryption(); maSheetOffsets.push_back( aIn.ReaduInt32() ); @@ -196,7 +196,7 @@ void ImportExcel8::Boundsheet( void ) void ImportExcel8::Scenman( void ) { - UINT16 nLastDispl; + UINT16 nLastDispl; aIn.Ignore( 4 ); aIn >> nLastDispl; @@ -302,7 +302,7 @@ void ImportExcel8::PostDocLoad( void ) // Scenarien bemachen! ACHTUNG: Hier wird Tabellen-Anzahl im Dokument erhoeht!! if( !pD->IsClipboard() && aScenList.Count() ) { - pD->UpdateChartListenerCollection(); // references in charts must be updated + pD->UpdateChartListenerCollection(); // references in charts must be updated aScenList.Apply( GetRoot() ); } @@ -415,8 +415,8 @@ void XclImpAutoFilterData::InsertQueryParam() { if( pCurrDBData && !bHasConflict ) { - ScRange aAdvRange; - BOOL bHasAdv = pCurrDBData->GetAdvancedQuerySource( aAdvRange ); + ScRange aAdvRange; + BOOL bHasAdv = pCurrDBData->GetAdvancedQuerySource( aAdvRange ); if( bHasAdv ) pExcRoot->pIR->GetDoc().CreateQueryParam( aAdvRange.aStart.Col(), aAdvRange.aStart.Row(), aAdvRange.aEnd.Col(), aAdvRange.aEnd.Row(), @@ -474,8 +474,8 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm ) BOOL bTop10 = ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); BOOL bTopOfTop10 = ::get_flag( nFlags, EXC_AFFLAG_TOP10TOP ); BOOL bPercent = ::get_flag( nFlags, EXC_AFFLAG_TOP10PERC ); - UINT16 nCntOfTop10 = nFlags >> 7; - SCSIZE nCount = aParam.GetEntryCount(); + UINT16 nCntOfTop10 = nFlags >> 7; + SCSIZE nCount = aParam.GetEntryCount(); if( bTop10 ) { @@ -496,12 +496,12 @@ void XclImpAutoFilterData::ReadAutoFilter( XclImpStream& rStrm ) } else { - UINT8 nE, nType, nOper, nBoolErr, nVal; + UINT8 nE, nType, nOper, nBoolErr, nVal; INT32 nRK; - double fVal; - BOOL bIgnore; + double fVal; + BOOL bIgnore; - UINT8 nStrLen[ 2 ] = { 0, 0 }; + UINT8 nStrLen[ 2 ] = { 0, 0 }; ScQueryEntry *pQueryEntries[ 2 ] = { NULL, NULL }; for( nE = 0; nE < 2; nE++ ) @@ -658,7 +658,7 @@ void XclImpAutoFilterData::CreateScDBData( const BOOL bUseUnNamed ) if( bActive || bCriteria) { ScDBCollection& rColl = pExcRoot->pIR->GetDatabaseRanges(); - pCurrDBData = rColl.GetDBAtArea( Tab(), StartCol(), StartRow(), EndCol(), EndRow() ); + pCurrDBData = rColl.GetDBAtArea( Tab(), StartCol(), StartRow(), EndCol(), EndRow() ); if( !pCurrDBData ) { AmendAFName(bUseUnNamed); diff --git a/sc/source/filter/excel/excrecds.cxx b/sc/source/filter/excel/excrecds.cxx index 04ce6cd050cf..469e549c5194 100644 --- a/sc/source/filter/excel/excrecds.cxx +++ b/sc/source/filter/excel/excrecds.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,7 +105,7 @@ using ::com::sun::star::uno::Sequence; using ::rtl::OString; //--------------------------------------------------------- class ExcDummy_00 - -const BYTE ExcDummy_00::pMyData[] = { +const BYTE ExcDummy_00::pMyData[] = { 0x5c, 0x00, 0x20, 0x00, 0x04, 'C', 'a', 'l', 'c', // WRITEACCESS 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, @@ -114,25 +114,25 @@ const BYTE ExcDummy_00::pMyData[] = { const sal_Size ExcDummy_00::nMyLen = sizeof( ExcDummy_00::pMyData ); //-------------------------------------------------------- class ExcDummy_04x - -const BYTE ExcDummy_040::pMyData[] = { - 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP - 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00, // HIDEOBJ +const BYTE ExcDummy_040::pMyData[] = { + 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP + 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00, // HIDEOBJ }; const sal_Size ExcDummy_040::nMyLen = sizeof( ExcDummy_040::pMyData ); -const BYTE ExcDummy_041::pMyData[] = { - 0x0e, 0x00, 0x02, 0x00, 0x01, 0x00, // PRECISION - 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL +const BYTE ExcDummy_041::pMyData[] = { + 0x0e, 0x00, 0x02, 0x00, 0x01, 0x00, // PRECISION + 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL }; const sal_Size ExcDummy_041::nMyLen = sizeof( ExcDummy_041::pMyData ); //-------------------------------------------------------- class ExcDummy_02a - const BYTE ExcDummy_02a::pMyData[] = { - 0x0d, 0x00, 0x02, 0x00, 0x01, 0x00, // CALCMODE - 0x0c, 0x00, 0x02, 0x00, 0x64, 0x00, // CALCCOUNT - 0x0f, 0x00, 0x02, 0x00, 0x01, 0x00, // REFMODE - 0x11, 0x00, 0x02, 0x00, 0x00, 0x00, // ITERATION - 0x10, 0x00, 0x08, 0x00, 0xfc, 0xa9, 0xf1, 0xd2, 0x4d, // DELTA + 0x0d, 0x00, 0x02, 0x00, 0x01, 0x00, // CALCMODE + 0x0c, 0x00, 0x02, 0x00, 0x64, 0x00, // CALCCOUNT + 0x0f, 0x00, 0x02, 0x00, 0x01, 0x00, // REFMODE + 0x11, 0x00, 0x02, 0x00, 0x00, 0x00, // ITERATION + 0x10, 0x00, 0x08, 0x00, 0xfc, 0xa9, 0xf1, 0xd2, 0x4d, // DELTA 0x62, 0x50, 0x3f, 0x5f, 0x00, 0x02, 0x00, 0x01, 0x00 // SAVERECALC }; @@ -231,8 +231,8 @@ sal_Size ExcBoolRecord::GetLen( void ) const //--------------------------------------------------------- class ExcBof_Base - ExcBof_Base::ExcBof_Base() : - nRupBuild( 0x096C ), // copied from Excel - nRupYear( 0x07C9 ) // copied from Excel + nRupBuild( 0x096C ), // copied from Excel + nRupYear( 0x07C9 ) // copied from Excel { } @@ -441,9 +441,9 @@ ExcBundlesheet::ExcBundlesheet( RootData& rRootData, SCTAB _nTab ) : void ExcBundlesheet::SaveCont( XclExpStream& rStrm ) { nOwnPos = rStrm.GetSvStreamPos(); - rStrm << (UINT32) 0x00000000 // dummy (stream position of the sheet) + rStrm << (UINT32) 0x00000000 // dummy (stream position of the sheet) << nGrbit; - rStrm.WriteByteString( aName ); // 8 bit length, max 255 chars + rStrm.WriteByteString( aName ); // 8 bit length, max 255 chars } @@ -702,8 +702,8 @@ BOOL XclExpAutofilter::AddCondition( ScQueryConnect eConn, UINT8 nType, UINT8 nO BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) { - BOOL bConflict = FALSE; - String sText; + BOOL bConflict = FALSE; + String sText; if( rEntry.pStr ) { @@ -742,10 +742,10 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) // other conditions else { - double fVal = 0.0; - sal_uInt32 nIndex = 0; + double fVal = 0.0; + sal_uInt32 nIndex = 0; BOOL bIsNum = bLen ? GetFormatter().IsNumberFormat( sText, nIndex, fVal ) : TRUE; - String* pText = bIsNum ? NULL : &sText; + String* pText = bIsNum ? NULL : &sText; // top10 flags UINT16 nNewFlags = 0x0000; @@ -772,8 +772,8 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) { if( bNewTop10 ) { - if( fVal < 0 ) fVal = 0; - if( fVal >= 501 ) fVal = 500; + if( fVal < 0 ) fVal = 0; + if( fVal >= 501 ) fVal = 500; nFlags |= (nNewFlags | (UINT16)(fVal) << 7); } // normal condition @@ -784,12 +784,12 @@ BOOL XclExpAutofilter::AddEntry( const ScQueryEntry& rEntry ) switch( rEntry.eOp ) { - case SC_EQUAL: nOper = EXC_AFOPER_EQUAL; break; - case SC_LESS: nOper = EXC_AFOPER_LESS; break; - case SC_GREATER: nOper = EXC_AFOPER_GREATER; break; - case SC_LESS_EQUAL: nOper = EXC_AFOPER_LESSEQUAL; break; - case SC_GREATER_EQUAL: nOper = EXC_AFOPER_GREATEREQUAL; break; - case SC_NOT_EQUAL: nOper = EXC_AFOPER_NOTEQUAL; break; + case SC_EQUAL: nOper = EXC_AFOPER_EQUAL; break; + case SC_LESS: nOper = EXC_AFOPER_LESS; break; + case SC_GREATER: nOper = EXC_AFOPER_GREATER; break; + case SC_LESS_EQUAL: nOper = EXC_AFOPER_LESSEQUAL; break; + case SC_GREATER_EQUAL: nOper = EXC_AFOPER_GREATEREQUAL; break; + case SC_NOT_EQUAL: nOper = EXC_AFOPER_NOTEQUAL; break; case SC_CONTAINS: case SC_BEGINS_WITH: case SC_ENDS_WITH: @@ -862,11 +862,11 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : XclExpNameManager& rNameMgr = GetNameManager(); // search for first DB-range with filter - UINT16 nIndex = 0; - BOOL bFound = FALSE; - BOOL bAdvanced = FALSE; - ScDBData* pData = NULL; - ScRange aAdvRange; + UINT16 nIndex = 0; + BOOL bFound = FALSE; + BOOL bAdvanced = FALSE; + ScDBData* pData = NULL; + ScRange aAdvRange; while( (nIndex < rDBColl.GetCount()) && !bFound ) { pData = rDBColl[ nIndex ]; @@ -884,12 +884,12 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : if( pData && bFound ) { - ScQueryParam aParam; + ScQueryParam aParam; pData->GetQueryParam( aParam ); - ScRange aRange( aParam.nCol1, aParam.nRow1, aParam.nTab, + ScRange aRange( aParam.nCol1, aParam.nRow1, aParam.nTab, aParam.nCol2, aParam.nRow2, aParam.nTab ); - SCCOL nColCnt = aParam.nCol2 - aParam.nCol1 + 1; + SCCOL nColCnt = aParam.nCol2 - aParam.nCol1 + 1; maRef = aRange; @@ -917,15 +917,15 @@ ExcAutoFilterRecs::ExcAutoFilterRecs( const XclExpRoot& rRoot, SCTAB nTab ) : // AutoFilter else { - BOOL bConflict = FALSE; - BOOL bContLoop = TRUE; - BOOL bHasOr = FALSE; + BOOL bConflict = FALSE; + BOOL bContLoop = TRUE; + BOOL bHasOr = FALSE; SCCOLROW nFirstField = aParam.GetEntry( 0 ).nField; // create AUTOFILTER records for filtered columns for( SCSIZE nEntry = 0; !bConflict && bContLoop && (nEntry < aParam.GetEntryCount()); nEntry++ ) { - const ScQueryEntry& rEntry = aParam.GetEntry( nEntry ); + const ScQueryEntry& rEntry = aParam.GetEntry( nEntry ); bContLoop = rEntry.bDoQuery; if( bContLoop ) diff --git a/sc/source/filter/excel/exctools.cxx b/sc/source/filter/excel/exctools.cxx index 5f585e0b6293..527738ecbbb5 100644 --- a/sc/source/filter/excel/exctools.cxx +++ b/sc/source/filter/excel/exctools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -203,15 +203,15 @@ void ExcScenarioCell::SetValue( const String& r ) -#define EXCSCAPPEND(EXCSCCELL) (List::Insert(EXCSCCELL,LIST_APPEND)) -#define EXCSCFIRST() ((ExcScenarioCell*)List::First()) -#define EXCSCNEXT() ((ExcScenarioCell*)List::Next()) +#define EXCSCAPPEND(EXCSCCELL) (List::Insert(EXCSCCELL,LIST_APPEND)) +#define EXCSCFIRST() ((ExcScenarioCell*)List::First()) +#define EXCSCNEXT() ((ExcScenarioCell*)List::Next()) ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR->GetCurrScTab() ) { - UINT16 nCref; - UINT8 nName, nComment; + UINT16 nCref; + UINT8 nName, nComment; rIn >> nCref; rIn >> nProtected; @@ -234,8 +234,8 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR else pComment = new String; - UINT16 n = nCref; - UINT16 nC, nR; + UINT16 n = nCref; + UINT16 nC, nR; while( n ) { rIn >> nR >> nC; @@ -246,7 +246,7 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR } n = nCref; - ExcScenarioCell* p = EXCSCFIRST(); + ExcScenarioCell* p = EXCSCFIRST(); while( p ) { p->SetValue( rIn.ReadUniString() ); @@ -258,7 +258,7 @@ ExcScenario::ExcScenario( XclImpStream& rIn, const RootData& rR ) : nTab( rR.pIR ExcScenario::~ExcScenario() { - ExcScenarioCell* p = EXCSCFIRST(); + ExcScenarioCell* p = EXCSCFIRST(); while( p ) { @@ -278,9 +278,9 @@ ExcScenario::~ExcScenario() void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast ) { ScDocument& r = rRoot.GetDoc(); - ExcScenarioCell* p = EXCSCFIRST(); - String aSzenName( *pName ); - UINT16 nNewTab = nTab + 1; + ExcScenarioCell* p = EXCSCFIRST(); + String aSzenName( *pName ); + UINT16 nNewTab = nTab + 1; if( !r.InsertTab( nNewTab, aSzenName ) ) return; @@ -291,9 +291,9 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast ) while( p ) { - UINT16 nCol = p->nCol; - UINT16 nRow = p->nRow; - String aVal = p->GetValue(); + UINT16 nCol = p->nCol; + UINT16 nRow = p->nRow; + String aVal = p->GetValue(); r.ApplyFlagsTab( nCol, nRow, nCol, nRow, nNewTab, SC_MF_SCENARIO ); @@ -318,7 +318,7 @@ void ExcScenario::Apply( const XclImpRoot& rRoot, const BOOL bLast ) ExcScenarioList::~ExcScenarioList() { - ExcScenario* p = _First(); + ExcScenario* p = _First(); while( p ) { @@ -330,8 +330,8 @@ ExcScenarioList::~ExcScenarioList() void ExcScenarioList::Apply( const XclImpRoot& rRoot ) { - ExcScenario* p = _Last(); - UINT16 n = ( UINT16 ) Count(); + ExcScenario* p = _Last(); + UINT16 n = ( UINT16 ) Count(); while( p ) { diff --git a/sc/source/filter/excel/expop2.cxx b/sc/source/filter/excel/expop2.cxx index 643b557300c6..4e89ed01b455 100644 --- a/sc/source/filter/excel/expop2.cxx +++ b/sc/source/filter/excel/expop2.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -103,8 +103,8 @@ FltError ExportBiff5::Write() pDocShell->SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); } - pExcDoc->ReadDoc(); // ScDoc -> ExcDoc - pExcDoc->Write( aOut ); // wechstreamen + pExcDoc->ReadDoc(); // ScDoc -> ExcDoc + pExcDoc->Write( aOut ); // wechstreamen if( pDocShell && xRootStrg.Is() ) { diff --git a/sc/source/filter/excel/fontbuff.cxx b/sc/source/filter/excel/fontbuff.cxx index 21f99163f52a..dfc8d458d979 100644 --- a/sc/source/filter/excel/fontbuff.cxx +++ b/sc/source/filter/excel/fontbuff.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,13 +49,13 @@ #include "patattr.hxx" #include "ftools.hxx" -const UINT16 LotusFontBuffer::nSize = 8; +const UINT16 LotusFontBuffer::nSize = 8; void LotusFontBuffer::Fill( const UINT8 nIndex, SfxItemSet& rItemSet ) { - UINT8 nIntIndex = nIndex & 0x07; + UINT8 nIntIndex = nIndex & 0x07; - ENTRY* pAkt = pData + nIntIndex; + ENTRY* pAkt = pData + nIntIndex; if( pAkt->pFont ) rItemSet.Put( *pAkt->pFont ); @@ -79,12 +79,12 @@ void LotusFontBuffer::Fill( const UINT8 nIndex, SfxItemSet& rItemSet ) } FontUnderline eUnderline; - switch( nIndex & 0x60 ) // Bit 5+6 + switch( nIndex & 0x60 ) // Bit 5+6 { case 0x60: - case 0x20: eUnderline = UNDERLINE_SINGLE; break; - case 0x40: eUnderline = UNDERLINE_DOUBLE; break; - default: eUnderline = UNDERLINE_NONE; + case 0x20: eUnderline = UNDERLINE_SINGLE; break; + case 0x40: eUnderline = UNDERLINE_DOUBLE; break; + default: eUnderline = UNDERLINE_NONE; } if( eUnderline != UNDERLINE_NONE ) { @@ -99,7 +99,7 @@ void LotusFontBuffer::SetName( const UINT16 nIndex, const String& rName ) DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetName(): Array zu klein!" ); if( nIndex < nSize ) { - register ENTRY* pEntry = pData + nIndex; + register ENTRY* pEntry = pData + nIndex; pEntry->TmpName( rName ); if( pEntry->nType >= 0 ) @@ -121,7 +121,7 @@ void LotusFontBuffer::SetType( const UINT16 nIndex, const UINT16 nType ) DBG_ASSERT( nIndex < nSize, "*LotusFontBuffer::SetType(): Array zu klein!" ); if( nIndex < nSize ) { - register ENTRY* pEntry = pData + nIndex; + register ENTRY* pEntry = pData + nIndex; pEntry->Type( nType ); if( pEntry->pTmpName ) @@ -132,24 +132,24 @@ void LotusFontBuffer::SetType( const UINT16 nIndex, const UINT16 nType ) void LotusFontBuffer::MakeFont( ENTRY* pEntry ) { - FontFamily eFamily = FAMILY_DONTKNOW; - FontPitch ePitch = PITCH_DONTKNOW; - CharSet eCharSet = RTL_TEXTENCODING_DONTKNOW; + FontFamily eFamily = FAMILY_DONTKNOW; + FontPitch ePitch = PITCH_DONTKNOW; + CharSet eCharSet = RTL_TEXTENCODING_DONTKNOW; switch( pEntry->nType ) { - case 0x00: // Helvetica + case 0x00: // Helvetica eFamily = FAMILY_SWISS; - ePitch = PITCH_VARIABLE; + ePitch = PITCH_VARIABLE; break; - case 0x01: // Times Roman + case 0x01: // Times Roman eFamily = FAMILY_ROMAN; - ePitch = PITCH_VARIABLE; + ePitch = PITCH_VARIABLE; break; - case 0x02: // Courier - ePitch = PITCH_FIXED; + case 0x02: // Courier + ePitch = PITCH_FIXED; break; - case 0x03: // Symbol + case 0x03: // Symbol eCharSet = RTL_TEXTENCODING_SYMBOL; break; } diff --git a/sc/source/filter/excel/frmbase.cxx b/sc/source/filter/excel/frmbase.cxx index 89d7c7423b68..868b927a5c06 100644 --- a/sc/source/filter/excel/frmbase.cxx +++ b/sc/source/filter/excel/frmbase.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ _ScRangeList::~_ScRangeList() { - ScRange* p = ( ScRange* ) First(); + ScRange* p = ( ScRange* ) First(); while( p ) { @@ -124,31 +124,31 @@ void _ScRangeListTabs::Append( ScComplexRefData a, SCsTAB nTab, const BOOL b ) if( a.Ref1.nTab != a.Ref2.nTab ) return; - SCsTAB& rTab = a.Ref1.nTab; + SCsTAB& rTab = a.Ref1.nTab; if( rTab > MAXTAB ) rTab = MAXTAB; else if( rTab < 0 ) rTab = 0; - SCsCOL& rCol1 = a.Ref1.nCol; + SCsCOL& rCol1 = a.Ref1.nCol; if( rCol1 > MAXCOL ) rCol1 = MAXCOL; else if( rCol1 < 0 ) rCol1 = 0; - SCsROW& rRow1 = a.Ref1.nRow; + SCsROW& rRow1 = a.Ref1.nRow; if( rRow1 > MAXROW ) rRow1 = MAXROW; else if( rRow1 < 0 ) rRow1 = 0; - SCsCOL& rCol2 = a.Ref2.nCol; + SCsCOL& rCol2 = a.Ref2.nCol; if( rCol2 > MAXCOL ) rCol2 = MAXCOL; else if( rCol2 < 0 ) rCol2 = 0; - SCsROW& rRow2 = a.Ref2.nRow; + SCsROW& rRow2 = a.Ref2.nRow; if( rRow2 > MAXROW ) rRow2 = MAXROW; else if( rRow2 < 0 ) diff --git a/sc/source/filter/excel/impop.cxx b/sc/source/filter/excel/impop.cxx index 0ca50c16a52c..28aa5b48dbd0 100644 --- a/sc/source/filter/excel/impop.cxx +++ b/sc/source/filter/excel/impop.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -129,14 +129,14 @@ ImportExcel::ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ): { mnLastRefIdx = 0; nBdshtTab = 0; - nIxfeIndex = 0; // zur Sicherheit auf 0 + nIxfeIndex = 0; // zur Sicherheit auf 0 // Root-Daten fuellen - nach new's ohne Root als Parameter pExcRoot = &GetOldRoot(); pExcRoot->pIR = this; // ExcRoot -> XclImpRoot pExcRoot->eDateiTyp = BiffX; - pExcRoot->pExtSheetBuff = new ExtSheetBuffer( pExcRoot ); //&aExtSheetBuff; - pExcRoot->pShrfmlaBuff = new ShrfmlaBuffer( pExcRoot ); //&aShrfrmlaBuff; + pExcRoot->pExtSheetBuff = new ExtSheetBuffer( pExcRoot ); //&aExtSheetBuff; + pExcRoot->pShrfmlaBuff = new ShrfmlaBuffer( pExcRoot ); //&aShrfrmlaBuff; pExcRoot->pExtNameBuff = new ExtNameBuff ( *this ); pExtNameBuff = new NameBuffer( pExcRoot ); //#94039# prevent empty rootdata @@ -184,7 +184,7 @@ void ImportExcel::ReadFileSharing() { if( SfxItemSet* pItemSet = GetMedium().GetItemSet() ) pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, TRUE ) ); - + if( SfxObjectShell* pShell = GetDocShell() ) { if( nRecommendReadOnly != 0 ) @@ -384,14 +384,14 @@ void ImportExcel::Window1() void ImportExcel::Row25( void ) { - UINT16 nRow, nRowHeight; + UINT16 nRow, nRowHeight; aIn >> nRow; aIn.Ignore( 4 ); // Mic und Mac ueberspringen if( ValidRow( nRow ) ) { - aIn >> nRowHeight; // direkt in Twips angegeben + aIn >> nRowHeight; // direkt in Twips angegeben aIn.Ignore( 2 ); if( GetBiff() == EXC_BIFF2 ) @@ -400,7 +400,7 @@ void ImportExcel::Row25( void ) } else {// -------------------- BIFF5 - UINT16 nGrbit; + UINT16 nGrbit; aIn.Ignore( 2 ); // reserved aIn >> nGrbit; @@ -431,7 +431,7 @@ void ImportExcel::Bof2( void ) void ImportExcel::Eof( void ) { - // POST: darf nur nach einer GUELTIGEN Tabelle gerufen werden! + // POST: darf nur nach einer GUELTIGEN Tabelle gerufen werden! EndSheet(); IncCurrScTab(); } @@ -467,8 +467,8 @@ void ImportExcel:: WinProtection( void ) void ImportExcel::Columndefault( void ) {// Default Cell Attributes - UINT16 nColMic, nColMac; - BYTE nOpt0; + UINT16 nColMic, nColMac; + BYTE nOpt0; aIn >> nColMic >> nColMac; @@ -485,7 +485,7 @@ void ImportExcel::Columndefault( void ) aIn >> nOpt0; aIn.Ignore( 2 ); // nur 0. Attribut-Byte benutzt - if( nOpt0 & 0x80 ) // Col hidden? + if( nOpt0 & 0x80 ) // Col hidden? pColRowBuff->HideCol( nCol ); } } @@ -493,18 +493,18 @@ void ImportExcel::Columndefault( void ) void ImportExcel::Array25( void ) { - UINT16 nFirstRow, nLastRow, nFormLen; - BYTE nFirstCol, nLastCol; + UINT16 nFirstRow, nLastRow, nFormLen; + BYTE nFirstCol, nLastCol; aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol; if( GetBiff() == EXC_BIFF2 ) - {// BIFF2 + {// BIFF2 aIn.Ignore( 1 ); nFormLen = aIn.ReaduInt8(); } else - {// BIFF5 + {// BIFF5 aIn.Ignore( 6 ); aIn >> nFormLen; } @@ -512,7 +512,7 @@ void ImportExcel::Array25( void ) if( ValidColRow( nLastCol, nLastRow ) ) { // jetzt steht Lesemarke auf Formel, Laenge in nFormLen - const ScTokenArray* pErgebnis; + const ScTokenArray* pErgebnis; pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol), static_cast<SCROW>(nFirstRow), GetCurrScTab() ) ); @@ -520,7 +520,7 @@ void ImportExcel::Array25( void ) DBG_ASSERT( pErgebnis, "*ImportExcel::Array25(): ScTokenArray ist NULL!" ); - ScMarkData aMarkData; + ScMarkData aMarkData; aMarkData.SelectOneTable( GetCurrScTab() ); pD->InsertMatrixFormula( static_cast<SCCOL>(nFirstCol), static_cast<SCROW>(nFirstRow), static_cast<SCCOL>(nLastCol), @@ -532,7 +532,7 @@ void ImportExcel::Array25( void ) void ImportExcel::Rec1904( void ) { - UINT16 n1904; + UINT16 n1904; aIn >> n1904; @@ -548,8 +548,8 @@ void ImportExcel::Rec1904( void ) void ImportExcel::Externname25( void ) { - UINT32 nRes; - UINT16 nOpt; + UINT32 nRes; + UINT16 nOpt; aIn >> nOpt >> nRes; @@ -573,8 +573,8 @@ void ImportExcel::Externname25( void ) void ImportExcel::Colwidth( void ) {// Column Width - BYTE nColFirst, nColLast; - UINT16 nColWidth; + BYTE nColFirst, nColLast; + UINT16 nColWidth; aIn >> nColFirst >> nColLast >> nColWidth; @@ -653,8 +653,8 @@ void ImportExcel::Builtinfmtcnt( void ) void ImportExcel::Colinfo( void ) {// Column Formatting Information - UINT16 nColFirst, nColLast, nColWidth, nXF; - UINT16 nOpt; + UINT16 nColFirst, nColLast, nColWidth, nXF; + UINT16 nOpt; aIn >> nColFirst >> nColLast >> nColWidth >> nXF >> nOpt; @@ -754,8 +754,8 @@ void ImportExcel::ReadUsesElfs() void ImportExcel::Hideobj( void ) { - UINT16 nHide; - ScVObjMode eOle, eChart, eDraw; + UINT16 nHide; + ScVObjMode eOle, eChart, eDraw; aIn >> nHide; @@ -763,17 +763,17 @@ void ImportExcel::Hideobj( void ) switch( nHide ) { - case 1: // Placeholders - eOle = VOBJ_MODE_SHOW; // in Excel 97 werden nur Charts als Platzhalter angezeigt - eChart = VOBJ_MODE_SHOW; //#i80528# VOBJ_MODE_DUMMY replaced by VOBJ_MODE_SHOW now + case 1: // Placeholders + eOle = VOBJ_MODE_SHOW; // in Excel 97 werden nur Charts als Platzhalter angezeigt + eChart = VOBJ_MODE_SHOW; //#i80528# VOBJ_MODE_DUMMY replaced by VOBJ_MODE_SHOW now eDraw = VOBJ_MODE_SHOW; break; - case 2: // Hide all + case 2: // Hide all eOle = VOBJ_MODE_HIDE; eChart = VOBJ_MODE_HIDE; eDraw = VOBJ_MODE_HIDE; break; - default: // Show all + default: // Show all eOle = VOBJ_MODE_SHOW; eChart = VOBJ_MODE_SHOW; eDraw = VOBJ_MODE_SHOW; @@ -802,8 +802,8 @@ void ImportExcel::Standardwidth( void ) void ImportExcel::Shrfmla( void ) { - UINT16 nFirstRow, nLastRow, nLenExpr; - BYTE nFirstCol, nLastCol; + UINT16 nFirstRow, nLastRow, nLenExpr; + BYTE nFirstCol, nLastCol; aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol; aIn.Ignore( 2 ); @@ -811,7 +811,7 @@ void ImportExcel::Shrfmla( void ) // jetzt steht Lesemarke an der Formel - const ScTokenArray* pErgebnis; + const ScTokenArray* pErgebnis; pFormConv->Reset(); pFormConv->Convert( pErgebnis, maStrm, nLenExpr, true, FT_SharedFormula ); @@ -927,7 +927,7 @@ void ImportExcel::Olesize( void ) void ImportExcel::Row34( void ) { - UINT16 nRow, nRowHeight, nGrbit, nXF; + UINT16 nRow, nRowHeight, nGrbit, nXF; aIn >> nRow; aIn.Ignore( 4 ); // Mic und Mac ueberspringen @@ -936,7 +936,7 @@ void ImportExcel::Row34( void ) if( ValidRow( nScRow ) ) { - aIn >> nRowHeight; // direkt in Twips angegeben + aIn >> nRowHeight; // direkt in Twips angegeben aIn.Ignore( 4 ); aIn >> nGrbit >> nXF; @@ -972,8 +972,8 @@ void ImportExcel::Bof3( void ) void ImportExcel::Array34( void ) { - UINT16 nFirstRow, nLastRow, nFormLen; - BYTE nFirstCol, nLastCol; + UINT16 nFirstRow, nLastRow, nFormLen; + BYTE nFirstCol, nLastCol; aIn >> nFirstRow >> nLastRow >> nFirstCol >> nLastCol; aIn.Ignore( (GetBiff() >= EXC_BIFF5) ? 6 : 2 ); @@ -982,7 +982,7 @@ void ImportExcel::Array34( void ) if( ValidColRow( nLastCol, nLastRow ) ) { // jetzt steht Lesemarke auf Formel, Laenge in nFormLen - const ScTokenArray* pErgebnis; + const ScTokenArray* pErgebnis; pFormConv->Reset( ScAddress( static_cast<SCCOL>(nFirstCol), static_cast<SCROW>(nFirstRow), GetCurrScTab() ) ); @@ -990,7 +990,7 @@ void ImportExcel::Array34( void ) DBG_ASSERT( pErgebnis, "+ImportExcel::Array34(): ScTokenArray ist NULL!" ); - ScMarkData aMarkData; + ScMarkData aMarkData; aMarkData.SelectOneTable( GetCurrScTab() ); pD->InsertMatrixFormula( static_cast<SCCOL>(nFirstCol), static_cast<SCROW>(nFirstRow), static_cast<SCCOL>(nLastCol), @@ -1034,7 +1034,7 @@ void ImportExcel::TableOp( void ) SCTAB nTab = GetCurrScTab(); switch( aTabOpParam.nMode ) { - case 0: // COL + case 0: // COL aTabOpParam.aRefFormulaCell.Set( static_cast<SCCOL>(nFirstCol), static_cast<SCROW>(nFirstRow - 1), nTab, FALSE, @@ -1048,7 +1048,7 @@ void ImportExcel::TableOp( void ) FALSE ); nRow++; break; - case 1: // ROW + case 1: // ROW aTabOpParam.aRefFormulaCell.Set( static_cast<SCCOL>(nFirstCol - 1), static_cast<SCROW>(nFirstRow), nTab, FALSE, FALSE, @@ -1062,7 +1062,7 @@ void ImportExcel::TableOp( void ) FALSE ); nCol++; break; - case 2: // TWO-INPUT + case 2: // TWO-INPUT aTabOpParam.aRefFormulaCell.Set( static_cast<SCCOL>(nFirstCol - 1), static_cast<SCROW>(nFirstRow - 1), nTab, FALSE, @@ -1111,9 +1111,9 @@ void ImportExcel::Bof4( void ) void ImportExcel::Bof5( void ) { - //POST: eDateiTyp = Typ der zu lesenden Datei - UINT16 nSubType, nVers; - BiffTyp eDatei; + //POST: eDateiTyp = Typ der zu lesenden Datei + UINT16 nSubType, nVers; + BiffTyp eDatei; maStrm.DisableDecryption(); maStrm >> nVers >> nSubType; @@ -1252,8 +1252,8 @@ void ImportExcel::PostDocLoad( void ) // root data owns the extended document options -> create a new object GetDoc().SetExtDocOptions( new ScExtDocOptions( GetExtDocOptions() ) ); - const SCTAB nLast = pD->GetTableCount(); - const ScRange* p; + const SCTAB nLast = pD->GetTableCount(); + const ScRange* p; if( pExcRoot->pPrintRanges->HasRanges() ) { @@ -1291,8 +1291,8 @@ void ImportExcel::PostDocLoad( void ) DBG_ASSERT( pExcRoot->pPrintTitles->GetActList(), "-ImportExcel::PostDocLoad(): Imaginaere Tabelle gefunden!" ); - BOOL bRowVirgin = TRUE; - BOOL bColVirgin = TRUE; + BOOL bRowVirgin = TRUE; + BOOL bColVirgin = TRUE; while( p ) { diff --git a/sc/source/filter/excel/namebuff.cxx b/sc/source/filter/excel/namebuff.cxx index 098dd370092d..72a6b8bc46c1 100644 --- a/sc/source/filter/excel/namebuff.cxx +++ b/sc/source/filter/excel/namebuff.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -47,9 +47,9 @@ UINT32 StringHashEntry::MakeHashCode( const String& r ) { - register UINT32 n = 0; - const sal_Unicode* pAkt = r.GetBuffer(); - register sal_Unicode cAkt = *pAkt; + register UINT32 n = 0; + const sal_Unicode* pAkt = r.GetBuffer(); + register sal_Unicode cAkt = *pAkt; while( cAkt ) { @@ -67,7 +67,7 @@ UINT32 StringHashEntry::MakeHashCode( const String& r ) NameBuffer::~NameBuffer() { - register StringHashEntry* pDel = ( StringHashEntry* ) List::First(); + register StringHashEntry* pDel = ( StringHashEntry* ) List::First(); while( pDel ) { delete pDel; @@ -87,7 +87,7 @@ void NameBuffer::operator <<( const String &rNewString ) #ifdef DBG_UTIL -UINT16 nShrCnt; +UINT16 nShrCnt; #endif @@ -120,7 +120,7 @@ void ShrfmlaBuffer::Clear() void ShrfmlaBuffer::Store( const ScRange& rRange, const ScTokenArray& rToken ) { - String aName( CreateName( rRange.aStart ) ); + String aName( CreateName( rRange.aStart ) ); DBG_ASSERT( mnCurrIdx <= 0xFFFF, "*ShrfmlaBuffer::Store(): Gleich wird mir schlecht...!" ); @@ -151,11 +151,11 @@ USHORT ShrfmlaBuffer::Find( const ScAddress & aAddr ) const } -#define SHRFMLA_BASENAME "SHARED_FORMULA_" +#define SHRFMLA_BASENAME "SHARED_FORMULA_" String ShrfmlaBuffer::CreateName( const ScRange& r ) { - String aName( RTL_CONSTASCII_USTRINGPARAM( SHRFMLA_BASENAME ) ); + String aName( RTL_CONSTASCII_USTRINGPARAM( SHRFMLA_BASENAME ) ); aName += String::CreateFromInt32( r.aStart.Col() ); aName.Append( '_' ); aName += String::CreateFromInt32( r.aStart.Row() ); @@ -172,7 +172,7 @@ String ShrfmlaBuffer::CreateName( const ScRange& r ) ExtSheetBuffer::~ExtSheetBuffer() { - Cont *pAkt = ( Cont * ) List::First(); + Cont *pAkt = ( Cont * ) List::First(); while( pAkt ) { delete pAkt; @@ -195,8 +195,8 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex ) "*ExtSheetBuffer::GetScTabIndex(): Sheet-Index == 0!" ); nExcIndex--; - Cont* pCur = ( Cont * ) List::GetObject( nExcIndex ); - UINT16& rTabNum = pCur->nTabNum; + Cont* pCur = ( Cont * ) List::GetObject( nExcIndex ); + UINT16& rTabNum = pCur->nTabNum; if( pCur ) { @@ -208,7 +208,7 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex ) if( rTabNum == 0xFFFF ) {// neue Tabelle erzeugen - SCTAB nNewTabNum; + SCTAB nNewTabNum; if( pCur->bSWB ) {// Tabelle ist im selben Workbook! if( pExcRoot->pIR->GetDoc().GetTable( pCur->aTab, nNewTabNum ) ) @@ -223,16 +223,16 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex ) {// Tabelle ist 'echt' extern if( pExcRoot->pIR->GetExtDocOptions().GetDocSettings().mnLinkCnt == 0 ) { - String aURL( ScGlobal::GetAbsDocName( pCur->aFile, + String aURL( ScGlobal::GetAbsDocName( pCur->aFile, pExcRoot->pIR->GetDocShell() ) ); - String aTabName( ScGlobal::GetDocTabName( aURL, pCur->aTab ) ); + String aTabName( ScGlobal::GetDocTabName( aURL, pCur->aTab ) ); if( pExcRoot->pIR->GetDoc().LinkExternalTab( nNewTabNum, aTabName, aURL, pCur->aTab ) ) { rScIndex = rTabNum = static_cast<UINT16>(nNewTabNum); return TRUE; } else - rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt -> wird + rTabNum = 0xFFFE; // Tabelle einmal nicht angelegt -> wird // wohl auch nicht mehr gehen... } else @@ -249,7 +249,7 @@ BOOL ExtSheetBuffer::GetScTabIndex( UINT16 nExcIndex, UINT16& rScIndex ) BOOL ExtSheetBuffer::IsLink( const UINT16 nExcIndex ) const { DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::IsLink(): Index muss >0 sein!" ); - Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 ); + Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 ); if( pRet ) return pRet->bLink; @@ -261,7 +261,7 @@ BOOL ExtSheetBuffer::IsLink( const UINT16 nExcIndex ) const BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDoc ) const { DBG_ASSERT( nExcIndex > 0, "*ExtSheetBuffer::GetLink(): Index muss >0 sein!" ); - Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 ); + Cont* pRet = ( Cont * ) List::GetObject( nExcIndex - 1 ); if( pRet ) { @@ -276,7 +276,7 @@ BOOL ExtSheetBuffer::GetLink( const UINT16 nExcIndex, String& rAppl, String& rDo void ExtSheetBuffer::Reset( void ) { - Cont *pAkt = ( Cont * ) List::First(); + Cont *pAkt = ( Cont * ) List::First(); while( pAkt ) { delete pAkt; diff --git a/sc/source/filter/excel/read.cxx b/sc/source/filter/excel/read.cxx index 706aa9318622..e2737ec6fa98 100644 --- a/sc/source/filter/excel/read.cxx +++ b/sc/source/filter/excel/read.cxx @@ -69,28 +69,28 @@ FltError ImportExcel::Read( void ) // call to GetCurrSheetDrawing() cannot be cached (changes in new sheets) enum Zustand { - Z_BiffNull, // Nicht in gueltigem Biff-Format - Z_Biff2, // Biff2: nur eine Tabelle + Z_BiffNull, // Nicht in gueltigem Biff-Format + Z_Biff2, // Biff2: nur eine Tabelle - Z_Biff3, // Biff3: nur eine Tabelle + Z_Biff3, // Biff3: nur eine Tabelle - Z_Biff4, // Biff4: nur eine Tabelle - Z_Biff4W, // Biff4 Workbook: Globals - Z_Biff4T, // Biff4 Workbook: eine Tabelle selbst - Z_Biff4E, // Biff4 Workbook: zwischen den Tabellen + Z_Biff4, // Biff4: nur eine Tabelle + Z_Biff4W, // Biff4 Workbook: Globals + Z_Biff4T, // Biff4 Workbook: eine Tabelle selbst + Z_Biff4E, // Biff4 Workbook: zwischen den Tabellen Z_Biff5WPre,// Biff5: Prefetch Workbook - Z_Biff5W, // Biff5: Globals + Z_Biff5W, // Biff5: Globals Z_Biff5TPre,// Biff5: Prefetch fuer Shrfmla/Array Formula - Z_Biff5T, // Biff5: eine Tabelle selbst - Z_Biff5E, // Biff5: zwischen den Tabellen - Z_Biffn0, // Alle Biffs: Tabelle bis naechstesss EOF ueberlesen + Z_Biff5T, // Biff5: eine Tabelle selbst + Z_Biff5E, // Biff5: zwischen den Tabellen + Z_Biffn0, // Alle Biffs: Tabelle bis naechstesss EOF ueberlesen Z_Ende }; - Zustand eAkt = Z_BiffNull, ePrev = Z_BiffNull; + Zustand eAkt = Z_BiffNull, ePrev = Z_BiffNull; - FltError eLastErr = eERR_OK; - UINT16 nOpcode; + FltError eLastErr = eERR_OK; + UINT16 nOpcode; UINT16 nBofLevel = 0; BOOL bBiff4Workbook = FALSE; @@ -152,7 +152,7 @@ FltError ImportExcel::Read( void ) switch( eAkt ) { // ---------------------------------------------------------------- - case Z_BiffNull: // ------------------------------- Z_BiffNull - + case Z_BiffNull: // ------------------------------- Z_BiffNull - { switch( nOpcode ) { @@ -221,7 +221,7 @@ FltError ImportExcel::Read( void ) } break; // ---------------------------------------------------------------- - case Z_Biff2: // ---------------------------------- Z_Biff2 - + case Z_Biff2: // ---------------------------------- Z_Biff2 - { switch( nOpcode ) { @@ -238,32 +238,32 @@ FltError ImportExcel::Read( void ) case EXC_ID3_BOOLERR: ReadBoolErr(); break; case EXC_ID_RK: ReadRk(); break; - case 0x06: Formula25(); break; // FORMULA [ 2 5] - case 0x08: Row25(); break; // ROW [ 2 5] - case 0x0A: // EOF [ 2345] + case 0x06: Formula25(); break; // FORMULA [ 2 5] + case 0x08: Row25(); break; // ROW [ 2 5] + case 0x0A: // EOF [ 2345] rNumFmtBfr.CreateScFormats(); Eof(); eAkt = Z_Ende; break; case 0x14: case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break; - case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] + case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] case 0x18: rNameMgr.ReadName( maStrm ); break; case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break; case 0x1D: rTabViewSett.ReadSelection( maStrm ); break; case 0x1E: rNumFmtBfr.ReadFormat( maStrm ); break; - case 0x20: Columndefault(); break; // COLUMNDEFAULT[ 2 ] - case 0x21: Array25(); break; // ARRAY [ 2 5] - case 0x23: Externname25(); break; // EXTERNNAME [ 2 5] - case 0x24: Colwidth(); break; // COLWIDTH [ 2 ] - case 0x25: Defrowheight2(); break; // DEFAULTROWHEI[ 2 ] + case 0x20: Columndefault(); break; // COLUMNDEFAULT[ 2 ] + case 0x21: Array25(); break; // ARRAY [ 2 5] + case 0x23: Externname25(); break; // EXTERNNAME [ 2 5] + case 0x24: Colwidth(); break; // COLWIDTH [ 2 ] + case 0x25: Defrowheight2(); break; // DEFAULTROWHEI[ 2 ] case 0x26: case 0x27: case 0x28: case 0x29: rPageSett.ReadMargin( maStrm ); break; case 0x2A: rPageSett.ReadPrintHeaders( maStrm ); break; case 0x2B: rPageSett.ReadPrintGridLines( maStrm ); break; - case 0x2F: // FILEPASS [ 2345] + case 0x2F: // FILEPASS [ 2345] eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm ); if( eLastErr != ERRCODE_NONE ) eAkt = Z_Ende; @@ -272,14 +272,14 @@ FltError ImportExcel::Read( void ) case EXC_ID_EFONT: rFontBfr.ReadEfont( maStrm ); break; case 0x3E: rTabViewSett.ReadWindow2( maStrm, false );break; case 0x41: rTabViewSett.ReadPane( maStrm ); break; - case 0x42: Codepage(); break; // CODEPAGE [ 2345] + case 0x42: Codepage(); break; // CODEPAGE [ 2345] case 0x43: rXFBfr.ReadXF( maStrm ); break; - case 0x44: Ixfe(); break; // IXFE [ 2 ] + case 0x44: Ixfe(); break; // IXFE [ 2 ] } } break; // ---------------------------------------------------------------- - case Z_Biff3: // ---------------------------------- Z_Biff3 - + case Z_Biff3: // ---------------------------------- Z_Biff3 - { switch( nOpcode ) { @@ -302,44 +302,44 @@ FltError ImportExcel::Read( void ) case EXC_ID3_BOOLERR: ReadBoolErr(); break; case EXC_ID_RK: ReadRk(); break; - case 0x0A: // EOF [ 2345] + case 0x0A: // EOF [ 2345] rNumFmtBfr.CreateScFormats(); Eof(); eAkt = Z_Ende; break; case 0x14: case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break; - case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] + case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] case 0x1A: case 0x1B: rPageSett.ReadPageBreaks( maStrm ); break; case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break; case 0x1D: rTabViewSett.ReadSelection( maStrm ); break; case 0x1E: rNumFmtBfr.ReadFormat( maStrm ); break; - case 0x22: Rec1904(); break; // 1904 [ 2345] + case 0x22: Rec1904(); break; // 1904 [ 2345] case 0x26: case 0x27: case 0x28: case 0x29: rPageSett.ReadMargin( maStrm ); break; case 0x2A: rPageSett.ReadPrintHeaders( maStrm ); break; case 0x2B: rPageSett.ReadPrintGridLines( maStrm ); break; - case 0x2F: // FILEPASS [ 2345] + case 0x2F: // FILEPASS [ 2345] eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm ); if( eLastErr != ERRCODE_NONE ) eAkt = Z_Ende; break; case EXC_ID_FILESHARING: ReadFileSharing(); break; case 0x41: rTabViewSett.ReadPane( maStrm ); break; - case 0x42: Codepage(); break; // CODEPAGE [ 2345] - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x42: Codepage(); break; // CODEPAGE [ 2345] + case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break; - case 0x7D: Colinfo(); break; // COLINFO [ 345] - case 0x8C: Country(); break; // COUNTRY [ 345] + case 0x7D: Colinfo(); break; // COLINFO [ 345] + case 0x8C: Country(); break; // COUNTRY [ 345] case 0x92: rPal.ReadPalette( maStrm ); break; - case 0x0206: Formula3(); break; // FORMULA [ 3 ] - case 0x0208: Row34(); break; // ROW [ 34 ] + case 0x0206: Formula3(); break; // FORMULA [ 3 ] + case 0x0208: Row34(); break; // ROW [ 34 ] case 0x0218: rNameMgr.ReadName( maStrm ); break; - case 0x0221: Array34(); break; // ARRAY [ 34 ] - case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] + case 0x0221: Array34(); break; // ARRAY [ 34 ] + case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345] case 0x0231: rFontBfr.ReadFont( maStrm ); break; case 0x023E: rTabViewSett.ReadWindow2( maStrm, false );break; @@ -349,7 +349,7 @@ FltError ImportExcel::Read( void ) } break; // ---------------------------------------------------------------- - case Z_Biff4: // ---------------------------------- Z_Biff4 - + case Z_Biff4: // ---------------------------------- Z_Biff4 - { switch( nOpcode ) { @@ -372,7 +372,7 @@ FltError ImportExcel::Read( void ) case EXC_ID3_BOOLERR: ReadBoolErr(); break; case EXC_ID_RK: ReadRk(); break; - case 0x0A: // EOF [ 2345] + case 0x0A: // EOF [ 2345] rNumFmtBfr.CreateScFormats(); Eof(); eAkt = Z_Ende; @@ -380,42 +380,42 @@ FltError ImportExcel::Read( void ) case 0x12: SheetProtect(); break; // SHEET PROTECTION case 0x14: case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break; - case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] + case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] case 0x1A: case 0x1B: rPageSett.ReadPageBreaks( maStrm ); break; case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break; case 0x1D: rTabViewSett.ReadSelection( maStrm ); break; - case 0x22: Rec1904(); break; // 1904 [ 2345] + case 0x22: Rec1904(); break; // 1904 [ 2345] case 0x26: case 0x27: case 0x28: case 0x29: rPageSett.ReadMargin( maStrm ); break; case 0x2A: rPageSett.ReadPrintHeaders( maStrm ); break; case 0x2B: rPageSett.ReadPrintGridLines( maStrm ); break; - case 0x2F: // FILEPASS [ 2345] + case 0x2F: // FILEPASS [ 2345] eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm ); if( eLastErr != ERRCODE_NONE ) eAkt = Z_Ende; break; case EXC_ID_FILESHARING: ReadFileSharing(); break; case 0x41: rTabViewSett.ReadPane( maStrm ); break; - case 0x42: Codepage(); break; // CODEPAGE [ 2345] - case 0x55: DefColWidth(); break; - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x42: Codepage(); break; // CODEPAGE [ 2345] + case 0x55: DefColWidth(); break; + case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break; - case 0x7D: Colinfo(); break; // COLINFO [ 345] - case 0x8C: Country(); break; // COUNTRY [ 345] + case 0x7D: Colinfo(); break; // COLINFO [ 345] + case 0x8C: Country(); break; // COUNTRY [ 345] case 0x92: rPal.ReadPalette( maStrm ); break; - case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] + case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] case 0xA1: rPageSett.ReadSetup( maStrm ); break; - case 0x0208: Row34(); break; // ROW [ 34 ] + case 0x0208: Row34(); break; // ROW [ 34 ] case 0x0218: rNameMgr.ReadName( maStrm ); break; - case 0x0221: Array34(); break; // ARRAY [ 34 ] - case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] + case 0x0221: Array34(); break; // ARRAY [ 34 ] + case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345] case 0x0231: rFontBfr.ReadFont( maStrm ); break; case 0x023E: rTabViewSett.ReadWindow2( maStrm, false );break; - case 0x0406: Formula4(); break; // FORMULA [ 4 ] + case 0x0406: Formula4(); break; // FORMULA [ 4 ] case 0x041E: rNumFmtBfr.ReadFormat( maStrm ); break; case 0x0443: rXFBfr.ReadXF( maStrm ); break; case 0x0293: rXFBfr.ReadStyle( maStrm ); break; @@ -423,33 +423,33 @@ FltError ImportExcel::Read( void ) } break; // ---------------------------------------------------------------- - case Z_Biff4W: // --------------------------------- Z_Biff4W - + case Z_Biff4W: // --------------------------------- Z_Biff4W - { switch( nOpcode ) { - case 0x0A: // EOF [ 2345] + case 0x0A: // EOF [ 2345] eAkt = Z_Ende; break; - case 0x12: DocProtect(); break; // PROTECT [ 5] - case 0x2F: // FILEPASS [ 2345] + case 0x12: DocProtect(); break; // PROTECT [ 5] + case 0x2F: // FILEPASS [ 2345] eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm ); if( eLastErr != ERRCODE_NONE ) eAkt = Z_Ende; break; case EXC_ID_FILESHARING: ReadFileSharing(); break; case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] - case 0x42: Codepage(); break; // CODEPAGE [ 2345] - case 0x55: DefColWidth(); break; - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] - case 0x8C: Country(); break; // COUNTRY [ 345] - case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ] + case 0x42: Codepage(); break; // CODEPAGE [ 2345] + case 0x55: DefColWidth(); break; + case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x8C: Country(); break; // COUNTRY [ 345] + case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ] case 0x92: rPal.ReadPalette( maStrm ); break; - case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] + case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] case 0x0218: rNameMgr.ReadName( maStrm ); break; - case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] + case 0x0223: Externname34(); break; // EXTERNNAME [ 34 ] case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345] case 0x0231: rFontBfr.ReadFont( maStrm ); break; - case 0x0409: // BOF [ 4 ] + case 0x0409: // BOF [ 4 ] Bof4(); if( pExcRoot->eDateiTyp == Biff4 ) { @@ -490,7 +490,7 @@ FltError ImportExcel::Read( void ) case EXC_ID3_BOOLERR: ReadBoolErr(); break; case EXC_ID_RK: ReadRk(); break; - case 0x0A: // EOF [ 2345] + case 0x0A: // EOF [ 2345] Eof(); eAkt = Z_Biff4E; break; @@ -501,23 +501,23 @@ FltError ImportExcel::Read( void ) case 0x1B: rPageSett.ReadPageBreaks( maStrm ); break; case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break; case 0x1D: rTabViewSett.ReadSelection( maStrm ); break; - case 0x2F: // FILEPASS [ 2345] + case 0x2F: // FILEPASS [ 2345] eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm ); if( eLastErr != ERRCODE_NONE ) eAkt = Z_Ende; break; case 0x41: rTabViewSett.ReadPane( maStrm ); break; - case 0x42: Codepage(); break; // CODEPAGE [ 2345] - case 0x55: DefColWidth(); break; - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x42: Codepage(); break; // CODEPAGE [ 2345] + case 0x55: DefColWidth(); break; + case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] case 0x5D: GetCurrSheetDrawing().ReadObj( maStrm );break; - case 0x7D: Colinfo(); break; // COLINFO [ 345] - case 0x8C: Country(); break; // COUNTRY [ 345] - case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ] + case 0x7D: Colinfo(); break; // COLINFO [ 345] + case 0x8C: Country(); break; // COUNTRY [ 345] + case 0x8F: Bundleheader(); break; // BUNDLEHEADER [ 4 ] case 0x92: rPal.ReadPalette( maStrm ); break; - case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] + case 0x99: Standardwidth(); break; // STANDARDWIDTH[ 45] case 0xA1: rPageSett.ReadSetup( maStrm ); break; - case 0x0208: Row34(); break; // ROW [ 34 ] + case 0x0208: Row34(); break; // ROW [ 34 ] case 0x0218: rNameMgr.ReadName( maStrm ); break; case 0x0221: Array34(); break; case 0x0225: Defrowheight345();break;//DEFAULTROWHEI[ 345] @@ -532,15 +532,15 @@ FltError ImportExcel::Read( void ) } break; // ---------------------------------------------------------------- - case Z_Biff4E: // --------------------------------- Z_Biff4E - + case Z_Biff4E: // --------------------------------- Z_Biff4E - { switch( nOpcode ) { - case 0x0A: // EOF [ 2345] + case 0x0A: // EOF [ 2345] eAkt = Z_Ende; break; - case 0x8F: break; // BUNDLEHEADER [ 4 ] - case 0x0409: // BOF [ 4 ] + case 0x8F: break; // BUNDLEHEADER [ 4 ] + case 0x0409: // BOF [ 4 ] Bof4(); NeueTabelle(); if( pExcRoot->eDateiTyp == Biff4 ) @@ -557,45 +557,45 @@ FltError ImportExcel::Read( void ) } break; - case Z_Biff5WPre: // ------------------------------ Z_Biff5WPre - + case Z_Biff5WPre: // ------------------------------ Z_Biff5WPre - { switch( nOpcode ) { - case 0x0A: // EOF [ 2345] + case 0x0A: // EOF [ 2345] eAkt = Z_Biff5W; aIn.SeekGlobalPosition(); // und zurueck an alte Position break; - case 0x12: DocProtect(); break; // PROTECT [ 5] - case 0x2F: // FILEPASS [ 2345] + case 0x12: DocProtect(); break; // PROTECT [ 5] + case 0x2F: // FILEPASS [ 2345] eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm ); if( eLastErr != ERRCODE_NONE ) eAkt = Z_Ende; break; case EXC_ID_FILESHARING: ReadFileSharing(); break; case 0x3D: Window1(); break; - case 0x42: Codepage(); break; // CODEPAGE [ 2345] - case 0x85: Boundsheet(); break; // BOUNDSHEET [ 5] + case 0x42: Codepage(); break; // CODEPAGE [ 2345] + case 0x85: Boundsheet(); break; // BOUNDSHEET [ 5] case 0x8C: Country(); break; // COUNTRY [ 345] // PALETTE follows XFs, but already needed while reading the XFs case 0x92: rPal.ReadPalette( maStrm ); break; } } break; - case Z_Biff5W: // --------------------------------- Z_Biff5W - + case Z_Biff5W: // --------------------------------- Z_Biff5W - { switch( nOpcode ) { - case 0x0A: // EOF [ 2345] + case 0x0A: // EOF [ 2345] rNumFmtBfr.CreateScFormats(); rXFBfr.CreateUserStyles(); eAkt = Z_Biff5E; break; case 0x18: rNameMgr.ReadName( maStrm ); break; case 0x1E: rNumFmtBfr.ReadFormat( maStrm ); break; - case 0x22: Rec1904(); break; // 1904 [ 2345] + case 0x22: Rec1904(); break; // 1904 [ 2345] case 0x31: rFontBfr.ReadFont( maStrm ); break; - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] - case 0x8D: Hideobj(); break; // HIDEOBJ [ 345] + case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x8D: Hideobj(); break; // HIDEOBJ [ 345] case 0xDE: Olesize(); break; case 0xE0: rXFBfr.ReadXF( maStrm ); break; case 0x0293: rXFBfr.ReadStyle( maStrm ); break; @@ -668,10 +668,10 @@ FltError ImportExcel::Read( void ) case 0x0A: Eof(); eAkt = Z_Biff5E; break; case 0x14: case 0x15: rPageSett.ReadHeaderFooter( maStrm ); break; - case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] + case 0x17: Externsheet(); break; // EXTERNSHEET [ 2345] case 0x1C: GetCurrSheetDrawing().ReadNote( maStrm );break; case 0x1D: rTabViewSett.ReadSelection( maStrm ); break; - case 0x23: Externname25(); break; // EXTERNNAME [ 2 5] + case 0x23: Externname25(); break; // EXTERNNAME [ 2 5] case 0x26: case 0x27: case 0x28: @@ -693,7 +693,7 @@ FltError ImportExcel::Read( void ) case 0xD6: Rstring(); break; // RSTRING [ 5] case 0x00E5: Cellmerging(); break; // #i62300# case 0x0236: TableOp(); break; // TABLE [ 5] - case 0x0809: // BOF [ 5] + case 0x0809: // BOF [ 5] XclTools::SkipSubStream( maStrm ); break; } @@ -701,11 +701,11 @@ FltError ImportExcel::Read( void ) } break; // ---------------------------------------------------------------- - case Z_Biff5E: // --------------------------------- Z_Biff5E - + case Z_Biff5E: // --------------------------------- Z_Biff5E - { switch( nOpcode ) { - case 0x0809: // BOF [ 5] + case 0x0809: // BOF [ 5] Bof5(); NeueTabelle(); switch( pExcRoot->eDateiTyp ) @@ -735,11 +735,11 @@ FltError ImportExcel::Read( void ) } break; - case Z_Biffn0: // --------------------------------- Z_Biffn0 - + case Z_Biffn0: // --------------------------------- Z_Biffn0 - { switch( nOpcode ) { - case 0x0A: // EOF [ 2345] + case 0x0A: // EOF [ 2345] eAkt = ePrev; IncCurrScTab(); break; @@ -748,7 +748,7 @@ FltError ImportExcel::Read( void ) } break; // ---------------------------------------------------------------- - case Z_Ende: // ----------------------------------- Z_Ende - + case Z_Ende: // ----------------------------------- Z_Ende - DBG_ERROR( "*ImportExcel::Read(): Not possible state!" ); break; default: DBG_ERROR( "-ImportExcel::Read(): Zustand vergessen!" ); @@ -948,18 +948,18 @@ FltError ImportExcel8::Read( void ) aIn.SeekGlobalPosition(); } break; - case 0x12: DocProtect(); break; // PROTECT [ 5678] + case 0x12: DocProtect(); break; // PROTECT [ 5678] case 0x13: DocPasssword(); break; case 0x19: WinProtection(); break; - case 0x2F: // FILEPASS [ 2345 ] + case 0x2F: // FILEPASS [ 2345 ] eLastErr = XclImpDecryptHelper::ReadFilepass( maStrm ); if( eLastErr != ERRCODE_NONE ) eAkt = EXC_STATE_END; break; case EXC_ID_FILESHARING: ReadFileSharing(); break; case 0x3D: Window1(); break; - case 0x42: Codepage(); break; // CODEPAGE [ 2345 ] - case 0x85: Boundsheet(); break; // BOUNDSHEET [ 5 ] + case 0x42: Codepage(); break; // CODEPAGE [ 2345 ] + case 0x85: Boundsheet(); break; // BOUNDSHEET [ 5 ] case 0x8C: Country(); break; // COUNTRY [ 345 ] // PALETTE follows XFs, but already needed while reading the XFs @@ -992,10 +992,10 @@ FltError ImportExcel8::Read( void ) } break; case 0x0E: Precision(); break; // PRECISION - case 0x22: Rec1904(); break; // 1904 [ 2345 ] - case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] - case 0x8D: Hideobj(); break; // HIDEOBJ [ 345 ] - case 0xD3: SetHasBasic(); break; + case 0x22: Rec1904(); break; // 1904 [ 2345 ] + case 0x56: Builtinfmtcnt(); break; // BUILTINFMTCNT[ 34 ] + case 0x8D: Hideobj(); break; // HIDEOBJ [ 345 ] + case 0xD3: SetHasBasic(); break; case 0xDE: Olesize(); break; case EXC_ID_CODENAME: ReadCodeName( aIn, true ); break; diff --git a/sc/source/filter/excel/tokstack.cxx b/sc/source/filter/excel/tokstack.cxx index 785162d7ab53..0bb5b3ebf047 100644 --- a/sc/source/filter/excel/tokstack.cxx +++ b/sc/source/filter/excel/tokstack.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ #include <stdio.h> // printf -const UINT16 TokenPool::nScTokenOff = 8192; +const UINT16 TokenPool::nScTokenOff = 8192; TokenStack::TokenStack( UINT16 nNewSize ) @@ -65,12 +65,12 @@ TokenStack::~TokenStack() // !ACHTUNG!: nach Aussen hin beginnt die Nummerierung mit 1! // !ACHTUNG!: SC-Token werden mit einem Offset nScTokenOff abgelegt -// -> Unterscheidung von anderen Token +// -> Unterscheidung von anderen Token TokenPool::TokenPool( void ) { - UINT16 nLauf = nScTokenOff; + UINT16 nLauf = nScTokenOff; // Sammelstelle fuer Id-Folgen nP_Id = 256; @@ -123,7 +123,7 @@ TokenPool::TokenPool( void ) TokenPool::~TokenPool() { - UINT16 n; + UINT16 n; delete[] pP_Id; delete[] pElement; @@ -173,10 +173,10 @@ TokenPool::~TokenPool() void TokenPool::GrowString( void ) { - UINT16 nP_StrNew = nP_Str * 2; - UINT16 nL; + UINT16 nP_StrNew = nP_Str * 2; + UINT16 nL; - String** ppP_StrNew = new String *[ nP_StrNew ]; + String** ppP_StrNew = new String *[ nP_StrNew ]; for( nL = 0 ; nL < nP_Str ; nL++ ) ppP_StrNew[ nL ] = ppP_Str[ nL ]; @@ -185,16 +185,16 @@ void TokenPool::GrowString( void ) nP_Str = nP_StrNew; - delete[] ppP_Str; + delete[] ppP_Str; ppP_Str = ppP_StrNew; } void TokenPool::GrowDouble( void ) { - UINT16 nP_DblNew = nP_Dbl * 2; + UINT16 nP_DblNew = nP_Dbl * 2; - double* pP_DblNew = new double[ nP_DblNew ]; + double* pP_DblNew = new double[ nP_DblNew ]; for( UINT16 nL = 0 ; nL < nP_Dbl ; nL++ ) pP_DblNew[ nL ] = pP_Dbl[ nL ]; @@ -207,10 +207,10 @@ void TokenPool::GrowDouble( void ) void TokenPool::GrowTripel( void ) { - UINT16 nP_RefTrNew = nP_RefTr * 2; - UINT16 nL; + UINT16 nP_RefTrNew = nP_RefTr * 2; + UINT16 nL; - ScSingleRefData** ppP_RefTrNew = new ScSingleRefData *[ nP_RefTrNew ]; + ScSingleRefData** ppP_RefTrNew = new ScSingleRefData *[ nP_RefTrNew ]; for( nL = 0 ; nL < nP_RefTr ; nL++ ) ppP_RefTrNew[ nL ] = ppP_RefTr[ nL ]; @@ -226,9 +226,9 @@ void TokenPool::GrowTripel( void ) void TokenPool::GrowId( void ) { - UINT16 nP_IdNew = nP_Id * 2; + UINT16 nP_IdNew = nP_Id * 2; - UINT16* pP_IdNew = new UINT16[ nP_IdNew ]; + UINT16* pP_IdNew = new UINT16[ nP_IdNew ]; for( UINT16 nL = 0 ; nL < nP_Id ; nL++ ) pP_IdNew[ nL ] = pP_Id[ nL ]; @@ -242,11 +242,11 @@ void TokenPool::GrowId( void ) void TokenPool::GrowElement( void ) { - UINT16 nElementNew = nElement * 2; + UINT16 nElementNew = nElement * 2; - UINT16* pElementNew = new UINT16[ nElementNew ]; - E_TYPE* pTypeNew = new E_TYPE[ nElementNew ]; - UINT16* pSizeNew = new UINT16[ nElementNew ]; + UINT16* pElementNew = new UINT16[ nElementNew ]; + E_TYPE* pTypeNew = new E_TYPE[ nElementNew ]; + UINT16* pSizeNew = new UINT16[ nElementNew ]; for( UINT16 nL = 0 ; nL < nElement ; nL++ ) { @@ -268,9 +268,9 @@ void TokenPool::GrowElement( void ) void TokenPool::GrowExt( void ) { - UINT16 nNewSize = nP_Ext * 2; + UINT16 nNewSize = nP_Ext * 2; - EXTCONT** ppNew = new EXTCONT*[ nNewSize ]; + EXTCONT** ppNew = new EXTCONT*[ nNewSize ]; memset( ppNew, 0, sizeof( EXTCONT* ) * nNewSize ); memcpy( ppNew, ppP_Ext, sizeof( EXTCONT* ) * nP_Ext ); @@ -283,9 +283,9 @@ void TokenPool::GrowExt( void ) void TokenPool::GrowNlf( void ) { - UINT16 nNewSize = nP_Nlf * 2; + UINT16 nNewSize = nP_Nlf * 2; - NLFCONT** ppNew = new NLFCONT*[ nNewSize ]; + NLFCONT** ppNew = new NLFCONT*[ nNewSize ]; memset( ppNew, 0, sizeof( NLFCONT* ) * nNewSize ); memcpy( ppNew, ppP_Nlf, sizeof( NLFCONT* ) * nP_Nlf ); @@ -338,7 +338,7 @@ void TokenPool::GetElement( const UINT16 nId ) break; case T_RefA: { - ScComplexRefData aScComplexRefData; + ScComplexRefData aScComplexRefData; aScComplexRefData.Ref1 = *ppP_RefTr[ pElement[ nId ] ]; aScComplexRefData.Ref2 = *ppP_RefTr[ pElement[ nId ] + 1 ]; pScToken->AddDoubleReference( aScComplexRefData ); @@ -349,8 +349,8 @@ void TokenPool::GetElement( const UINT16 nId ) break; case T_Ext: { - UINT16 n = pElement[ nId ]; - EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL; + UINT16 n = pElement[ nId ]; + EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL; if( p ) { @@ -363,8 +363,8 @@ void TokenPool::GetElement( const UINT16 nId ) break; case T_Nlf: { - UINT16 n = pElement[ nId ]; - NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL; + UINT16 n = pElement[ nId ]; + NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL; if( p ) pScToken->AddColRowName( p->aRef ); @@ -426,8 +426,8 @@ void TokenPool::GetElementRek( const UINT16 nId ) DBG_ASSERT( pType[ nId ] == T_Id, "-TokenPool::GetElementRek(): nId nicht Id-Folge!" ); - UINT16 nAnz = pSize[ nId ]; - UINT16* pAkt = &pP_Id[ pElement[ nId ] ]; + UINT16 nAnz = pSize[ nId ]; + UINT16* pAkt = &pP_Id[ pElement[ nId ] ]; for( ; nAnz > 0 ; nAnz--, pAkt++ ) { if( *pAkt < nScTokenOff ) @@ -450,7 +450,7 @@ void TokenPool::GetElementRek( const UINT16 nId ) break; case T_RefA: { - ScComplexRefData aScComplexRefData; + ScComplexRefData aScComplexRefData; aScComplexRefData.Ref1 = *ppP_RefTr[ pElement[ *pAkt ] ]; aScComplexRefData.Ref2 = *ppP_RefTr[ pElement[ *pAkt ] + 1 ]; pScToken->AddDoubleReference( aScComplexRefData ); @@ -461,8 +461,8 @@ void TokenPool::GetElementRek( const UINT16 nId ) break; case T_Ext: { - UINT16 n = pElement[ *pAkt ]; - EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL; + UINT16 n = pElement[ *pAkt ]; + EXTCONT* p = ( n < nP_Ext )? ppP_Ext[ n ] : NULL; if( p ) pScToken->AddExternal( p->aText, p->eId ); @@ -470,8 +470,8 @@ void TokenPool::GetElementRek( const UINT16 nId ) break; case T_Nlf: { - UINT16 n = pElement[ *pAkt ]; - NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL; + UINT16 n = pElement[ *pAkt ]; + NLFCONT* p = ( n < nP_Nlf )? ppP_Nlf[ n ] : NULL; if( p ) pScToken->AddColRowName( p->aRef ); @@ -518,7 +518,7 @@ void TokenPool::GetElementRek( const UINT16 nId ) DBG_ERROR("-TokenPool::GetElementRek(): Zustand undefiniert!?"); } } - else // elementarer SC_Token + else // elementarer SC_Token pScToken->AddOpCode( ( DefTokenId ) ( *pAkt - nScTokenOff ) ); } @@ -536,12 +536,12 @@ void TokenPool::operator >>( TokenId& rId ) if( nElementAkt >= nElement ) GrowElement(); - pElement[ nElementAkt ] = nP_IdLast; // Start der Token-Folge - pType[ nElementAkt ] = T_Id; // Typinfo eintragen + pElement[ nElementAkt ] = nP_IdLast; // Start der Token-Folge + pType[ nElementAkt ] = T_Id; // Typinfo eintragen pSize[ nElementAkt ] = nP_IdAkt - nP_IdLast; // von nP_IdLast bis nP_IdAkt-1 geschrieben -> Laenge der Folge - nElementAkt++; // Startwerte fuer naechste Folge + nElementAkt++; // Startwerte fuer naechste Folge nP_IdLast = nP_IdAkt; } @@ -554,12 +554,12 @@ const TokenId TokenPool::Store( const double& rDouble ) if( nP_DblAkt >= nP_Dbl ) GrowDouble(); - pElement[ nElementAkt ] = nP_DblAkt; // Index in Double-Array - pType[ nElementAkt ] = T_D; // Typinfo Double eintragen + pElement[ nElementAkt ] = nP_DblAkt; // Index in Double-Array + pType[ nElementAkt ] = T_D; // Typinfo Double eintragen pP_Dbl[ nP_DblAkt ] = rDouble; - pSize[ nElementAkt ] = 1; // eigentlich Banane + pSize[ nElementAkt ] = 1; // eigentlich Banane nElementAkt++; nP_DblAkt++; @@ -573,11 +573,11 @@ const TokenId TokenPool::Store( const UINT16 nIndex ) if( nElementAkt >= nElement ) GrowElement(); - pElement[ nElementAkt ] = nIndex; // Daten direkt im Index! - pType[ nElementAkt ] = T_RN; // Typinfo Range Name eintragen + pElement[ nElementAkt ] = nIndex; // Daten direkt im Index! + pType[ nElementAkt ] = T_RN; // Typinfo Range Name eintragen nElementAkt++; - return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! + return ( const TokenId ) nElementAkt; // Ausgabe von altem Wert + 1! } @@ -591,8 +591,8 @@ const TokenId TokenPool::Store( const String& rString ) if( nP_StrAkt >= nP_Str ) GrowString(); - pElement[ nElementAkt ] = nP_StrAkt; // Index in String-Array - pType[ nElementAkt ] = T_Str; // Typinfo String eintragen + pElement[ nElementAkt ] = nP_StrAkt; // Index in String-Array + pType[ nElementAkt ] = T_Str; // Typinfo String eintragen // String anlegen if( !ppP_Str[ nP_StrAkt ] ) @@ -622,7 +622,7 @@ const TokenId TokenPool::Store( const ScSingleRefData& rTr ) GrowTripel(); pElement[ nElementAkt ] = nP_RefTrAkt; - pType[ nElementAkt ] = T_RefC; // Typinfo Cell-Reff eintragen + pType[ nElementAkt ] = T_RefC; // Typinfo Cell-Reff eintragen if( !ppP_RefTr[ nP_RefTrAkt ] ) ppP_RefTr[ nP_RefTrAkt ] = new ScSingleRefData( rTr ); @@ -645,7 +645,7 @@ const TokenId TokenPool::Store( const ScComplexRefData& rTr ) GrowTripel(); pElement[ nElementAkt ] = nP_RefTrAkt; - pType[ nElementAkt ] = T_RefA; // Typinfo Area-Reff eintragen + pType[ nElementAkt ] = T_RefA; // Typinfo Area-Reff eintragen if( !ppP_RefTr[ nP_RefTrAkt ] ) ppP_RefTr[ nP_RefTrAkt ] = new ScSingleRefData( rTr.Ref1 ); @@ -674,7 +674,7 @@ const TokenId TokenPool::Store( const DefTokenId e, const String& r ) GrowExt(); pElement[ nElementAkt ] = nP_ExtAkt; - pType[ nElementAkt ] = T_Ext; // Typinfo String eintragen + pType[ nElementAkt ] = T_Ext; // Typinfo String eintragen if( ppP_Ext[ nP_ExtAkt ] ) { @@ -745,7 +745,7 @@ const TokenId TokenPool::StoreExtName( sal_uInt16 nFileId, const String& rName ) pElement[nElementAkt] = static_cast<UINT16>(maExtNames.size()); pType[nElementAkt] = T_ExtName; - + maExtNames.push_back(ExtName()); ExtName& r = maExtNames.back(); r.mnFileId = nFileId; @@ -763,7 +763,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName pElement[nElementAkt] = static_cast<UINT16>(maExtCellRefs.size()); pType[nElementAkt] = T_ExtRefC; - + maExtCellRefs.push_back(ExtCellRef()); ExtCellRef& r = maExtCellRefs.back(); r.mnFileId = nFileId; @@ -782,7 +782,7 @@ const TokenId TokenPool::StoreExtRef( sal_uInt16 nFileId, const String& rTabName pElement[nElementAkt] = static_cast<UINT16>(maExtAreaRefs.size()); pType[nElementAkt] = T_ExtRefA; - + maExtAreaRefs.push_back(ExtAreaRef()); ExtAreaRef& r = maExtAreaRefs.back(); r.mnFileId = nFileId; @@ -813,10 +813,10 @@ BOOL TokenPool::IsSingleOp( const TokenId& rId, const DefTokenId eId ) const {// Tokenfolge? if( pSize[ nId ] == 1 ) {// GENAU 1 Token - UINT16 nSecId = pP_Id[ pElement[ nId ] ]; + UINT16 nSecId = pP_Id[ pElement[ nId ] ]; if( nSecId >= nScTokenOff ) {// Default-Token? - return ( DefTokenId ) ( nSecId - nScTokenOff ) == eId; // Gesuchter? + return ( DefTokenId ) ( nSecId - nScTokenOff ) == eId; // Gesuchter? } } } diff --git a/sc/source/filter/excel/xechart.cxx b/sc/source/filter/excel/xechart.cxx index 26d42d6c353b..40e6fdf537c5 100644 --- a/sc/source/filter/excel/xechart.cxx +++ b/sc/source/filter/excel/xechart.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xecontent.cxx b/sc/source/filter/excel/xecontent.cxx index 139f9c4e4af7..215d5d26fcdd 100644 --- a/sc/source/filter/excel/xecontent.cxx +++ b/sc/source/filter/excel/xecontent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -262,7 +262,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) if( maStringList.empty() ) return; - sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream( + sax_fastparser::FSHelperPtr pSst = rStrm.CreateOutputStream( OUString::createFromAscii( "xl/sharedStrings.xml" ), OUString::createFromAscii( "sharedStrings.xml" ), rStrm.GetCurrentStream()->getOutputStream(), @@ -271,7 +271,7 @@ void XclExpSstImpl::SaveXml( XclExpXmlStream& rStrm ) rStrm.PushStream( pSst ); pSst->startElement( XML_sst, - XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", + XML_xmlns, "http://schemas.openxmlformats.org/spreadsheetml/2006/main", XML_count, OString::valueOf( (sal_Int32) mnTotal ).getStr(), XML_uniqueCount, OString::valueOf( (sal_Int32) mnSize ).getStr(), FSEND ); @@ -551,8 +551,8 @@ void XclExpHyperlink::SaveXml( XclExpXmlStream& rStrm ) FSNS( XML_r, XML_id ), sId.getLength() ? XclXmlUtils::ToOString( sId ).getStr() : NULL, - XML_location, mxTextMark.get() != NULL - ? XclXmlUtils::ToOString( *mxTextMark ).getStr() + XML_location, mxTextMark.get() != NULL + ? XclXmlUtils::ToOString( *mxTextMark ).getStr() : NULL, // OOXTODO: XML_tooltip, from record HLinkTooltip 800h wzTooltip XML_display, XclXmlUtils::ToOString( *mxRepr ).getStr(), @@ -878,7 +878,7 @@ void XclExpCondfmt::SaveXml( XclExpXmlStream& rStrm ) { if( !IsValid() ) return; - + sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); rWorksheet->startElement( XML_conditionalFormatting, XML_sqref, XclXmlUtils::ToOString( msSeqRef ).getStr(), @@ -1167,7 +1167,7 @@ void XclExpDV::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->startElement( XML_dataValidation, XML_allowBlank, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_DV_IGNOREBLANK ) ), XML_error, XESTRING_TO_PSZ( maErrorText ), - // OOXTODO: XML_errorStyle, + // OOXTODO: XML_errorStyle, XML_errorTitle, XESTRING_TO_PSZ( maErrorTitle ), // OOXTODO: XML_imeMode, XML_operator, lcl_GetOperatorType( mnFlags ), @@ -1242,7 +1242,7 @@ void XclExpDval::SaveXml( XclExpXmlStream& rStrm ) return; sax_fastparser::FSHelperPtr& rWorksheet = rStrm.GetCurrentStream(); - rWorksheet->startElement( XML_dataValidations, + rWorksheet->startElement( XML_dataValidations, XML_count, OString::valueOf( (sal_Int32) maDVList.GetSize() ).getStr(), // OOXTODO: XML_disablePrompts, // OOXTODO: XML_xWindow, @@ -1325,7 +1325,7 @@ XclExpWebQuery::XclExpWebQuery( ScGlobal::AddToken( aNewTables, aAppendTable, ',' ); } - if( !bExitLoop ) // neither HTML_all nor HTML_tables found + if( !bExitLoop ) // neither HTML_all nor HTML_tables found { if( aNewTables.Len() ) mxQryTables.reset( new XclExpString( aNewTables ) ); diff --git a/sc/source/filter/excel/xeformula.cxx b/sc/source/filter/excel/xeformula.cxx index 9e2b69f33bb0..afa1dd780633 100644 --- a/sc/source/filter/excel/xeformula.cxx +++ b/sc/source/filter/excel/xeformula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index f715b781fa4a..335f3d0519e5 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx index 49520c08e0de..041f3ca0d9db 100644 --- a/sc/source/filter/excel/xelink.cxx +++ b/sc/source/filter/excel/xelink.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx index 0a244a2109a6..0d2056afbfac 100644 --- a/sc/source/filter/excel/xename.cxx +++ b/sc/source/filter/excel/xename.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xepage.cxx b/sc/source/filter/excel/xepage.cxx index 4d3f3dae9d9e..b91644cd70e2 100644 --- a/sc/source/filter/excel/xepage.cxx +++ b/sc/source/filter/excel/xepage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -198,7 +198,7 @@ void XclExpPageBreaks::SaveXml( XclExpXmlStream& rStrm ) sal_Int32 nElement = GetRecId() == EXC_ID_HORPAGEBREAKS ? XML_rowBreaks : XML_colBreaks; sax_fastparser::FSHelperPtr& pWorksheet = rStrm.GetCurrentStream(); OString sNumPageBreaks = OString::valueOf( (sal_Int32) mrPageBreaks.size() ); - pWorksheet->startElement( nElement, + pWorksheet->startElement( nElement, XML_count, sNumPageBreaks.getStr(), XML_manualBreakCount, sNumPageBreaks.getStr(), FSEND ); @@ -326,7 +326,7 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) : SCROW nRow = *itr; if (nRow > nMaxRow) break; - + maData.maHorPageBreaks.push_back(nRow); } @@ -338,7 +338,7 @@ XclExpPageSettings::XclExpPageSettings( const XclExpRoot& rRoot ) : static void lcl_WriteHeaderFooter( XclExpXmlStream& rStrm ) { - // OOXTODO: we currently only emit oddHeader/oddFooter elements, and + // OOXTODO: we currently only emit oddHeader/oddFooter elements, and // do not support the first/even/odd page distinction. rStrm.WriteAttributes( // OOXTODO: XML_alignWithMargins, @@ -397,9 +397,9 @@ void XclExpPageSettings::SaveXml( XclExpXmlStream& rStrm ) XclExpHeaderFooter( EXC_ID_FOOTER, maData.maFooter ).SaveXml( rStrm ); XclExpXmlEndElementRecord( XML_headerFooter ).SaveXml( rStrm ); - XclExpPageBreaks( EXC_ID_HORPAGEBREAKS, maData.maHorPageBreaks, + XclExpPageBreaks( EXC_ID_HORPAGEBREAKS, maData.maHorPageBreaks, static_cast< sal_uInt16 >( GetXclMaxPos().Col() ) ).SaveXml( rStrm ); - XclExpPageBreaks( EXC_ID_VERPAGEBREAKS, maData.maVerPageBreaks, + XclExpPageBreaks( EXC_ID_VERPAGEBREAKS, maData.maVerPageBreaks, static_cast< sal_uInt16 >( GetXclMaxPos().Row() ) ).SaveXml( rStrm ); if( const Graphic* pGraphic = maData.mxBrushItem->GetGraphic() ) diff --git a/sc/source/filter/excel/xepivot.cxx b/sc/source/filter/excel/xepivot.cxx index 6a37382d70fe..ac34151debf6 100644 --- a/sc/source/filter/excel/xepivot.cxx +++ b/sc/source/filter/excel/xepivot.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -751,7 +751,7 @@ void XclExpPivotCache::SaveXml( XclExpXmlStream& .appendAscii("rId") .append( rStrm.GetUniqueIdOUString() ) .makeStringAndClear(); - rWorkbook->startElement( XML_pivotCache, + rWorkbook->startElement( XML_pivotCache, XML_cacheId, OString::valueOf( (sal_Int32)maPCInfo.mnStrmId ).getStr(), FSNS( XML_r, XML_id ), XclXmlUtils::ToOString( sId ).getStr(), FSEND ); @@ -1038,9 +1038,9 @@ sal_uInt16 XclExpPTField::GetItemIndex( const String& rName, sal_uInt16 nDefault // fill data -------------------------------------------------------------- -/** - * Calc's subtotal names are escaped with backslashes ('\'), while Excel's - * are not escaped at all. +/** + * Calc's subtotal names are escaped with backslashes ('\'), while Excel's + * are not escaped at all. */ static OUString lcl_convertCalcSubtotalName(const OUString& rName) { @@ -1754,7 +1754,7 @@ void XclExpPivotTable::WriteQsiSxTag( XclExpStream& rStrm ) const if (bOlapPTReport) nFlags |= 0x0004; rStrm << nFlags; - // Feature-specific options. The value differs depending on the table + // Feature-specific options. The value differs depending on the table // type, but we assume the table type is always pivot table. sal_uInt32 nOptions = 0x00000000; bool bNoStencil = false; diff --git a/sc/source/filter/excel/xerecord.cxx b/sc/source/filter/excel/xerecord.cxx index f02e2db82fc1..d0ec843244e8 100644 --- a/sc/source/filter/excel/xerecord.cxx +++ b/sc/source/filter/excel/xerecord.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 660ddd48c014..9e8de93404ca 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xestring.cxx b/sc/source/filter/excel/xestring.cxx index 0247d765966a..b75bb2c00784 100644 --- a/sc/source/filter/excel/xestring.cxx +++ b/sc/source/filter/excel/xestring.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -458,7 +458,7 @@ static sal_uInt16 lcl_WriteRun( XclExpXmlStream& rStrm, const ScfUInt16Vec& rBuf XclXmlUtils::WriteFontData( rWorksheet, rFontData, XML_rFont ); rWorksheet->endElement( XML_rPr ); } - rWorksheet->startElement( XML_t, + rWorksheet->startElement( XML_t, FSNS( XML_xml, XML_space ), "preserve", FSEND ); rWorksheet->writeEscaped( XclXmlUtils::ToOUString( rBuffer, nStart, nLength ) ); @@ -486,11 +486,11 @@ void XclExpString::WriteXml( XclExpXmlStream& rStrm ) const const XclExpFont* pFont = NULL; for ( ; aIt != aEnd; ++aIt ) { - nStart = lcl_WriteRun( rStrm, GetUnicodeBuffer(), + nStart = lcl_WriteRun( rStrm, GetUnicodeBuffer(), nStart, aIt->mnChar-nStart, pFont ); pFont = rFonts.GetFont( aIt->mnFontIdx ); } - lcl_WriteRun( rStrm, GetUnicodeBuffer(), + lcl_WriteRun( rStrm, GetUnicodeBuffer(), nStart, GetUnicodeBuffer().size() - nStart, pFont ); } } diff --git a/sc/source/filter/excel/xestyle.cxx b/sc/source/filter/excel/xestyle.cxx index e4ec2131ba6e..d6bdf684c2a5 100644 --- a/sc/source/filter/excel/xestyle.cxx +++ b/sc/source/filter/excel/xestyle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index dbc11eefc335..7a636df84852 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1109,9 +1109,9 @@ void XclExpMultiCellBase::SaveXml( XclExpXmlStream& rStrm ) for( sal_uInt16 nIdx = 0; nIdx < aIt->mnCount; ++nIdx ) { WriteXmlContents( - rStrm, - XclAddress( static_cast<sal_uInt16>(nBegXclCol + nRelCol), GetXclRow() ), - aIt->mnXFIndex, + rStrm, + XclAddress( static_cast<sal_uInt16>(nBegXclCol + nRelCol), GetXclRow() ), + aIt->mnXFIndex, nRelColIdx ); ++nRelCol; ++nRelColIdx; @@ -1564,7 +1564,7 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_HIDDEN ) ), XML_max, OString::valueOf( (sal_Int32) (nLastXclCol+1) ).getStr(), XML_min, OString::valueOf( (sal_Int32) (mnFirstXclCol+1) ).getStr(), - // OOXTODO: XML_outlineLevel, + // OOXTODO: XML_outlineLevel, // OOXTODO: XML_phonetic, XML_style, lcl_GetStyleId( rStrm, maXFId.mnXFIndex ).getStr(), XML_width, OString::valueOf( (double) (mnWidth / 255.0) ).getStr(), @@ -2143,7 +2143,7 @@ void XclExpRowBuffer::SaveXml( XclExpXmlStream& rStrm ) rWorksheet->endElement( XML_sheetData ); } -XclExpDimensions* XclExpRowBuffer::GetDimensions() +XclExpDimensions* XclExpRowBuffer::GetDimensions() { return &maDimensions; } @@ -2407,7 +2407,7 @@ void XclExpCellTable::Finalize() mxDefrowheight->SetDefaultData( aDefRowData ); } -XclExpRecordRef XclExpCellTable::CreateRecord( sal_uInt16 nRecId ) const +XclExpRecordRef XclExpCellTable::CreateRecord( sal_uInt16 nRecId ) const { XclExpRecordRef xRec; switch( nRecId ) diff --git a/sc/source/filter/excel/xeview.cxx b/sc/source/filter/excel/xeview.cxx index 85cd24ece0a5..93b58e371da9 100644 --- a/sc/source/filter/excel/xeview.cxx +++ b/sc/source/filter/excel/xeview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,7 +73,7 @@ void XclExpWindow1::SaveXml( XclExpXmlStream& rStrm ) XML_tabRatio, OString::valueOf( (sal_Int32)mnTabBarSize ).getStr(), XML_firstSheet, OString::valueOf( (sal_Int32)rTabInfo.GetFirstVisXclTab() ).getStr(), XML_activeTab, OString::valueOf( (sal_Int32)rTabInfo.GetDisplayedXclTab() ).getStr(), - // OOXTODO: XML_autoFilterDateGrouping, // bool; AUTOFILTER12? 87Eh + // OOXTODO: XML_autoFilterDateGrouping, // bool; AUTOFILTER12? 87Eh FSEND ); } diff --git a/sc/source/filter/excel/xichart.cxx b/sc/source/filter/excel/xichart.cxx index 41565381e137..19374ea6c2b9 100644 --- a/sc/source/filter/excel/xichart.cxx +++ b/sc/source/filter/excel/xichart.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1109,7 +1109,7 @@ Reference< XTitle > XclImpChText::CreateTitle() const void XclImpChText::ConvertTitlePosition( const XclChTextKey& rTitleKey ) const { if( !mxFramePos ) return; - + const XclChFramePos& rPosData = mxFramePos->GetFramePosData(); OSL_ENSURE( (rPosData.mnTLMode == EXC_CHFRAMEPOS_PARENT) && (rPosData.mnBRMode == EXC_CHFRAMEPOS_PARENT), "XclImpChText::ConvertTitlePosition - unexpected frame position mode" ); diff --git a/sc/source/filter/excel/xicontent.cxx b/sc/source/filter/excel/xicontent.cxx index 3b7f3e0f29fd..2d9f90962063 100644 --- a/sc/source/filter/excel/xicontent.cxx +++ b/sc/source/filter/excel/xicontent.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1222,7 +1222,7 @@ void XclImpSheetProtectBuffer::ReadOptions( XclImpStream& rStrm, SCTAB nTab ) { rStrm.Ignore(12); - // feature type can be either 2 or 4. If 2, this record stores flag for + // feature type can be either 2 or 4. If 2, this record stores flag for // enhanced protection, whereas if 4 it stores flag for smart tag. sal_uInt16 nFeatureType; rStrm >> nFeatureType; @@ -1232,7 +1232,7 @@ void XclImpSheetProtectBuffer::ReadOptions( XclImpStream& rStrm, SCTAB nTab ) rStrm.Ignore(1); // always 1 - // The flag size specifies the size of bytes that follows that stores + // The flag size specifies the size of bytes that follows that stores // feature data. If -1 it depends on the feature type imported earlier. // For enhanced protection data, the size is always 4. For the most xls // documents out there this value is almost always -1. @@ -1241,7 +1241,7 @@ void XclImpSheetProtectBuffer::ReadOptions( XclImpStream& rStrm, SCTAB nTab ) if (nFlagSize != -1) return; - // There are actually 4 bytes to read, but the upper 2 bytes currently + // There are actually 4 bytes to read, but the upper 2 bytes currently // don't store any bits. sal_uInt16 nOptions; rStrm >> nOptions; diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index b96b8d6b5e87..c9cc3abb2d20 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -1453,10 +1453,10 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& eWriteMode = csst::WritingMode_TB_RL; switch( maTextData.maData.GetHorAlign() ) { - case EXC_OBJ_HOR_LEFT: eVerAlign = SDRTEXTVERTADJUST_TOP; break; + case EXC_OBJ_HOR_LEFT: eVerAlign = SDRTEXTVERTADJUST_TOP; break; case EXC_OBJ_HOR_CENTER: eVerAlign = SDRTEXTVERTADJUST_CENTER; break; - case EXC_OBJ_HOR_RIGHT: eVerAlign = SDRTEXTVERTADJUST_BOTTOM; break; - case EXC_OBJ_HOR_JUSTIFY: eVerAlign = SDRTEXTVERTADJUST_BLOCK; break; + case EXC_OBJ_HOR_RIGHT: eVerAlign = SDRTEXTVERTADJUST_BOTTOM; break; + case EXC_OBJ_HOR_JUSTIFY: eVerAlign = SDRTEXTVERTADJUST_BLOCK; break; } MSO_Anchor eTextAnchor = (MSO_Anchor)rDffConv.GetPropertyValue( DFF_Prop_anchorText, mso_anchorTop ); switch( eTextAnchor ) @@ -1473,9 +1473,9 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& { switch( maTextData.maData.GetVerAlign() ) { - case EXC_OBJ_VER_TOP: eHorAlign = SVX_ADJUST_RIGHT; break; - case EXC_OBJ_VER_CENTER: eHorAlign = SVX_ADJUST_CENTER; break; - case EXC_OBJ_VER_BOTTOM: eHorAlign = SVX_ADJUST_LEFT; break; + case EXC_OBJ_VER_TOP: eHorAlign = SVX_ADJUST_RIGHT; break; + case EXC_OBJ_VER_CENTER: eHorAlign = SVX_ADJUST_CENTER; break; + case EXC_OBJ_VER_BOTTOM: eHorAlign = SVX_ADJUST_LEFT; break; case EXC_OBJ_VER_JUSTIFY: eHorAlign = SVX_ADJUST_BLOCK; break; } } @@ -1483,7 +1483,7 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& } break; - case EXC_OBJ_ORIENT_STACKED: // PASSTHROUGH INTENDED + case EXC_OBJ_ORIENT_STACKED: // PASSTHROUGH INTENDED { // sj: STACKED is not supported, maybe it can be optimized here a bit } @@ -1494,8 +1494,8 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& { case EXC_OBJ_HOR_LEFT: eVerAlign = SDRTEXTVERTADJUST_BOTTOM; break; case EXC_OBJ_HOR_CENTER: eVerAlign = SDRTEXTVERTADJUST_CENTER; break; - case EXC_OBJ_HOR_RIGHT: eVerAlign = SDRTEXTVERTADJUST_TOP; break; - case EXC_OBJ_HOR_JUSTIFY: eVerAlign = SDRTEXTVERTADJUST_BLOCK; break; + case EXC_OBJ_HOR_RIGHT: eVerAlign = SDRTEXTVERTADJUST_TOP; break; + case EXC_OBJ_HOR_JUSTIFY: eVerAlign = SDRTEXTVERTADJUST_BLOCK; break; } MSO_Anchor eTextAnchor = (MSO_Anchor)rDffConv.GetPropertyValue( DFF_Prop_anchorText, mso_anchorTop ); switch ( eTextAnchor ) @@ -1513,8 +1513,8 @@ void XclImpTextObj::DoPreProcessSdrObj( XclImpDffConverter& rDffConv, SdrObject& switch( maTextData.maData.GetVerAlign() ) { case EXC_OBJ_VER_TOP: eHorAlign = SVX_ADJUST_LEFT; break; - case EXC_OBJ_VER_CENTER: eHorAlign = SVX_ADJUST_CENTER; break; - case EXC_OBJ_VER_BOTTOM: eHorAlign = SVX_ADJUST_RIGHT; break; + case EXC_OBJ_VER_CENTER: eHorAlign = SVX_ADJUST_CENTER; break; + case EXC_OBJ_VER_BOTTOM: eHorAlign = SVX_ADJUST_RIGHT; break; case EXC_OBJ_VER_JUSTIFY: eHorAlign = SVX_ADJUST_BLOCK; break; } } diff --git a/sc/source/filter/excel/xiformula.cxx b/sc/source/filter/excel/xiformula.cxx index c9927ff570fd..4ccb3d67c3c4 100644 --- a/sc/source/filter/excel/xiformula.cxx +++ b/sc/source/filter/excel/xiformula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xilink.cxx b/sc/source/filter/excel/xilink.cxx index ff45306b1c55..eac0c3854299 100644 --- a/sc/source/filter/excel/xilink.cxx +++ b/sc/source/filter/excel/xilink.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xiname.cxx b/sc/source/filter/excel/xiname.cxx index e94832e99597..26f6c445bbf2 100644 --- a/sc/source/filter/excel/xiname.cxx +++ b/sc/source/filter/excel/xiname.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xipage.cxx b/sc/source/filter/excel/xipage.cxx index f40743c52146..1ea072f17b33 100644 --- a/sc/source/filter/excel/xipage.cxx +++ b/sc/source/filter/excel/xipage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xipivot.cxx b/sc/source/filter/excel/xipivot.cxx index 3b30c7f84998..5d4132c71cad 100644 --- a/sc/source/filter/excel/xipivot.cxx +++ b/sc/source/filter/excel/xipivot.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1033,8 +1033,8 @@ void XclImpPTField::ConvertDataField( ScDPSaveData& rSaveData ) const // private -------------------------------------------------------------------- -/** - * Convert Excel-encoded subtotal name to a Calc-encoded one. +/** + * Convert Excel-encoded subtotal name to a Calc-encoded one. */ static OUString lcl_convertExcelSubtotalName(const OUString& rName) { @@ -1447,7 +1447,7 @@ void XclImpPivotTable::ApplyMergeFlags(const ScRange& rOutRange, const ScDPSaveD aGeometry.setPageFieldCount(maPTInfo.mnPageFields); aGeometry.setDataFieldCount(maPTInfo.mnDataFields); - // Excel includes data layout field in the row field count. We need to + // Excel includes data layout field in the row field count. We need to // subtract it. bool bDataLayout = maPTInfo.mnDataFields > 1; aGeometry.setRowFieldCount(maPTInfo.mnRowFields - static_cast<sal_uInt32>(bDataLayout)); diff --git a/sc/source/filter/excel/xiroot.cxx b/sc/source/filter/excel/xiroot.cxx index 9a0b50e3a999..1e818051141a 100644 --- a/sc/source/filter/excel/xiroot.cxx +++ b/sc/source/filter/excel/xiroot.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xistream.cxx b/sc/source/filter/excel/xistream.cxx index 86dec6126200..a07dd0b27a44 100644 --- a/sc/source/filter/excel/xistream.cxx +++ b/sc/source/filter/excel/xistream.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xistring.cxx b/sc/source/filter/excel/xistring.cxx index 9afc0f0d2f22..665011a15a83 100644 --- a/sc/source/filter/excel/xistring.cxx +++ b/sc/source/filter/excel/xistring.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 6693d6fe3936..d9d3940405d4 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -1294,7 +1294,16 @@ void XclImpXF::ApplyPatternToAttrList( if (pPat) { + // Check for a gap between the last entry and this one. + bool bHasGap = false; + if (rAttrs.empty() && nRow1 > 0) + // First attribute range doesn't start at row 0. + bHasGap = true; + if (!rAttrs.empty() && rAttrs.back().nRow + 1 < nRow1) + bHasGap = true; + + if (bHasGap) { // Fill this gap with the default pattern. ScAttrEntry aEntry; diff --git a/sc/source/filter/excel/xiview.cxx b/sc/source/filter/excel/xiview.cxx index 5dbb119d3eab..b1290baa3c36 100644 --- a/sc/source/filter/excel/xiview.cxx +++ b/sc/source/filter/excel/xiview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xladdress.cxx b/sc/source/filter/excel/xladdress.cxx index 64cd88908f22..461e29cd937f 100644 --- a/sc/source/filter/excel/xladdress.cxx +++ b/sc/source/filter/excel/xladdress.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xlchart.cxx b/sc/source/filter/excel/xlchart.cxx index 34d011ed3d6a..c1f0a1e82571 100644 --- a/sc/source/filter/excel/xlchart.cxx +++ b/sc/source/filter/excel/xlchart.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1325,7 +1325,7 @@ Reference< XShape > XclChRootData::GetTitleShape( const XclChTextKey& rTitleKey xTitleShape = (aIt->second)( xChart1Doc ); return xTitleShape; } - + // ============================================================================ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/excel/xlescher.cxx b/sc/source/filter/excel/xlescher.cxx index 5f9bf4ddb061..8a26dde70198 100644 --- a/sc/source/filter/excel/xlescher.cxx +++ b/sc/source/filter/excel/xlescher.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xlformula.cxx b/sc/source/filter/excel/xlformula.cxx index 04e428c3de7d..e52f0b8c9429 100644 --- a/sc/source/filter/excel/xlformula.cxx +++ b/sc/source/filter/excel/xlformula.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xlpage.cxx b/sc/source/filter/excel/xlpage.cxx index 53cdd0550081..6a68867db504 100644 --- a/sc/source/filter/excel/xlpage.cxx +++ b/sc/source/filter/excel/xlpage.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ struct XclPaperSize { - Paper mePaper; /// SVX paper size identifier. + Paper mePaper; /// SVX paper size identifier. long mnWidth; /// Paper width in twips. long mnHeight; /// Paper height in twips. }; @@ -71,14 +71,14 @@ static const XclPaperSize pPaperSizeTable[] = //near DMPAPER_B4 in vcl //i.e. //http://msdn.microsoft.com/en-us/library/bb241398.aspx makes the claim: - //xlPaperB4 12 B4 (250 mm x 354 mm) - //xlPaperB5 13 A5 (148 mm x 210 mm) + //xlPaperB4 12 B4 (250 mm x 354 mm) + //xlPaperB5 13 A5 (148 mm x 210 mm) //but, a paper enum called B5 is surely not actually "A5", and furthermore //the XlPaperSize enumeration otherwise follows the DMPAPER values //http://msdn.microsoft.com/en-us/library/ms776398(VS.85).aspx //which has - //DMPAPER_B4 12 B4 (JIS) 250 x 354 - //DMPAPER_B5 13 B5 (JIS) 182 x 257 mm + //DMPAPER_B4 12 B4 (JIS) 250 x 354 + //DMPAPER_B5 13 B5 (JIS) 182 x 257 mm //which claim them to be the JIS sizes. Though that document then gives //"B4 (JIS)" an *ISO* B4 size in the text, but //http://partners.adobe.com/public/developer/en/ps/5003.PPD_Spec_v4.3.pdf diff --git a/sc/source/filter/excel/xlpivot.cxx b/sc/source/filter/excel/xlpivot.cxx index 68854d39a5c2..480baab64a1c 100644 --- a/sc/source/filter/excel/xlpivot.cxx +++ b/sc/source/filter/excel/xlpivot.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -1015,7 +1015,7 @@ XclImpStream& operator>>( XclImpStream& rStrm, XclPTViewEx9Info& rInfo ) XclExpStream& operator<<( XclExpStream& rStrm, const XclPTViewEx9Info& rInfo ) { - return rStrm + return rStrm << EXC_PT_AUTOFMT_HEADER << rInfo.mbReport << EXC_PT_AUTOFMT_ZERO diff --git a/sc/source/filter/excel/xlroot.cxx b/sc/source/filter/excel/xlroot.cxx index fbca2c85918a..62657fd7d329 100644 --- a/sc/source/filter/excel/xlroot.cxx +++ b/sc/source/filter/excel/xlroot.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xlstyle.cxx b/sc/source/filter/excel/xlstyle.cxx index cb95fd1658ed..e144c0b23181 100644 --- a/sc/source/filter/excel/xlstyle.cxx +++ b/sc/source/filter/excel/xlstyle.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xltools.cxx b/sc/source/filter/excel/xltools.cxx index 5ee9429ebac7..36505c879a2c 100644 --- a/sc/source/filter/excel/xltools.cxx +++ b/sc/source/filter/excel/xltools.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/filter/excel/xltracer.cxx b/sc/source/filter/excel/xltracer.cxx index 948fa41efbdf..784c401d3a20 100644 --- a/sc/source/filter/excel/xltracer.cxx +++ b/sc/source/filter/excel/xltracer.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ using ::com::sun::star::beans::PropertyValue; static const XclTracerDetails pTracerDetails[] = { { eUnKnown, 0, "UNKNOWN", "UNKNOWN", "Unknown trace property." }, - { eRowLimitExceeded, 1000, "Limits", "Sheet", "Row limit exceeded." }, + { eRowLimitExceeded, 1000, "Limits", "Sheet", "Row limit exceeded." }, { eTabLimitExceeded, 1001, "Limits", "Sheet", "Sheet limit exceeded." }, { ePassword, 2000, "Protection", "Password", "Document is password protected." }, { ePrintRange, 3000, "Print", "Print Range", "Print Range present." }, diff --git a/sc/source/filter/excel/xlview.cxx b/sc/source/filter/excel/xlview.cxx index 63512e4ec2d5..7d956611de9d 100644 --- a/sc/source/filter/excel/xlview.cxx +++ b/sc/source/filter/excel/xlview.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |