diff options
Diffstat (limited to 'sc/source/filter')
282 files changed, 6656 insertions, 6665 deletions
diff --git a/sc/source/filter/dif/difexp.cxx b/sc/source/filter/dif/difexp.cxx index 0a04d2ca7d6f..0c302872d77d 100644 --- a/sc/source/filter/dif/difexp.cxx +++ b/sc/source/filter/dif/difexp.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 @@ -50,11 +50,11 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rStream, ScDocument* pDoc, const ScAddress& rOutPos, const CharSet eNach, UINT32 nDifOption ) { - SCCOL nEndCol; - SCROW nEndRow; + SCCOL nEndCol; + SCROW nEndRow; pDoc->GetTableArea( rOutPos.Tab(), nEndCol, nEndRow ); - ScAddress aEnd( nEndCol, nEndRow, rOutPos.Tab() ); - ScAddress aStart( rOutPos ); + ScAddress aEnd( nEndCol, nEndRow, rOutPos.Tab() ); + ScAddress aStart( rOutPos ); aStart.PutInOrder( aEnd ); @@ -99,25 +99,25 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc bContextOrNotAsciiEncoding = FALSE; } - const sal_Char* p2DoubleQuotes_LF = "\"\"\n"; - const sal_Char* pSpecDataType_LF = "-1,0\n"; - const sal_Char* pEmptyData = "1,0\n\"\"\n"; - const sal_Char* pStringData = "1,0\n"; - const sal_Char* pNumData = "0,"; - const sal_Char* pNumDataERROR = "0,0\nERROR\n"; + const sal_Char* p2DoubleQuotes_LF = "\"\"\n"; + const sal_Char* pSpecDataType_LF = "-1,0\n"; + const sal_Char* pEmptyData = "1,0\n\"\"\n"; + const sal_Char* pStringData = "1,0\n"; + const sal_Char* pNumData = "0,"; + const sal_Char* pNumDataERROR = "0,0\nERROR\n"; - FltError eRet = eERR_OK; - String aOS; - String aString; - SCCOL nEndCol = rRange.aEnd.Col(); - SCROW nEndRow = rRange.aEnd.Row(); - SCCOL nNumCols = nEndCol - rRange.aStart.Col() + 1; - SCROW nNumRows = nEndRow - rRange.aStart.Row() + 1; - SCTAB nTab = rRange.aStart.Tab(); + FltError eRet = eERR_OK; + String aOS; + String aString; + SCCOL nEndCol = rRange.aEnd.Col(); + SCROW nEndRow = rRange.aEnd.Row(); + SCCOL nNumCols = nEndCol - rRange.aStart.Col() + 1; + SCROW nNumRows = nEndRow - rRange.aStart.Row() + 1; + SCTAB nTab = rRange.aStart.Tab(); - double fVal; + double fVal; - const BOOL bPlain = ( nDifOption == SC_DIFOPT_PLAIN ); + const BOOL bPlain = ( nDifOption == SC_DIFOPT_PLAIN ); ScProgress aPrgrsBar( pDoc->GetDocumentShell(), ScGlobal::GetRscString( STR_LOAD_DOC ), nNumRows ); @@ -156,9 +156,9 @@ FltError ScFormatFilterPluginImpl::ScExportDif( SvStream& rOut, ScDocument* pDoc aOS.AppendAscii( p2DoubleQuotes_LF ); rOut.WriteUnicodeOrByteText( aOS ); - SCCOL nColCnt; - SCROW nRowCnt; - ScBaseCell* pAkt; + SCCOL nColCnt; + SCROW nRowCnt; + ScBaseCell* pAkt; for( nRowCnt = rRange.aStart.Row() ; nRowCnt <= nEndRow ; nRowCnt++ ) { diff --git a/sc/source/filter/dif/difimp.cxx b/sc/source/filter/dif/difimp.cxx index 3165ca2b5f4c..82612f44aad7 100644 --- a/sc/source/filter/dif/difimp.cxx +++ b/sc/source/filter/dif/difimp.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 @@ -64,21 +64,21 @@ const sal_Unicode pKey1_0[] = { '1', ',', '0', 0 }; FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, const ScAddress& rInsPos, const CharSet eVon, UINT32 nDifOption ) { - DifParser aDifParser( rIn, nDifOption, *pDoc, eVon ); + DifParser aDifParser( rIn, nDifOption, *pDoc, eVon ); - const BOOL bPlain = aDifParser.IsPlain(); + const BOOL bPlain = aDifParser.IsPlain(); - SCTAB nBaseTab = rInsPos.Tab(); + SCTAB nBaseTab = rInsPos.Tab(); - TOPIC eTopic = T_UNKNOWN; - BOOL bSyntErrWarn = FALSE; - BOOL bOverflowWarn = FALSE; + TOPIC eTopic = T_UNKNOWN; + BOOL bSyntErrWarn = FALSE; + BOOL bOverflowWarn = FALSE; - String& rData = aDifParser.aData; - BOOL bData = FALSE; + String& rData = aDifParser.aData; + BOOL bData = FALSE; - SCCOL nNumCols = 0; - SCROW nNumRows = 0; + SCCOL nNumCols = 0; + SCROW nNumRows = 0; rIn.Seek( 0 ); @@ -148,14 +148,14 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, if( eTopic == T_DATA ) - { // Ab hier kommen die Daten - SCCOL nBaseCol = rInsPos.Col(); + { // Ab hier kommen die Daten + SCCOL nBaseCol = rInsPos.Col(); - SCCOL nColCnt = SCCOL_MAX; - SCROW nRowCnt = rInsPos.Row(); - DifAttrCache aAttrCache( bPlain ); + SCCOL nColCnt = SCCOL_MAX; + SCROW nRowCnt = rInsPos.Row(); + DifAttrCache aAttrCache( bPlain ); - DATASET eAkt = D_UNKNOWN; + DATASET eAkt = D_UNKNOWN; while( eAkt != D_EOD ) { @@ -172,13 +172,13 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, break; case D_EOD: break; - case D_NUMERIC: // Numbercell + case D_NUMERIC: // Numbercell if( nColCnt == SCCOL_MAX ) nColCnt = nBaseCol; if( ValidCol(nColCnt) && ValidRow(nRowCnt) ) { - ScBaseCell* pCell; + ScBaseCell* pCell; if( DifParser::IsV( rData.GetBuffer() ) ) { pCell = new ScValueCell( aDifParser.fVal ); @@ -212,7 +212,7 @@ FltError ScFormatFilterPluginImpl::ScImportDif( SvStream& rIn, ScDocument* pDoc, nColCnt++; break; - case D_STRING: // Textcell + case D_STRING: // Textcell if( nColCnt == SCCOL_MAX ) nColCnt = nBaseCol; @@ -291,9 +291,9 @@ TOPIC DifParser::GetNextTopic( void ) static const sal_Unicode pKeyDISPLAYUNITS[] = { 'D', 'I', 'S', 'P', 'L', 'A', 'Y', 'U', 'N', 'I', 'T', 'S', 0 }; static const sal_Unicode pKeyUNKNOWN[] = { 0 }; - static const sal_Unicode* ppKeys[] = + static const sal_Unicode* ppKeys[] = { - pKeyTABLE, // 0 + pKeyTABLE, // 0 pKeyVECTORS, pKeyTUPLES, pKeyDATA, @@ -306,29 +306,29 @@ TOPIC DifParser::GetNextTopic( void ) pKeyTRUELENGTH, // 10 pKeyUINITS, pKeyDISPLAYUNITS, - pKeyUNKNOWN // 13 + pKeyUNKNOWN // 13 }; - static const TOPIC pTopics[] = + static const TOPIC pTopics[] = { - T_TABLE, // 0 + T_TABLE, // 0 T_VECTORS, T_TUPLES, T_DATA, T_LABEL, - T_COMMENT, // 5 + T_COMMENT, // 5 T_SIZE, T_PERIODICITY, T_MAJORSTART, T_MINORSTART, - T_TRUELENGTH, // 10 + T_TRUELENGTH, // 10 T_UINITS, T_DISPLAYUNITS, - T_UNKNOWN // 13 + T_UNKNOWN // 13 }; - STATE eS = S_START; - String aLine; + STATE eS = S_START; + String aLine; nVector = 0; nVal = 0; @@ -346,9 +346,9 @@ TOPIC DifParser::GetNextTopic( void ) { case S_START: { - const sal_Unicode* pRef; - UINT16 nCnt = 0; - BOOL bSearch = TRUE; + const sal_Unicode* pRef; + UINT16 nCnt = 0; + BOOL bSearch = TRUE; pRef = ppKeys[ nCnt ]; @@ -376,7 +376,7 @@ TOPIC DifParser::GetNextTopic( void ) break; case S_VectorVal: { - const sal_Unicode* pCur = aLine.GetBuffer(); + const sal_Unicode* pCur = aLine.GetBuffer(); pCur = ScanIntVal( pCur, nVector ); @@ -405,7 +405,7 @@ TOPIC DifParser::GetNextTopic( void ) case S_UNKNOWN: // 2 Zeilen ueberlesen ReadNextLine( aLine ); - case S_ERROR_L2: // Fehler in Line 2 aufgetreten + case S_ERROR_L2: // Fehler in Line 2 aufgetreten // eine Zeile ueberlesen ReadNextLine( aLine ); eS = S_END; @@ -421,10 +421,10 @@ TOPIC DifParser::GetNextTopic( void ) static void lcl_DeEscapeQuotesDif( String& rString ) { - // Special handling for DIF import: Escaped (duplicated) quotes are resolved. - // Single quote characters are left in place because older versions didn't - // escape quotes in strings (and Excel doesn't when using the clipboard). - // The quotes around the string are removed before this function is called. + // Special handling for DIF import: Escaped (duplicated) quotes are resolved. + // Single quote characters are left in place because older versions didn't + // escape quotes in strings (and Excel doesn't when using the clipboard). + // The quotes around the string are removed before this function is called. static const sal_Unicode aDQ[] = { '"', '"', 0 }; xub_StrLen nPos = 0; @@ -478,7 +478,7 @@ bool DifParser::ReadNextLine( String& rStr ) } } -// Look ahead in the stream to determine if the next line is the first line of +// Look ahead in the stream to determine if the next line is the first line of // a valid data record structure bool DifParser::LookAhead() { @@ -518,11 +518,11 @@ bool DifParser::LookAhead() return bValidStructure; } -DATASET DifParser::GetNextDataset( void ) +DATASET DifParser::GetNextDataset( void ) { - DATASET eRet = D_UNKNOWN; - String aLine; - const sal_Unicode* pAktBuffer; + DATASET eRet = D_UNKNOWN; + String aLine; + const sal_Unicode* pAktBuffer; ReadNextLine( aLine ); @@ -530,7 +530,7 @@ DATASET DifParser::GetNextDataset( void ) switch( *pAktBuffer ) { - case '-': // Special Datatype + case '-': // Special Datatype pAktBuffer++; if( Is1_0( pAktBuffer ) ) @@ -542,8 +542,8 @@ DATASET DifParser::GetNextDataset( void ) eRet = D_EOD; } break; - case '0': // Numeric Data - pAktBuffer++; // Wert in fVal, 2. Zeile in aData + case '0': // Numeric Data + pAktBuffer++; // Wert in fVal, 2. Zeile in aData if( *pAktBuffer == ',' ) { pAktBuffer++; @@ -561,7 +561,7 @@ DATASET DifParser::GetNextDataset( void ) } } break; - case '1': // String Data + case '1': // String Data if( Is1_0( aLine.GetBuffer() ) ) { ReadNextLine( aLine ); @@ -571,7 +571,7 @@ DATASET DifParser::GetNextDataset( void ) if( nLineLength >= 1 && *pLine == '"' ) { // Quotes are not always escaped (duplicated), see lcl_DeEscapeQuotesDif - // A look ahead into the next line is needed in order to deal with + // A look ahead into the next line is needed in order to deal with // multiline strings containing quotes if( LookAhead() ) { @@ -634,7 +634,7 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRe while (*pStart == ' ' || *pStart == '\t') ++pStart; - sal_Unicode cAkt = *pStart; + sal_Unicode cAkt = *pStart; if( IsNumber( cAkt ) ) rRet = ( UINT32 ) ( cAkt - '0' ); @@ -659,20 +659,20 @@ const sal_Unicode* DifParser::ScanIntVal( const sal_Unicode* pStart, UINT32& rRe BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart ) { - double fNewVal = 0.0; - BOOL bNeg = FALSE; + double fNewVal = 0.0; + BOOL bNeg = FALSE; double fFracPos = 1.0; - INT32 nExp = 0; - BOOL bExpNeg = FALSE; - BOOL bExpOverflow = FALSE; - static const UINT16 nExpLimit = 4096; // ACHTUNG: muss genauer ermittelt werden! + INT32 nExp = 0; + BOOL bExpNeg = FALSE; + BOOL bExpOverflow = FALSE; + static const UINT16 nExpLimit = 4096; // ACHTUNG: muss genauer ermittelt werden! - sal_Unicode cAkt; - BOOL bRet = FALSE; + sal_Unicode cAkt; + BOOL bRet = FALSE; enum STATE { S_FIRST, S_PRE, S_POST, S_EXP_FIRST, S_EXP, S_END, S_FINDEND }; - STATE eS = S_FIRST; + STATE eS = S_FIRST; fNewVal = 0.0; @@ -700,7 +700,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart ) bNeg = !bNeg; break; case '.': - case ',': //! + case ',': //! eS = S_POST; fFracPos = 0.1; break; @@ -720,7 +720,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart ) switch( cAkt ) { case '.': - case ',': //! + case ',': //! eS = S_POST; fFracPos = 0.1; break; @@ -728,9 +728,9 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart ) case 'E': eS = S_EXP; break; - case 0x00: // IsNumberEnding( cAkt ) - bRet = TRUE; // no - default: // break! + case 0x00: // IsNumberEnding( cAkt ) + bRet = TRUE; // no + default: // break! eS = S_END; } } @@ -749,9 +749,9 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart ) case 'E': eS = S_EXP_FIRST; break; - case 0x00: // IsNumberEnding( cAkt ) - bRet = TRUE; // no - default: // break! + case 0x00: // IsNumberEnding( cAkt ) + bRet = TRUE; // no + default: // break! eS = S_END; } } @@ -803,7 +803,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart ) case S_FINDEND: if( IsNumberEnding( cAkt ) ) { - bRet = TRUE; // damit sinnvoll weitergeparst werden kann + bRet = TRUE; // damit sinnvoll weitergeparst werden kann eS = S_END; } break; @@ -819,7 +819,7 @@ BOOL DifParser::ScanFloatVal( const sal_Unicode* pStart ) if( bRet ) { if( bExpOverflow ) - return sal_False; // ACHTUNG: hier muss noch differenziert werden + return sal_False; // ACHTUNG: hier muss noch differenziert werden if( bNeg ) fNewVal *= 1.0; @@ -920,8 +920,8 @@ void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab, con void DifColumn::Apply( ScDocument& rDoc, const SCCOL nCol, const SCTAB nTab ) { - ScPatternAttr aAttr( rDoc.GetPool() ); - SfxItemSet& rItemSet = aAttr.GetItemSet(); + ScPatternAttr aAttr( rDoc.GetPool() ); + SfxItemSet& rItemSet = aAttr.GetItemSet(); ENTRY* pEntry = ( ENTRY* ) List::First(); @@ -975,7 +975,7 @@ void DifAttrCache::Apply( ScDocument& rDoc, SCTAB nTab ) { if( bPlain ) { - ScPatternAttr* pPatt = NULL; + ScPatternAttr* pPatt = NULL; for( SCCOL nCol = 0 ; nCol <= MAXCOL ; nCol++ ) { 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/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 diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index ac41cc47b224..37bb7d60180e 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.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/ftools/fprogressbar.cxx b/sc/source/filter/ftools/fprogressbar.cxx index 533891b0d6fc..d69559a63e6a 100644 --- a/sc/source/filter/ftools/fprogressbar.cxx +++ b/sc/source/filter/ftools/fprogressbar.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/ftools/ftools.cxx b/sc/source/filter/ftools/ftools.cxx index ce6264b50828..772f38694cdd 100644 --- a/sc/source/filter/ftools/ftools.cxx +++ b/sc/source/filter/ftools/ftools.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/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 3b656448af39..bf12e7b2dc4a 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.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 @@ // ohne sc.hrc: error C2679: binary '=' : no operator defined which takes a // right-hand operand of type 'const class String (__stdcall *)(class ScResId)' // bei -// const String aStrTable( ScResId( SCSTR_TABLE ) ); aStrOut = aStrTable; +// const String aStrTable( ScResId( SCSTR_TABLE ) ); aStrOut = aStrTable; // ?!??? #include "sc.hrc" #include "globstr.hrc" @@ -105,10 +105,10 @@ //======================================================================== -const static sal_Char __FAR_DATA sMyBegComment[] = "<!-- "; -const static sal_Char __FAR_DATA sMyEndComment[] = " -->"; -const static sal_Char __FAR_DATA sFontFamily[] = "font-family:"; -const static sal_Char __FAR_DATA sFontSize[] = "font-size:"; +const static sal_Char __FAR_DATA sMyBegComment[] = "<!-- "; +const static sal_Char __FAR_DATA sMyEndComment[] = " -->"; +const static sal_Char __FAR_DATA sFontFamily[] = "font-family:"; +const static sal_Char __FAR_DATA sFontSize[] = "font-size:"; const USHORT __FAR_DATA ScHTMLExport::nDefaultFontSize[SC_HTML_FONTSIZES] = { @@ -130,25 +130,25 @@ const sal_Char __FAR_DATA ScHTMLExport::sIndentSource[nIndentMax+1] = //======================================================================== // Makros fuer HTML-Export //======================================================================== -#define OUT_PROLOGUE() (rStrm << sHTML30_Prologue << ScExportBase::sNewLine \ +#define OUT_PROLOGUE() (rStrm << sHTML30_Prologue << ScExportBase::sNewLine \ << ScExportBase::sNewLine) -#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag ) -#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag, FALSE ) +#define TAG_ON( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag ) +#define TAG_OFF( tag ) HTMLOutFuncs::Out_AsciiTag( rStrm, tag, FALSE ) #define OUT_STR( str ) HTMLOutFuncs::Out_String( rStrm, str, eDestEnc, &aNonConvertibleChars ) #define OUT_STR_NO_CONV( str ) HTMLOutFuncs::Out_String( rStrm, str, eDestEnc ) -#define OUT_LF() rStrm << ScExportBase::sNewLine << GetIndentStr() -#define lcl_OUT_LF() rStrm << ScExportBase::sNewLine -#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ScExportBase::sNewLine << GetIndentStr()) -#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ScExportBase::sNewLine << GetIndentStr()) -#define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule ) -#define OUT_COMMENT( comment ) (rStrm << sMyBegComment, OUT_STR( comment ) \ +#define OUT_LF() rStrm << ScExportBase::sNewLine << GetIndentStr() +#define lcl_OUT_LF() rStrm << ScExportBase::sNewLine +#define TAG_ON_LF( tag ) (TAG_ON( tag ) << ScExportBase::sNewLine << GetIndentStr()) +#define TAG_OFF_LF( tag ) (TAG_OFF( tag ) << ScExportBase::sNewLine << GetIndentStr()) +#define OUT_HR() TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_horzrule ) +#define OUT_COMMENT( comment ) (rStrm << sMyBegComment, OUT_STR( comment ) \ << sMyEndComment << ScExportBase::sNewLine \ << GetIndentStr()) #define lcl_OUT_COMMENT( comment ) (rStrm << sMyBegComment, OUT_STR_NO_CONV( comment ) \ << sMyEndComment << ScExportBase::sNewLine) -#define OUT_SP_CSTR_ASS( s ) rStrm << ' ' << s << '=' -#define APPEND_SPACE( s ) s.AppendAscii(" ") +#define OUT_SP_CSTR_ASS( s ) rStrm << ' ' << s << '=' +#define APPEND_SPACE( s ) s.AppendAscii(" ") #define GLOBSTR(id) ScGlobal::GetRscString( id ) @@ -176,8 +176,8 @@ void lcl_AddStamp( String& rStr, const String& rName, rDateTime.HundredthSeconds); DateTime aDateTime(aD,aT); - String aStrDate = rLoc.getDate( aDateTime ); - String aStrTime = rLoc.getTime( aDateTime ); + String aStrDate = rLoc.getDate( aDateTime ); + String aStrTime = rLoc.getTime( aDateTime ); rStr += GLOBSTR( STR_BY ); APPEND_SPACE( rStr ); @@ -203,8 +203,8 @@ void lcl_AddStamp( String& rStr, const String& rName, void lcl_AppendHTMLColorTripel( ByteString& rStr, const Color& rColor ) { // <font COLOR="#00FF40">hallo</font> - sal_Char buf[64]; - sal_Char* p = buf; + sal_Char buf[64]; + sal_Char* p = buf; rStr += "\"#"; p += sprintf( p, "%02X", rColor.GetRed() ); // #100211# - checked @@ -306,7 +306,7 @@ USHORT ScHTMLExport::GetFontSizeNumber( USHORT nHeight ) for ( USHORT j=SC_HTML_FONTSIZES-1; j>0; j-- ) { if( nHeight > (nFontSize[j] + nFontSize[j-1]) / 2 ) - { // der naechstgelegene + { // der naechstgelegene nSize = j+1; break; } @@ -327,7 +327,7 @@ USHORT ScHTMLExport::ToPixel( USHORT nVal ) { nVal = (USHORT)pAppWin->LogicToPixel( Size( nVal, nVal ), MapMode( MAP_TWIP ) ).Width(); - if( !nVal ) // wo ein Twip ist sollte auch ein Pixel sein + if( !nVal ) // wo ein Twip ist sollte auch ein Pixel sein nVal = 1; } return nVal; @@ -411,7 +411,7 @@ void ScHTMLExport::WriteHeader() rStrm << '\"'; } else - { // Fontliste, VCL: Semikolon als Separator, + { // Fontliste, VCL: Semikolon als Separator, // CSS1: Komma als Separator und jeder einzelne Fontname quoted const String& rList = aHTMLStyle.aFontFamilyName; for ( xub_StrLen j = 0, nPos = 0; j < nFonts; j++ ) @@ -444,7 +444,7 @@ void ScHTMLExport::WriteOverview() OUT_STR( ScGlobal::GetRscString( STR_OVERVIEW ) ); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_head1 ); - String aStr; + String aStr; const SCTAB nCount = pDoc->GetTableCount(); for ( SCTAB nTab = 0; nTab < nCount; nTab++ ) @@ -469,8 +469,8 @@ void ScHTMLExport::WriteOverview() const SfxItemSet& ScHTMLExport::PageDefaults( SCTAB nTab ) { - SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); - SfxStyleSheetBase* pStyleSheet = NULL; + SfxStyleSheetBasePool* pStylePool = pDoc->GetStyleSheetPool(); + SfxStyleSheetBase* pStyleSheet = NULL; DBG_ASSERT( pStylePool, "StylePool not found! :-(" ); // remember defaults for compare in WriteCell @@ -572,7 +572,7 @@ void ScHTMLExport::WriteBody() aGrfNm = aStreamPath; USHORT nErr = XOutBitmap::WriteGraphic( *pGrf, aGrfNm, CREATE_STRING( "JPG" ), XOUTBMP_USE_NATIVE_IF_POSSIBLE ); - if( !nErr ) // fehlerhaft, da ist nichts auszugeben + if( !nErr ) // fehlerhaft, da ist nichts auszugeben { aGrfNm = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), @@ -628,21 +628,21 @@ void ScHTMLExport::WriteBody() void ScHTMLExport::WriteTables() { - const SCTAB nTabCount = pDoc->GetTableCount(); - const String aStrTable( ScResId( SCSTR_TABLE ) ); - String aStr; - String aStrOut; - SCCOL nStartCol; - SCROW nStartRow; - SCTAB nStartTab; - SCCOL nEndCol; - SCROW nEndRow; - SCTAB nEndTab; + const SCTAB nTabCount = pDoc->GetTableCount(); + const String aStrTable( ScResId( SCSTR_TABLE ) ); + String aStr; + String aStrOut; + SCCOL nStartCol; + SCROW nStartRow; + SCTAB nStartTab; + SCCOL nEndCol; + SCROW nEndRow; + SCTAB nEndTab; SCCOL nStartColFix = 0; SCROW nStartRowFix = 0; SCCOL nEndColFix = 0; SCROW nEndRowFix = 0; - ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); + ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer(); if ( bAll ) { nStartTab = 0; @@ -661,12 +661,12 @@ void ScHTMLExport::WriteTables() for ( SCTAB nTab=nStartTab; nTab<=nEndTab; nTab++ ) { if ( !pDoc->IsVisible( nTab ) ) - continue; // for + continue; // for if ( bAll ) { if ( !GetDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ) ) - continue; // for + continue; // for if ( nUsedTables > 1 ) { @@ -700,12 +700,12 @@ void ScHTMLExport::WriteTables() nEndCol = nEndColFix; nEndRow = nEndRowFix; if ( !TrimDataArea( nTab, nStartCol, nStartRow, nEndCol, nEndRow ) ) - continue; // for + continue; // for } // <TABLE ...> - ByteString aByteStrOut = OOO_STRING_SVTOOLS_HTML_table; -// aStrOut = OOO_STRING_SVTOOLS_HTML_table; + ByteString aByteStrOut = OOO_STRING_SVTOOLS_HTML_table; +// aStrOut = OOO_STRING_SVTOOLS_HTML_table; // FRAME=VOID, we do the styling of the cells in <TD> (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_frame) += '=') += OOO_STRING_SVTOOLS_HTML_TF_void; @@ -742,14 +742,14 @@ void ScHTMLExport::WriteTables() // <COLGROUP> TAG_ON( OOO_STRING_SVTOOLS_HTML_colgroup ); // <COL WIDTH=x> as pre-info for long tables - ByteString aByteStr = OOO_STRING_SVTOOLS_HTML_col; + ByteString aByteStr = OOO_STRING_SVTOOLS_HTML_col; aByteStr += ' '; aByteStr += OOO_STRING_SVTOOLS_HTML_O_width; aByteStr += '='; for ( nCol=nStartCol; nCol<=nEndCol; nCol++ ) { if ( pDoc->ColHidden(nCol, nTab) ) - continue; // for + continue; // for aByteStrOut = aByteStr; aByteStrOut += ByteString::CreateFromInt32( @@ -770,7 +770,7 @@ void ScHTMLExport::WriteTables() { nRow = pDoc->FirstVisibleRow(nRow+1, nEndRow, nTab); --nRow; - continue; // for + continue; // for } IncIndent(1); TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tablerow ); @@ -778,7 +778,7 @@ void ScHTMLExport::WriteTables() for ( SCCOL nCol2=nStartCol; nCol2<=nEndCol; nCol2++ ) { if ( pDoc->ColHidden(nCol2, nTab) ) - continue; // for + continue; // for if ( nCol2 == nEndCol ) IncIndent(-1); @@ -806,7 +806,7 @@ void ScHTMLExport::WriteTables() } aGraphList.Clear(); if ( bTabAlignedLeft ) - { // clear <TABLE ALIGN=LEFT> with <BR CLEAR=LEFT> + { // clear <TABLE ALIGN=LEFT> with <BR CLEAR=LEFT> aByteStrOut = OOO_STRING_SVTOOLS_HTML_linebreak; (((aByteStrOut += ' ') += OOO_STRING_SVTOOLS_HTML_O_clear) += '=') += OOO_STRING_SVTOOLS_HTML_AL_left; TAG_ON_LF( aByteStrOut.GetBuffer() ); @@ -832,7 +832,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) ScHTMLGraphEntry* pGraphEntry = NULL; if ( bTabHasGraphics ) { - for ( pGraphEntry = aGraphList.First(); pGraphEntry; + for ( pGraphEntry = aGraphList.First(); pGraphEntry; pGraphEntry = aGraphList.Next() ) { if ( pGraphEntry->bInCell && pGraphEntry->aRange.In( aPos ) ) @@ -840,7 +840,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) if ( pGraphEntry->aRange.aStart == aPos ) break; // for else - return ; // ist ein Col/RowSpan, Overlapped + return ; // ist ein Col/RowSpan, Overlapped } } } @@ -965,15 +965,15 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) Color aBgColor; if ( rBrushItem.GetColor().GetTransparency() == 255 ) - aBgColor = aHTMLStyle.aBackgroundColor; // #55121# keine ungewollte Hintergrundfarbe + aBgColor = aHTMLStyle.aBackgroundColor; // #55121# keine ungewollte Hintergrundfarbe else aBgColor = rBrushItem.GetColor(); - BOOL bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() ); - BOOL bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() ); - BOOL bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetLineStyle() ); - BOOL bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // #97650# default is AUTO now - BOOL bSetFontName = ( aHTMLStyle.aFontFamilyName != rFontItem.GetFamilyName() ); + BOOL bBold = ( WEIGHT_BOLD <= rWeightItem.GetWeight() ); + BOOL bItalic = ( ITALIC_NONE != rPostureItem.GetPosture() ); + BOOL bUnderline = ( UNDERLINE_NONE != rUnderlineItem.GetLineStyle() ); + BOOL bSetFontColor = ( COL_AUTO != rColorItem.GetValue().GetColor() ); // #97650# default is AUTO now + BOOL bSetFontName = ( aHTMLStyle.aFontFamilyName != rFontItem.GetFamilyName() ); USHORT nSetFontSizeNumber = 0; UINT32 nFontHeight = rFontHeightItem.GetHeight(); if ( nFontHeight != aHTMLStyle.nFontHeight ) @@ -994,23 +994,23 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) case SVX_HOR_JUSTIFY_STANDARD: pChar = (bValueData ? OOO_STRING_SVTOOLS_HTML_AL_right : OOO_STRING_SVTOOLS_HTML_AL_left); break; - case SVX_HOR_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_AL_center; break; - case SVX_HOR_JUSTIFY_BLOCK: pChar = OOO_STRING_SVTOOLS_HTML_AL_justify; break; - case SVX_HOR_JUSTIFY_RIGHT: pChar = OOO_STRING_SVTOOLS_HTML_AL_right; break; + case SVX_HOR_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_AL_center; break; + case SVX_HOR_JUSTIFY_BLOCK: pChar = OOO_STRING_SVTOOLS_HTML_AL_justify; break; + case SVX_HOR_JUSTIFY_RIGHT: pChar = OOO_STRING_SVTOOLS_HTML_AL_right; break; case SVX_HOR_JUSTIFY_LEFT: case SVX_HOR_JUSTIFY_REPEAT: - default: pChar = OOO_STRING_SVTOOLS_HTML_AL_left; break; + default: pChar = OOO_STRING_SVTOOLS_HTML_AL_left; break; } (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_align) += '=') += pChar; switch( rVerJustifyItem.GetValue() ) { - case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_HTML_VA_top; break; - case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_VA_middle; break; - case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_HTML_VA_bottom; break; + case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_HTML_VA_top; break; + case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_HTML_VA_middle; break; + case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_HTML_VA_bottom; break; case SVX_VER_JUSTIFY_STANDARD: - default: pChar = NULL; + default: pChar = NULL; } if ( pChar ) (((aStrTD += ' ') += OOO_STRING_SVTOOLS_HTML_O_valign) += '=') += pChar; @@ -1049,31 +1049,31 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) TAG_ON( aStrTD.GetBuffer() ); - if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); - if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); - if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline ); + if ( bBold ) TAG_ON( OOO_STRING_SVTOOLS_HTML_bold ); + if ( bItalic ) TAG_ON( OOO_STRING_SVTOOLS_HTML_italic ); + if ( bUnderline ) TAG_ON( OOO_STRING_SVTOOLS_HTML_underline ); if ( bSetFont ) { - ByteString aStr = OOO_STRING_SVTOOLS_HTML_font; + ByteString aStr = OOO_STRING_SVTOOLS_HTML_font; if ( bSetFontName ) { ((aStr += ' ') += OOO_STRING_SVTOOLS_HTML_O_face) += "=\""; xub_StrLen nFonts = rFontItem.GetFamilyName().GetTokenCount( ';' ); if ( nFonts == 1 ) { - ByteString aTmpStr; + ByteString aTmpStr; HTMLOutFuncs::ConvertStringToHTML( rFontItem.GetFamilyName(), aTmpStr, eDestEnc, &aNonConvertibleChars ); aStr += aTmpStr; } else - { // Fontliste, VCL: Semikolon als Separator, HTML: Komma + { // Fontliste, VCL: Semikolon als Separator, HTML: Komma const String& rList = rFontItem.GetFamilyName(); for ( xub_StrLen j = 0, nPos = 0; j < nFonts; j++ ) { - ByteString aTmpStr; + ByteString aTmpStr; HTMLOutFuncs::ConvertStringToHTML( rList.GetToken( 0, ';', nPos ), aTmpStr, eDestEnc, &aNonConvertibleChars ); @@ -1091,9 +1091,9 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) } if ( bSetFontColor ) { - Color aColor = rColorItem.GetValue(); + Color aColor = rColorItem.GetValue(); - // always export automatic text color as black + // always export automatic text color as black if ( aColor.GetColor() == COL_AUTO ) aColor.SetColor( COL_BLACK ); @@ -1106,7 +1106,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) String aStrOut; BOOL bFieldText = FALSE; if ( pCell ) - { // cell content + { // cell content Color* pColor; switch ( pCell->GetCellType() ) { @@ -1126,7 +1126,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) { if ( !aStrOut.Len() ) { - TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle + TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); // #42573# keine komplett leere Zelle } else { @@ -1144,7 +1144,7 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) OUT_STR( aSingleLine ); TAG_ON( OOO_STRING_SVTOOLS_HTML_linebreak ); nStartPos = nPos + 1; - } + } while( ( nPos = aStrOut.Search( _LF, nStartPos ) ) != STRING_NOTFOUND ); String aSingleLine( aStrOut, nStartPos, aStrOut.Len() - nStartPos ); OUT_STR( aSingleLine ); @@ -1154,10 +1154,10 @@ void ScHTMLExport::WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ) if ( pGraphEntry ) WriteGraphEntry( pGraphEntry ); - if ( bSetFont ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_font ); - if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline ); - if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic ); - if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); + if ( bSetFont ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_font ); + if ( bUnderline ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_underline ); + if ( bItalic ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_italic ); + if ( bBold ) TAG_OFF( OOO_STRING_SVTOOLS_HTML_bold ); TAG_OFF_LF( OOO_STRING_SVTOOLS_HTML_tabledata ); } @@ -1183,7 +1183,7 @@ BOOL ScHTMLExport::WriteFieldText( const ScEditCell* pCell ) if ( bFields ) { BOOL bOldUpdateMode = rEngine.GetUpdateMode(); - rEngine.SetUpdateMode( TRUE ); // no portions if not formatted + rEngine.SetUpdateMode( TRUE ); // no portions if not formatted for ( USHORT nPar=0; nPar < nParas; nPar++ ) { if ( nPar > 0 ) @@ -1208,8 +1208,8 @@ BOOL ScHTMLExport::WriteFieldText( const ScEditCell* pCell ) if ( pField && pField->ISA(SvxURLField) ) { bUrl = TRUE; - const SvxURLField* pURLField = (const SvxURLField*)pField; -// String aFieldText = rEngine.GetText( aSel ); + const SvxURLField* pURLField = (const SvxURLField*)pField; +// String aFieldText = rEngine.GetText( aSel ); rStrm << '<' << OOO_STRING_SVTOOLS_HTML_anchor << ' ' << OOO_STRING_SVTOOLS_HTML_O_href << "=\""; OUT_STR( pURLField->GetURL() ); rStrm << "\">"; @@ -1279,7 +1279,7 @@ BOOL ScHTMLExport::CopyLocalFileToINet( String& rFileNm, FALSE ); // temp. File anlegen - // aMedium.DownLoad(); + // aMedium.DownLoad(); { SvFileStream aCpy( aMedium.GetPhysicalName(), STREAM_WRITE ); diff --git a/sc/source/filter/html/htmlexp2.cxx b/sc/source/filter/html/htmlexp2.cxx index c6299bda127a..6b21a4097cf4 100644 --- a/sc/source/filter/html/htmlexp2.cxx +++ b/sc/source/filter/html/htmlexp2.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 @@ -58,7 +58,7 @@ using namespace com::sun::star; //------------------------------------------------------------------------ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, - SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) + SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { if ( pDrawLayer->HasObjectsInRows( nTab, nStartRow, nEndRow ) ) { @@ -72,7 +72,7 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, pE = aGraphList.Next() ) { if ( !pE->bInCell ) - { // nicht alle in Zellen: einige neben Tabelle + { // nicht alle in Zellen: einige neben Tabelle bTabAlignedLeft = TRUE; break; } @@ -83,9 +83,9 @@ void ScHTMLExport::PrepareGraphics( ScDrawLayer* pDrawLayer, SCTAB nTab, void ScHTMLExport::FillGraphList( const SdrPage* pPage, SCTAB nTab, - SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) + SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { - ULONG nObjCount = pPage->GetObjCount(); + ULONG nObjCount = pPage->GetObjCount(); if ( nObjCount ) { Rectangle aRect; @@ -208,7 +208,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf, nXOutFlags |= XOUTBMP_USE_NATIVE_IF_POSSIBLE; USHORT nErr = XOutBitmap::WriteGraphic( rGrf, aGrfNm, CREATE_STRING( "JPG" ), nXOutFlags ); - if( !nErr ) // sonst fehlerhaft, da ist nichts auszugeben + if( !nErr ) // sonst fehlerhaft, da ist nichts auszugeben { rLinkName = URIHelper::SmartRel2Abs( INetURLObject(aBaseURL), @@ -234,7 +234,7 @@ void ScHTMLExport::WriteImage( String& rLinkName, const Graphic& rGrf, URIHelper::GetMaybeFileHdl()); } if( rLinkName.Len() ) - { // <IMG SRC="..."[ rImgOptions]> + { // <IMG SRC="..."[ rImgOptions]> rStrm << '<' << OOO_STRING_SVTOOLS_HTML_image << ' ' << OOO_STRING_SVTOOLS_HTML_O_src << "=\""; HTMLOutFuncs::Out_String( rStrm, URIHelper::simpleNormalizedMakeRelative( aBaseURL, diff --git a/sc/source/filter/html/htmlimp.cxx b/sc/source/filter/html/htmlimp.cxx index 0c5e0ffd0b4c..b1ad5a1cbb83 100644 --- a/sc/source/filter/html/htmlimp.cxx +++ b/sc/source/filter/html/htmlimp.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 @@ -136,7 +136,7 @@ void ScHTMLImport::InsertRangeName( ScDocument* pDoc, const String& rName, const delete pRangeData; } -void ScHTMLImport::WriteToDocument( +void ScHTMLImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNumberFormatter* pFormatter, bool bConvertDate ) { ScEEImport::WriteToDocument( bSizeColsRows, nOutputFactor, pFormatter, bConvertDate ); @@ -233,7 +233,7 @@ String ScHTMLImport::GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrig { String aToken( rOrigName.GetToken( 0, ';', nStringIx ) ); if( pRangeNames && ScfTools::IsHTMLTablesName( aToken ) ) - { // build list with all HTML tables + { // build list with all HTML tables ULONG nIndex = 1; USHORT nPos; BOOL bLoop = TRUE; diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx index e7caef029ed1..cddc2dedfe24 100644 --- a/sc/source/filter/html/htmlpars.cxx +++ b/sc/source/filter/html/htmlpars.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/inc/XclExpChangeTrack.hxx b/sc/source/filter/inc/XclExpChangeTrack.hxx index f908fb1d9668..24a0546f1681 100644 --- a/sc/source/filter/inc/XclExpChangeTrack.hxx +++ b/sc/source/filter/inc/XclExpChangeTrack.hxx @@ -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,16 +49,16 @@ class XclExpUserBView : public ExcRecord { private: XclExpString sUsername; - sal_uInt8 aGUID[ 16 ]; + sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclExpUserBView( const String& rUsername, const sal_uInt8* pGUID ); - inline const sal_uInt8* GetGUID() const { return aGUID; } + inline const sal_uInt8* GetGUID() const { return aGUID; } - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -68,17 +68,17 @@ public: class XclExpUserBViewList : public ExcEmptyRec, private List { private: - inline XclExpUserBView* _First() { return (XclExpUserBView*) List::First(); } - inline XclExpUserBView* _Next() { return (XclExpUserBView*) List::Next(); } + inline XclExpUserBView* _First() { return (XclExpUserBView*) List::First(); } + inline XclExpUserBView* _Next() { return (XclExpUserBView*) List::Next(); } public: XclExpUserBViewList( const ScChangeTrack& rChangeTrack ); - virtual ~XclExpUserBViewList(); + virtual ~XclExpUserBViewList(); - inline const XclExpUserBView* First() { return (const XclExpUserBView*) List::First(); } - inline const XclExpUserBView* Next() { return (const XclExpUserBView*) List::Next(); } + inline const XclExpUserBView* First() { return (const XclExpUserBView*) List::First(); } + inline const XclExpUserBView* Next() { return (const XclExpUserBView*) List::Next(); } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); }; //___________________________________________________________________ @@ -87,14 +87,14 @@ public: class XclExpUsersViewBegin : public ExcRecord { private: - sal_uInt8 aGUID[ 16 ]; - sal_uInt32 nCurrTab; + sal_uInt8 aGUID[ 16 ]; + sal_uInt32 nCurrTab; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 nTab ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -104,10 +104,10 @@ public: class XclExpUsersViewEnd : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -117,10 +117,10 @@ public: class XclExpChTr0x0191 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -130,10 +130,10 @@ public: class XclExpChTr0x0198 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -143,10 +143,10 @@ public: class XclExpChTr0x0192 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -156,10 +156,10 @@ public: class XclExpChTr0x0197 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -169,13 +169,13 @@ public: class XclExpChTrEmpty : public ExcRecord { private: - UINT16 nRecNum; + UINT16 nRecNum; public: - inline XclExpChTrEmpty( UINT16 nNum ) : nRecNum( nNum ) {} - virtual ~XclExpChTrEmpty(); + inline XclExpChTrEmpty( UINT16 nNum ) : nRecNum( nNum ) {} + virtual ~XclExpChTrEmpty(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -185,12 +185,12 @@ public: class XclExpChTr0x0195 : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - virtual ~XclExpChTr0x0195(); + virtual ~XclExpChTr0x0195(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -201,15 +201,15 @@ class XclExpChTr0x0194 : public ExcRecord { private: XclExpString sUsername; - DateTime aDateTime; + DateTime aDateTime; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTr0x0194(); + inline XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ); + virtual ~XclExpChTr0x0194(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -225,19 +225,19 @@ inline XclExpChTr0x0194::XclExpChTr0x0194( const ScChangeTrack& rChangeTrack ) : class XclExpChTrHeader : public ExcRecord { private: - sal_uInt8 aGUID[ 16 ]; - sal_uInt32 nCount; + sal_uInt8 aGUID[ 16 ]; + sal_uInt32 nCount; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - inline XclExpChTrHeader() : nCount( 0 ) {} - virtual ~XclExpChTrHeader(); + inline XclExpChTrHeader() : nCount( 0 ) {} + virtual ~XclExpChTrHeader(); - inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } - inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } + inline void SetGUID( const sal_uInt8* pGUID ) { memcpy( aGUID, pGUID, 16 ); } + inline void SetCount( sal_uInt32 nNew ) { nCount = nNew; } - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -251,20 +251,20 @@ class XclExpChTrInfo : public ExcRecord private: XclExpString sUsername; sal_Int32 mnLogNumber; - DateTime aDateTime; - sal_uInt8 aGUID[ 16 ]; + DateTime aDateTime; + sal_uInt8 aGUID[ 16 ]; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - inline XclExpChTrInfo( + inline XclExpChTrInfo( const String& rUsername, const DateTime& rDateTime, const sal_uInt8* pGUID, sal_Int32 nLogNumber ); - virtual ~XclExpChTrInfo(); + virtual ~XclExpChTrInfo(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -284,25 +284,25 @@ inline XclExpChTrInfo::XclExpChTrInfo( const String& rUsername, const DateTime& class XclExpChTrTabIdBuffer { private: - sal_uInt16* pBuffer; - sal_uInt16* pLast; - sal_uInt16 nBufSize; - sal_uInt16 nLastId; + sal_uInt16* pBuffer; + sal_uInt16* pLast; + sal_uInt16 nBufSize; + sal_uInt16 nLastId; public: XclExpChTrTabIdBuffer( sal_uInt16 nCount ); XclExpChTrTabIdBuffer( const XclExpChTrTabIdBuffer& rCopy ); ~XclExpChTrTabIdBuffer(); - void InitFill( sal_uInt16 nIndex ); - void InitFillup(); + void InitFill( sal_uInt16 nIndex ); + void InitFillup(); - sal_uInt16 GetId( sal_uInt16 nIndex ) const; - void Remove(); + sal_uInt16 GetId( sal_uInt16 nIndex ) const; + void Remove(); - inline sal_uInt16 GetBufferCount() const + inline sal_uInt16 GetBufferCount() const { return static_cast< sal_uInt16 >( (pLast - pBuffer) + 1 ); } - inline void GetBufferCopy( sal_uInt16* pDest ) const + inline void GetBufferCopy( sal_uInt16* pDest ) const { memcpy( pDest, pBuffer, sizeof(sal_uInt16) * GetBufferCount() ); } }; @@ -312,13 +312,13 @@ public: class XclExpChTrTabIdBufferList : private List { private: - inline XclExpChTrTabIdBuffer* First() { return (XclExpChTrTabIdBuffer*) List::First(); } - inline XclExpChTrTabIdBuffer* Next() { return (XclExpChTrTabIdBuffer*) List::Next(); } + inline XclExpChTrTabIdBuffer* First() { return (XclExpChTrTabIdBuffer*) List::First(); } + inline XclExpChTrTabIdBuffer* Next() { return (XclExpChTrTabIdBuffer*) List::Next(); } public: - virtual ~XclExpChTrTabIdBufferList(); + virtual ~XclExpChTrTabIdBufferList(); - inline void Append( XclExpChTrTabIdBuffer* pNew ) + inline void Append( XclExpChTrTabIdBuffer* pNew ) { List::Insert( pNew, LIST_APPEND ); } }; @@ -328,23 +328,23 @@ public: class XclExpChTrTabId : public ExcRecord { private: - sal_uInt16* pBuffer; - sal_uInt16 nTabCount; + sal_uInt16* pBuffer; + sal_uInt16 nTabCount; bool mbInRevisionHeaders; - inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } + inline void Clear() { if( pBuffer ) delete[] pBuffer; pBuffer = NULL; } - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: - inline XclExpChTrTabId( sal_uInt16 nCount ) : + inline XclExpChTrTabId( sal_uInt16 nCount ) : pBuffer( NULL ), nTabCount( nCount ), mbInRevisionHeaders( false ) {} XclExpChTrTabId( const XclExpChTrTabIdBuffer& rBuffer, bool bInRevisionHeaders = false ); - virtual ~XclExpChTrTabId(); + virtual ~XclExpChTrTabId(); - void Copy( const XclExpChTrTabIdBuffer& rBuffer ); + void Copy( const XclExpChTrTabIdBuffer& rBuffer ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -356,45 +356,45 @@ public: class XclExpChTrAction : public ExcRecord { private: - String sUsername; - DateTime aDateTime; - sal_uInt32 nIndex; // action number - XclExpChTrAction* pAddAction; // additional record for this action - sal_Bool bAccepted; + String sUsername; + DateTime aDateTime; + sal_uInt32 nIndex; // action number + XclExpChTrAction* pAddAction; // additional record for this action + sal_Bool bAccepted; protected: const XclExpTabInfo& rTabInfo; // for table num export (sc num -> xcl num) - const XclExpChTrTabIdBuffer& rIdBuffer; // for table num export (xcl num -> tab id) - sal_uInt32 nLength; // this is not the record size - sal_uInt16 nOpCode; // EXC_CHTR_OP_*** - sal_Bool bForceInfo; + const XclExpChTrTabIdBuffer& rIdBuffer; // for table num export (xcl num -> tab id) + sal_uInt32 nLength; // this is not the record size + sal_uInt16 nOpCode; // EXC_CHTR_OP_*** + sal_Bool bForceInfo; XclExpChTrAction( const XclExpChTrAction& rCopy ); - void SetAddAction( XclExpChTrAction* pAction ); - void AddDependentContents( + void SetAddAction( XclExpChTrAction* pAction ); + void AddDependentContents( const ScChangeAction& rAction, const XclExpRoot& rRoot, ScChangeTrack& rChangeTrack ); - inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const; - inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const; + inline void Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const; + inline void Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const; inline sal_uInt16 GetTabId( SCTAB nTabId ) const; - inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; + inline void WriteTabId( XclExpStream& rStrm, SCTAB nTabId ) const; // save header data, call SaveActionData() - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); inline sal_Size GetHeaderByteCount() const { return 12; } // overload to save action data without header, called by SaveCont() - virtual void SaveActionData( XclExpStream& rStrm ) const = 0; + virtual void SaveActionData( XclExpStream& rStrm ) const = 0; // overload to get action size without header, called by GetLen() virtual sal_Size GetActionByteCount() const = 0; // do something before writing the record - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const; // do something after writing the record - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const; inline sal_uInt32 GetActionNumber() const { return nIndex; } inline sal_Bool GetAccepted() const { return bAccepted; } @@ -405,18 +405,18 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, sal_uInt16 nNewOpCode = EXC_CHTR_OP_UNKNOWN ); - virtual ~XclExpChTrAction(); + virtual ~XclExpChTrAction(); - inline const String& GetUsername() const { return sUsername; } - inline const DateTime& GetDateTime() const { return aDateTime; } - inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; } - inline sal_Bool ForceInfoRecord() const { return bForceInfo; } + inline const String& GetUsername() const { return sUsername; } + inline const DateTime& GetDateTime() const { return aDateTime; } + inline const XclExpChTrTabIdBuffer& GetTabIdBuffer() const { return rIdBuffer; } + inline sal_Bool ForceInfoRecord() const { return bForceInfo; } // set own index & return new index // could be overloaded to use more indexes per action - virtual void SetIndex( sal_uInt32& rIndex ); + virtual void SetIndex( sal_uInt32& rIndex ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); virtual sal_Size GetLen() const; inline XclExpChTrAction* GetAddAction() { return pAddAction; } @@ -424,16 +424,16 @@ public: inline void XclExpChTrAction::Write2DAddress( XclExpStream& rStrm, const ScAddress& rAddress ) const { - rStrm << (sal_uInt16) rAddress.Row() - << (sal_uInt16) rAddress.Col(); + rStrm << (sal_uInt16) rAddress.Row() + << (sal_uInt16) rAddress.Col(); } inline void XclExpChTrAction::Write2DRange( XclExpStream& rStrm, const ScRange& rRange ) const { - rStrm << (sal_uInt16) rRange.aStart.Row() - << (sal_uInt16) rRange.aEnd.Row() - << (sal_uInt16) rRange.aStart.Col() - << (sal_uInt16) rRange.aEnd.Col(); + rStrm << (sal_uInt16) rRange.aStart.Row() + << (sal_uInt16) rRange.aEnd.Row() + << (sal_uInt16) rRange.aStart.Col() + << (sal_uInt16) rRange.aEnd.Col(); } inline sal_uInt16 XclExpChTrAction::GetTabId( SCTAB nTab ) const @@ -456,19 +456,19 @@ struct XclExpChTrData const ScFormulaCell* mpFormulaCell; XclTokenArrayRef mxTokArr; XclExpRefLog maRefLog; - double fValue; - sal_Int32 nRKValue; - sal_uInt16 nType; + double fValue; + sal_Int32 nRKValue; + sal_uInt16 nType; sal_Size nSize; XclExpChTrData(); ~XclExpChTrData(); - void Clear(); + void Clear(); - void WriteFormula( + void WriteFormula( XclExpStream& rStrm, const XclExpChTrTabIdBuffer& rTabIdBuffer ); - void Write( + void Write( XclExpStream& rStrm, const XclExpChTrTabIdBuffer& rTabIdBuffer ); }; @@ -479,32 +479,32 @@ struct XclExpChTrData class XclExpChTrCellContent : public XclExpChTrAction, protected XclExpRoot { private: - XclExpChTrData* pOldData; - XclExpChTrData* pNewData; - sal_uInt16 nOldLength; // this is not the record size + XclExpChTrData* pOldData; + XclExpChTrData* pNewData; + sal_uInt16 nOldLength; // this is not the record size - void MakeEmptyChTrData( XclExpChTrData*& rpData ); + void MakeEmptyChTrData( XclExpChTrData*& rpData ); protected: - ScAddress aPosition; + ScAddress aPosition; - void GetCellData( + void GetCellData( const XclExpRoot& rRoot, const ScBaseCell* pScCell, XclExpChTrData*& rpData, sal_uInt32& rXclLength1, sal_uInt16& rXclLength2 ); - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; public: XclExpChTrCellContent( const ScChangeActionContent& rAction, const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer ); - virtual ~XclExpChTrCellContent(); + virtual ~XclExpChTrCellContent(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -516,14 +516,14 @@ public: class XclExpChTrInsert : public XclExpChTrAction { protected: - ScRange aRange; + ScRange aRange; XclExpChTrInsert( const XclExpChTrInsert& rCopy ) : XclExpChTrAction( rCopy ), aRange( rCopy.aRange ) {} - virtual void SaveActionData( XclExpStream& rStrm ) const; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const; public: XclExpChTrInsert( @@ -531,9 +531,9 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTrInsert(); + virtual ~XclExpChTrInsert(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -545,19 +545,19 @@ public: class XclExpChTrInsertTab : public XclExpChTrAction, protected XclExpRoot { private: - SCTAB nTab; + SCTAB nTab; protected: - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; public: XclExpChTrInsertTab( const ScChangeAction& rAction, const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer ); - virtual ~XclExpChTrInsertTab(); + virtual ~XclExpChTrInsertTab(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -569,12 +569,12 @@ public: class XclExpChTrMoveRange : public XclExpChTrAction { protected: - ScRange aSourceRange; - ScRange aDestRange; + ScRange aSourceRange; + ScRange aDestRange; - virtual void SaveActionData( XclExpStream& rStrm ) const; - virtual void PrepareSaveAction( XclExpStream& rStrm ) const; - virtual void CompleteSaveAction( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void PrepareSaveAction( XclExpStream& rStrm ) const; + virtual void CompleteSaveAction( XclExpStream& rStrm ) const; public: XclExpChTrMoveRange( @@ -582,9 +582,9 @@ public: const XclExpRoot& rRoot, const XclExpChTrTabIdBuffer& rTabIdBuffer, ScChangeTrack& rChangeTrack ); - virtual ~XclExpChTrMoveRange(); + virtual ~XclExpChTrMoveRange(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -596,13 +596,13 @@ public: class XclExpChTr0x014A : public XclExpChTrInsert { protected: - virtual void SaveActionData( XclExpStream& rStrm ) const; + virtual void SaveActionData( XclExpStream& rStrm ) const; public: XclExpChTr0x014A( const XclExpChTrInsert& rAction ); - virtual ~XclExpChTr0x014A(); + virtual ~XclExpChTr0x014A(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetActionByteCount() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -614,10 +614,10 @@ public: class XclExpChTrActionStack : private Stack { public: - virtual ~XclExpChTrActionStack(); + virtual ~XclExpChTrActionStack(); - void Push( XclExpChTrAction* pNewRec ); - inline XclExpChTrAction* Pop() { return (XclExpChTrAction*) Stack::Pop(); } + void Push( XclExpChTrAction* pNewRec ); + inline XclExpChTrAction* Pop() { return (XclExpChTrAction*) Stack::Pop(); } private: using Stack::Push; @@ -629,16 +629,16 @@ private: class XclExpChTrRecordList : private List { private: - inline ExcRecord* First() { return (ExcRecord*) List::First(); } - inline ExcRecord* Next() { return (ExcRecord*) List::Next(); } + inline ExcRecord* First() { return (ExcRecord*) List::First(); } + inline ExcRecord* Next() { return (ExcRecord*) List::Next(); } public: - virtual ~XclExpChTrRecordList(); + virtual ~XclExpChTrRecordList(); using List::Count; - void Append( ExcRecord* pNewRec ); - void Save( XclExpStream& rStrm ); - void SaveXml( XclExpXmlStream& rStrm ); + void Append( ExcRecord* pNewRec ); + void Save( XclExpStream& rStrm ); + void SaveXml( XclExpXmlStream& rStrm ); }; //___________________________________________________________________ @@ -647,29 +647,29 @@ public: class XclExpChangeTrack : protected XclExpRoot { private: - XclExpChTrRecordList aRecList; - XclExpChTrActionStack aActionStack; - XclExpChTrTabIdBufferList aTabIdBufferList; - XclExpChTrTabIdBuffer* pTabIdBuffer; + XclExpChTrRecordList aRecList; + XclExpChTrActionStack aActionStack; + XclExpChTrTabIdBufferList aTabIdBufferList; + XclExpChTrTabIdBuffer* pTabIdBuffer; - ScDocument* pTempDoc; // empty document + ScDocument* pTempDoc; // empty document - sal_uInt32 nNewAction; // action number, 1-based - XclExpChTrHeader* pHeader; // header record for last GUID - sal_uInt8 aGUID[ 16 ]; // GUID for action info records - sal_Bool bValidGUID; + sal_uInt32 nNewAction; // action number, 1-based + XclExpChTrHeader* pHeader; // header record for last GUID + sal_uInt8 aGUID[ 16 ]; // GUID for action info records + sal_Bool bValidGUID; - ScChangeTrack* CreateTempChangeTrack(); - void PushActionRecord( const ScChangeAction& rAction ); + ScChangeTrack* CreateTempChangeTrack(); + void PushActionRecord( const ScChangeAction& rAction ); - sal_Bool WriteUserNamesStream(); + sal_Bool WriteUserNamesStream(); public: XclExpChangeTrack( const XclExpRoot& rRoot ); ~XclExpChangeTrack(); - void Write(); - void WriteXml( XclExpXmlStream& rStrm ); + void Write(); + void WriteXml( XclExpXmlStream& rStrm ); }; //___________________________________________________________________ diff --git a/sc/source/filter/inc/XclImpChangeTrack.hxx b/sc/source/filter/inc/XclImpChangeTrack.hxx index 0bed2ca49c2f..11f253bcb8fd 100644 --- a/sc/source/filter/inc/XclImpChangeTrack.hxx +++ b/sc/source/filter/inc/XclImpChangeTrack.hxx @@ -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,10 +47,10 @@ class XclImpChTrFmlConverter; struct XclImpChTrRecHeader { - sal_uInt32 nSize; - sal_uInt32 nIndex; - sal_uInt16 nOpCode; - sal_uInt16 nAccept; + sal_uInt32 nSize; + sal_uInt32 nIndex; + sal_uInt16 nOpCode; + sal_uInt16 nAccept; }; inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecHeader ) @@ -64,59 +64,59 @@ inline XclImpStream& operator>>( XclImpStream& rStrm, XclImpChTrRecHeader& rRecH class XclImpChangeTrack : protected XclImpRoot { private: - XclImpChTrRecHeader aRecHeader; - String sOldUsername; + XclImpChTrRecHeader aRecHeader; + String sOldUsername; - ScChangeTrack* pChangeTrack; + ScChangeTrack* pChangeTrack; SotStorageStreamRef xInStrm; // input stream - XclImpStream* pStrm; // stream import class - sal_uInt16 nTabIdCount; - sal_Bool bGlobExit; // global exit loop + XclImpStream* pStrm; // stream import class + sal_uInt16 nTabIdCount; + sal_Bool bGlobExit; // global exit loop enum { nmBase, nmFound, nmNested } - eNestedMode; // action with nested content actions + eNestedMode; // action with nested content actions - inline sal_Bool FoundNestedMode() { return eNestedMode == nmFound; } + inline sal_Bool FoundNestedMode() { return eNestedMode == nmFound; } - void DoAcceptRejectAction( ScChangeAction* pAction ); - void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast ); + void DoAcceptRejectAction( ScChangeAction* pAction ); + void DoAcceptRejectAction( sal_uInt32 nFirst, sal_uInt32 nLast ); - void DoInsertRange( const ScRange& rRange ); - void DoDeleteRange( const ScRange& rRange ); + void DoInsertRange( const ScRange& rRange ); + void DoDeleteRange( const ScRange& rRange ); - inline sal_uInt8 LookAtuInt8(); - inline double ReadRK(); - inline sal_Bool ReadBool(); - inline void Read2DAddress( ScAddress& rAddress ); - inline void Read2DRange( ScRange& rRange ); + inline sal_uInt8 LookAtuInt8(); + inline double ReadRK(); + inline sal_Bool ReadBool(); + inline void Read2DAddress( ScAddress& rAddress ); + inline void Read2DRange( ScRange& rRange ); SCTAB ReadTabNum(); - void ReadDateTime( DateTime& rDateTime ); + void ReadDateTime( DateTime& rDateTime ); - inline void ReadString( String& rString ); - inline void IgnoreString(); + inline void ReadString( String& rString ); + inline void IgnoreString(); - sal_Bool CheckRecord( sal_uInt16 nOpCode ); + sal_Bool CheckRecord( sal_uInt16 nOpCode ); - void ReadFormula( + void ReadFormula( ScTokenArray*& rpTokenArray, const ScAddress& rPosition ); - void ReadCell( + void ReadCell( ScBaseCell*& rpCell, sal_uInt32& rFormat, sal_uInt16 nFlags, const ScAddress& rPosition ); - void ReadChTrInsert(); // 0x0137 - void ReadChTrInfo(); // 0x0138 - void ReadChTrCellContent(); // 0x013B - void ReadChTrTabId(); // 0x013D - void ReadChTrMoveRange(); // 0x0140 - void ReadChTrInsertTab(); // 0x014D - void InitNestedMode(); // 0x014E, 0x0150 - void ReadNestedRecords(); - sal_Bool EndNestedMode(); // 0x014F, 0x0151 + void ReadChTrInsert(); // 0x0137 + void ReadChTrInfo(); // 0x0138 + void ReadChTrCellContent(); // 0x013B + void ReadChTrTabId(); // 0x013D + void ReadChTrMoveRange(); // 0x0140 + void ReadChTrInsertTab(); // 0x014D + void InitNestedMode(); // 0x014E, 0x0150 + void ReadNestedRecords(); + sal_Bool EndNestedMode(); // 0x014F, 0x0151 - void ReadRecords(); + void ReadRecords(); public: XclImpChangeTrack( const XclImpRoot& rRoot, const XclImpStream& rBookStrm ); @@ -124,9 +124,9 @@ public: // reads extended 3D ref info following the formulas, returns sc tab nums // ( called by XclImpChTrFmlConverter::Read3DTabReference() ) - sal_Bool Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, ExcelToSc8::ExternalTabInfo& rExtInfo ); + sal_Bool Read3DTabRefInfo( SCTAB& rFirstTab, SCTAB& rLastTab, ExcelToSc8::ExternalTabInfo& rExtInfo ); - void Apply(); + void Apply(); }; inline sal_uInt8 XclImpChangeTrack::LookAtuInt8() @@ -178,15 +178,15 @@ inline void XclImpChangeTrack::IgnoreString() class XclImpChTrFmlConverter : public ExcelToSc8 { private: - XclImpChangeTrack& rChangeTrack; + XclImpChangeTrack& rChangeTrack; virtual bool Read3DTabReference( UINT16 nIxti, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ); public: - inline XclImpChTrFmlConverter( + inline XclImpChTrFmlConverter( const XclImpRoot& rRoot, XclImpChangeTrack& rXclChTr ); - virtual ~XclImpChTrFmlConverter(); + virtual ~XclImpChTrFmlConverter(); }; inline XclImpChTrFmlConverter::XclImpChTrFmlConverter( diff --git a/sc/source/filter/inc/biff.hxx b/sc/source/filter/inc/biff.hxx index d2cba2e8d06a..2c66a5e2c21e 100644 --- a/sc/source/filter/inc/biff.hxx +++ b/sc/source/filter/inc/biff.hxx @@ -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 @@ -35,11 +35,11 @@ #include "document.hxx" #include "cell.hxx" #include <tools/string.hxx> - + #include <tools/color.hxx> #include "flttypes.hxx" #include "ftools.hxx" - + // Stream wrapper class class ScBiffReader { @@ -49,17 +49,17 @@ class ScBiffReader sal_uInt32 mnOffset; SvStream *mpStream; bool mbEndOfFile; - + public: ScBiffReader( SfxMedium& rMedium ); ~ScBiffReader(); bool recordsLeft() { return mpStream && !mpStream->IsEof(); } bool IsEndOfFile() { return mbEndOfFile; } - void SetEof( bool bValue ){ mbEndOfFile = bValue; } + void SetEof( bool bValue ){ mbEndOfFile = bValue; } bool nextRecord(); sal_uInt16 getId() { return mnId; } sal_uInt16 getLength() { return mnLength; } - SvStream& getStream() { return *mpStream; } + SvStream& getStream() { return *mpStream; } }; #endif diff --git a/sc/source/filter/inc/colrowst.hxx b/sc/source/filter/inc/colrowst.hxx index 525db195bac1..6b824ae53151 100644 --- a/sc/source/filter/inc/colrowst.hxx +++ b/sc/source/filter/inc/colrowst.hxx @@ -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/inc/decl.h b/sc/source/filter/inc/decl.h index c57446c8299d..f5b5123c2f2d 100644 --- a/sc/source/filter/inc/decl.h +++ b/sc/source/filter/inc/decl.h @@ -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/inc/dif.hxx b/sc/source/filter/inc/dif.hxx index 20d7d8e79926..ad9b52a7a3f6 100644 --- a/sc/source/filter/inc/dif.hxx +++ b/sc/source/filter/inc/dif.hxx @@ -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 @@ -70,74 +70,74 @@ enum DATASET { D_BOT, D_EOD, D_NUMERIC, D_STRING, D_UNKNOWN, D_SYNT_ERROR }; class DifParser { public: - String aData; - double fVal; - UINT32 nVector; - UINT32 nVal; - UINT32 nNumFormat; - CharSet eCharSet; + String aData; + double fVal; + UINT32 nVector; + UINT32 nVal; + UINT32 nNumFormat; + CharSet eCharSet; private: - SvNumberFormatter* pNumFormatter; - SvStream& rIn; - BOOL bPlain; + SvNumberFormatter* pNumFormatter; + SvStream& rIn; + BOOL bPlain; String aLookAheadLine; bool ReadNextLine( String& rStr ); bool LookAhead(); DATASET GetNumberDataset( const sal_Unicode* pPossibleNumericData ); - static inline BOOL IsBOT( const sal_Unicode* pRef ); - static inline BOOL IsEOD( const sal_Unicode* pRef ); - static inline BOOL Is1_0( const sal_Unicode* pRef ); + static inline BOOL IsBOT( const sal_Unicode* pRef ); + static inline BOOL IsEOD( const sal_Unicode* pRef ); + static inline BOOL Is1_0( const sal_Unicode* pRef ); public: DifParser( SvStream&, const UINT32 nOption, ScDocument&, CharSet ); - TOPIC GetNextTopic( void ); + TOPIC GetNextTopic( void ); - DATASET GetNextDataset( void ); + DATASET GetNextDataset( void ); const sal_Unicode* ScanIntVal( const sal_Unicode* pStart, UINT32& rRet ); - BOOL ScanFloatVal( const sal_Unicode* pStart ); + BOOL ScanFloatVal( const sal_Unicode* pStart ); - inline BOOL IsNumber( const sal_Unicode cChar ); - inline BOOL IsNumberEnding( const sal_Unicode cChar ); + inline BOOL IsNumber( const sal_Unicode cChar ); + inline BOOL IsNumberEnding( const sal_Unicode cChar ); - static inline BOOL IsV( const sal_Unicode* pRef ); + static inline BOOL IsV( const sal_Unicode* pRef ); - inline BOOL IsPlain( void ) const; + inline BOOL IsPlain( void ) const; }; -inline BOOL DifParser::IsBOT( const sal_Unicode* pRef ) +inline BOOL DifParser::IsBOT( const sal_Unicode* pRef ) { - return ( pRef[ 0 ] == pKeyBOT[0] && + return ( pRef[ 0 ] == pKeyBOT[0] && pRef[ 1 ] == pKeyBOT[1] && pRef[ 2 ] == pKeyBOT[2] && - pRef[ 3 ] == pKeyBOT[3] ); + pRef[ 3 ] == pKeyBOT[3] ); } -inline BOOL DifParser::IsEOD( const sal_Unicode* pRef ) +inline BOOL DifParser::IsEOD( const sal_Unicode* pRef ) { - return ( pRef[ 0 ] == pKeyEOD[0] && + return ( pRef[ 0 ] == pKeyEOD[0] && pRef[ 1 ] == pKeyEOD[1] && pRef[ 2 ] == pKeyEOD[2] && - pRef[ 3 ] == pKeyEOD[3] ); + pRef[ 3 ] == pKeyEOD[3] ); } -inline BOOL DifParser::Is1_0( const sal_Unicode* pRef ) +inline BOOL DifParser::Is1_0( const sal_Unicode* pRef ) { - return ( pRef[ 0 ] == pKey1_0[0] && + return ( pRef[ 0 ] == pKey1_0[0] && pRef[ 1 ] == pKey1_0[1] && pRef[ 2 ] == pKey1_0[2] && - pRef[ 3 ] == pKey1_0[3] ); + pRef[ 3 ] == pKey1_0[3] ); } -inline BOOL DifParser::IsV( const sal_Unicode* pRef ) +inline BOOL DifParser::IsV( const sal_Unicode* pRef ) { - return ( pRef[ 0 ] == pKeyV[0] && - pRef[ 1 ] == pKeyV[1] ); + return ( pRef[ 0 ] == pKeyV[0] && + pRef[ 1 ] == pKeyV[1] ); } @@ -171,22 +171,22 @@ private: friend class DifAttrCache; struct ENTRY { - UINT32 nNumFormat; + UINT32 nNumFormat; - SCROW nStart; - SCROW nEnd; + SCROW nStart; + SCROW nEnd; }; - ENTRY* pAkt; + ENTRY* pAkt; - inline DifColumn( void ); + inline DifColumn( void ); ~DifColumn(); - void SetLogical( SCROW nRow ); - void SetNumFormat( SCROW nRow, const UINT32 nNumFormat ); - void NewEntry( const SCROW nPos, const UINT32 nNumFormat ); - void Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& ); - void Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab ); -public: // geht niemanden etwas an... + void SetLogical( SCROW nRow ); + void SetNumFormat( SCROW nRow, const UINT32 nNumFormat ); + void NewEntry( const SCROW nPos, const UINT32 nNumFormat ); + void Apply( ScDocument&, const SCCOL nCol, const SCTAB nTab, const ScPatternAttr& ); + void Apply( ScDocument &rDoc, const SCCOL nCol, const SCTAB nTab ); +public: // geht niemanden etwas an... }; @@ -201,14 +201,14 @@ inline DifColumn::DifColumn( void ) class DifAttrCache { private: - DifColumn** ppCols; - BOOL bPlain; + DifColumn** ppCols; + BOOL bPlain; public: DifAttrCache( const BOOL bPlain ); ~DifAttrCache(); - inline void SetLogical( const SCCOL nCol, const SCROW nRow ); - void SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat ); - void Apply( ScDocument&, SCTAB nTab ); + inline void SetLogical( const SCCOL nCol, const SCROW nRow ); + void SetNumFormat( const SCCOL nCol, const SCROW nRow, const UINT32 nNumFormat ); + void Apply( ScDocument&, SCTAB nTab ); }; diff --git a/sc/source/filter/inc/eeimport.hxx b/sc/source/filter/inc/eeimport.hxx index 2d1081c3debc..ea3f822de887 100644 --- a/sc/source/filter/inc/eeimport.hxx +++ b/sc/source/filter/inc/eeimport.hxx @@ -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/inc/eeparser.hxx b/sc/source/filter/inc/eeparser.hxx index b0d7a20e7743..11937d0ff742 100644 --- a/sc/source/filter/inc/eeparser.hxx +++ b/sc/source/filter/inc/eeparser.hxx @@ -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,12 +43,12 @@ const sal_Char nHoriVerti = nHorizontal | nVertical; struct ScHTMLImage { - String aURL; - Size aSize; - Point aSpace; - String aFilterName; - Graphic* pGraphic; // wird von WriteToDocument uebernommen - sal_Char nDir; // 1==hori, 2==verti, 3==beides + String aURL; + Size aSize; + Point aSpace; + String aFilterName; + Graphic* pGraphic; // wird von WriteToDocument uebernommen + sal_Char nDir; // 1==hori, 2==verti, 3==beides ScHTMLImage() : aSize( 0, 0 ), aSpace( 0, 0 ), pGraphic( NULL ), @@ -61,22 +61,22 @@ DECLARE_LIST( ScHTMLImageList, ScHTMLImage* ) struct ScEEParseEntry { - SfxItemSet aItemSet; - ESelection aSel; // Selection in EditEngine - String* pValStr; // HTML evtl. SDVAL String - String* pNumStr; // HTML evtl. SDNUM String - String* pName; // HTML evtl. Anchor/RangeName - String aAltText; // HTML IMG ALT Text - ScHTMLImageList* pImageList; // Grafiken in dieser Zelle - SCCOL nCol; // relativ zum Beginn des Parse - SCROW nRow; - USHORT nTab; // HTML TableInTable - USHORT nTwips; // RTF ColAdjust etc. - SCCOL nColOverlap; // merged cells wenn >1 - SCROW nRowOverlap; // merged cells wenn >1 - USHORT nOffset; // HTML PixelOffset - USHORT nWidth; // HTML PixelWidth - BOOL bHasGraphic; // HTML any image loaded + SfxItemSet aItemSet; + ESelection aSel; // Selection in EditEngine + String* pValStr; // HTML evtl. SDVAL String + String* pNumStr; // HTML evtl. SDNUM String + String* pName; // HTML evtl. Anchor/RangeName + String aAltText; // HTML IMG ALT Text + ScHTMLImageList* pImageList; // Grafiken in dieser Zelle + SCCOL nCol; // relativ zum Beginn des Parse + SCROW nRow; + USHORT nTab; // HTML TableInTable + USHORT nTwips; // RTF ColAdjust etc. + SCCOL nColOverlap; // merged cells wenn >1 + SCROW nRowOverlap; // merged cells wenn >1 + USHORT nOffset; // HTML PixelOffset + USHORT nWidth; // HTML PixelWidth + BOOL bHasGraphic; // HTML any image loaded bool bEntirePara; // TRUE = use entire paragraph, false = use selection ScEEParseEntry( SfxItemPool* pPool ) : @@ -120,32 +120,32 @@ class EditEngine; class ScEEParser { protected: - EditEngine* pEdit; - SfxItemPool* pPool; - SfxItemPool* pDocPool; - ScEEParseList* pList; - ScEEParseEntry* pActEntry; - Table* pColWidths; - int nLastToken; - SCCOL nColCnt; - SCROW nRowCnt; - SCCOL nColMax; - SCROW nRowMax; - - void NewActEntry( ScEEParseEntry* ); + EditEngine* pEdit; + SfxItemPool* pPool; + SfxItemPool* pDocPool; + ScEEParseList* pList; + ScEEParseEntry* pActEntry; + Table* pColWidths; + int nLastToken; + SCCOL nColCnt; + SCROW nRowCnt; + SCCOL nColMax; + SCROW nRowMax; + + void NewActEntry( ScEEParseEntry* ); public: ScEEParser( EditEngine* ); - virtual ~ScEEParser(); + virtual ~ScEEParser(); virtual ULONG Read( SvStream&, const String& rBaseURL ) = 0; - void GetDimensions( SCCOL& nCols, SCROW& nRows ) const + void GetDimensions( SCCOL& nCols, SCROW& nRows ) const { nCols = nColMax; nRows = nRowMax; } - ULONG Count() const { return pList->Count(); } - ScEEParseEntry* First() const { return pList->First(); } - ScEEParseEntry* Next() const { return pList->Next(); } - Table* GetColWidths() const { return pColWidths; } + ULONG Count() const { return pList->Count(); } + ScEEParseEntry* First() const { return pList->First(); } + ScEEParseEntry* Next() const { return pList->Next(); } + Table* GetColWidths() const { return pColWidths; } }; diff --git a/sc/source/filter/inc/excdefs.hxx b/sc/source/filter/inc/excdefs.hxx index ae8a1cd4c861..0a1d39c0457a 100644 --- a/sc/source/filter/inc/excdefs.hxx +++ b/sc/source/filter/inc/excdefs.hxx @@ -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 @@ -64,7 +64,7 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06; // (0x00AE, 0x00AF) SCENARIO, SCENMAN ========================================= -#define EXC_SCEN_MAXCELL 32 +#define EXC_SCEN_MAXCELL 32 // defines for change tracking ================================================ @@ -72,34 +72,34 @@ const sal_uInt8 EXC_AFOPER_GREATEREQUAL = 0x06; #define EXC_STREAM_REVLOG CREATE_STRING( "Revision Log" ) // opcodes -#define EXC_CHTR_OP_COLFLAG 0x0001 -#define EXC_CHTR_OP_DELFLAG 0x0002 -#define EXC_CHTR_OP_INSROW 0x0000 -#define EXC_CHTR_OP_INSCOL EXC_CHTR_OP_COLFLAG -#define EXC_CHTR_OP_DELROW EXC_CHTR_OP_DELFLAG -#define EXC_CHTR_OP_DELCOL (EXC_CHTR_OP_COLFLAG|EXC_CHTR_OP_DELFLAG) -#define EXC_CHTR_OP_MOVE 0x0004 -#define EXC_CHTR_OP_INSTAB 0x0005 -#define EXC_CHTR_OP_CELL 0x0008 -#define EXC_CHTR_OP_RENAME 0x0009 -#define EXC_CHTR_OP_NAME 0x000A -#define EXC_CHTR_OP_FORMAT 0x000B -#define EXC_CHTR_OP_UNKNOWN 0xFFFF +#define EXC_CHTR_OP_COLFLAG 0x0001 +#define EXC_CHTR_OP_DELFLAG 0x0002 +#define EXC_CHTR_OP_INSROW 0x0000 +#define EXC_CHTR_OP_INSCOL EXC_CHTR_OP_COLFLAG +#define EXC_CHTR_OP_DELROW EXC_CHTR_OP_DELFLAG +#define EXC_CHTR_OP_DELCOL (EXC_CHTR_OP_COLFLAG|EXC_CHTR_OP_DELFLAG) +#define EXC_CHTR_OP_MOVE 0x0004 +#define EXC_CHTR_OP_INSTAB 0x0005 +#define EXC_CHTR_OP_CELL 0x0008 +#define EXC_CHTR_OP_RENAME 0x0009 +#define EXC_CHTR_OP_NAME 0x000A +#define EXC_CHTR_OP_FORMAT 0x000B +#define EXC_CHTR_OP_UNKNOWN 0xFFFF // data types -#define EXC_CHTR_TYPE_MASK 0x0007 -#define EXC_CHTR_TYPE_FORMATMASK 0xFF00 -#define EXC_CHTR_TYPE_EMPTY 0x0000 -#define EXC_CHTR_TYPE_RK 0x0001 -#define EXC_CHTR_TYPE_DOUBLE 0x0002 -#define EXC_CHTR_TYPE_STRING 0x0003 -#define EXC_CHTR_TYPE_BOOL 0x0004 -#define EXC_CHTR_TYPE_FORMULA 0x0005 +#define EXC_CHTR_TYPE_MASK 0x0007 +#define EXC_CHTR_TYPE_FORMATMASK 0xFF00 +#define EXC_CHTR_TYPE_EMPTY 0x0000 +#define EXC_CHTR_TYPE_RK 0x0001 +#define EXC_CHTR_TYPE_DOUBLE 0x0002 +#define EXC_CHTR_TYPE_STRING 0x0003 +#define EXC_CHTR_TYPE_BOOL 0x0004 +#define EXC_CHTR_TYPE_FORMULA 0x0005 // accept flags -#define EXC_CHTR_NOTHING 0x0000 -#define EXC_CHTR_ACCEPT 0x0001 -#define EXC_CHTR_REJECT 0x0003 +#define EXC_CHTR_NOTHING 0x0000 +#define EXC_CHTR_ACCEPT 0x0001 +#define EXC_CHTR_REJECT 0x0003 // ============================================================================ diff --git a/sc/source/filter/inc/excdoc.hxx b/sc/source/filter/inc/excdoc.hxx index 26b9a64ef89a..7c4aee214eaa 100644 --- a/sc/source/filter/inc/excdoc.hxx +++ b/sc/source/filter/inc/excdoc.hxx @@ -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 @@ -61,9 +61,9 @@ private: XclExpCellTableRef mxCellTable; SCTAB mnScTab; // table number SC document - UINT16 nExcTab; // table number Excel document - UINT16 nAktRow; // fuer'n Iterator - UINT16 nAktCol; + UINT16 nExcTab; // table number Excel document + UINT16 nAktRow; // fuer'n Iterator + UINT16 nAktCol; NameBuffer* pTabNames; @@ -81,8 +81,8 @@ public: void FillAsTable( SCTAB nCodeNameIdx ); void FillAsEmptyTable( SCTAB nCodeNameIdx ); - void Write( XclExpStream& ); - void WriteXml( XclExpXmlStream& ); + void Write( XclExpStream& ); + void WriteXml( XclExpXmlStream& ); }; @@ -98,20 +98,20 @@ private: typedef XclExpRecordList< ExcBundlesheetBase > ExcBoundsheetList; typedef ExcBoundsheetList::RecordRefType ExcBoundsheetRef; - ExcTable aHeader; + ExcTable aHeader; ExcTableList maTableList; ExcBoundsheetList maBoundsheetList; - XclExpChangeTrack* pExpChangeTrack; + XclExpChangeTrack* pExpChangeTrack; public: explicit ExcDocument( const XclExpRoot& rRoot ); virtual ~ExcDocument(); - void ReadDoc( void ); - void Write( SvStream& rSvStrm ); - void WriteXml( XclExpXmlStream& ); + void ReadDoc( void ); + void Write( SvStream& rSvStrm ); + void WriteXml( XclExpXmlStream& ); }; diff --git a/sc/source/filter/inc/excform.hxx b/sc/source/filter/inc/excform.hxx index 9332f1ad502d..54378aef150d 100644 --- a/sc/source/filter/inc/excform.hxx +++ b/sc/source/filter/inc/excform.hxx @@ -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 @@ -44,21 +44,21 @@ protected: enum ExtensionType { EXTENSION_ARRAY, EXTENSION_NLR, EXTENSION_MEMAREA }; typedef ::std::vector< ExtensionType > ExtensionTypeVec; - BOOL bExternName; // wenn External Name gefunden wurde - static const UINT16 nRowMask; - static const UINT16 nLastInd; // letzter Index fuer Excel->SC- + BOOL bExternName; // wenn External Name gefunden wurde + static const UINT16 nRowMask; + static const UINT16 nLastInd; // letzter Index fuer Excel->SC- // Token Umsetzung XclFunctionProvider maFuncProv; const XclBiff meBiff; // --------------------------------------------------------------- - void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs, sal_uInt8 mnMinParamCount = 0 ); + void DoMulArgs( DefTokenId eId, sal_uInt8 nNumArgs, sal_uInt8 mnMinParamCount = 0 ); - void ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData&, const BOOL bName ); + void ExcRelToScRel( UINT16 nRow, UINT8 nCol, ScSingleRefData&, const BOOL bName ); public: ExcelToSc( const XclImpRoot& rRoot ); - virtual ~ExcelToSc(); + virtual ~ExcelToSc(); virtual ConvErr Convert( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ); @@ -69,17 +69,17 @@ public: virtual BOOL GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ); - void GetDummy( const ScTokenArray*& ); + void GetDummy( const ScTokenArray*& ); const ScTokenArray* GetBoolErr( XclBoolError ); BOOL GetShrFmla( const ScTokenArray*&, XclImpStream& rStrm, sal_Size nFormulaLen ); - static void SetError( ScFormulaCell& rCell, const ConvErr eErr ); + static void SetError( ScFormulaCell& rCell, const ConvErr eErr ); - static inline BOOL IsComplColRange( const UINT16 nCol1, const UINT16 nCol2 ); - static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 ); + static inline BOOL IsComplColRange( const UINT16 nCol1, const UINT16 nCol2 ); + static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 ); - void SetComplCol( ScComplexRefData& ); - void SetComplRow( ScComplexRefData& ); + void SetComplCol( ScComplexRefData& ); + void SetComplRow( ScComplexRefData& ); void ReadExtensions( const ExtensionTypeVec& rExtensions, XclImpStream& aIn ); @@ -130,7 +130,7 @@ private: public: ExcelToSc8( const XclImpRoot& rRoot ); - virtual ~ExcelToSc8(); + virtual ~ExcelToSc8(); virtual ConvErr Convert( const ScTokenArray*& rpTokArray, XclImpStream& rStrm, sal_Size nFormulaLen, bool bAllowArrays, const FORMULA_TYPE eFT = FT_CellFormula ); @@ -139,7 +139,7 @@ public: virtual ConvErr ConvertExternName( const ScTokenArray*& rpArray, XclImpStream& rStrm, sal_Size nFormulaLen, const String& rUrl, const ::std::vector<String>& rTabNames ); - static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 ); + static inline BOOL IsComplRowRange( const UINT16 nRow1, const UINT16 nRow2 ); virtual BOOL GetAbsRefs( ScRangeList& rRangeList, XclImpStream& rStrm, sal_Size nLen ); }; diff --git a/sc/source/filter/inc/excimp8.hxx b/sc/source/filter/inc/excimp8.hxx index 5d3679a73256..ea0f1899b6eb 100644 --- a/sc/source/filter/inc/excimp8.hxx +++ b/sc/source/filter/inc/excimp8.hxx @@ -53,9 +53,9 @@ class ImportExcel8 : public ImportExcel { public: ImportExcel8( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel8( void ); + virtual ~ImportExcel8( void ); - virtual FltError Read( void ); + virtual FltError Read( void ); protected: // represents codename ( and associated modules ) @@ -63,25 +63,25 @@ protected: std::vector< String > AutoGeneratedCodeNames; ExcScenarioList aScenList; - void Calccount( void ); // 0x0C + void Calccount( void ); // 0x0C void Precision( void ); // 0x0E - void Delta( void ); // 0x10 - void Iteration( void ); // 0x11 - void Boundsheet( void ); // 0x85 - void FilterMode( void ); // 0x9B - void AutoFilterInfo( void ); // 0x9D - void AutoFilter( void ); // 0x9E - void Scenman( void ); // 0xAE - void Scenario( void ); // 0xAF - void ReadBasic( void ); // 0xD3 - void Labelsst( void ); // 0xFD - - void Hlink( void ); // 0x01B8 - void Codename( BOOL bWBGlobals ); // 0x01BA + void Delta( void ); // 0x10 + void Iteration( void ); // 0x11 + void Boundsheet( void ); // 0x85 + void FilterMode( void ); // 0x9B + void AutoFilterInfo( void ); // 0x9D + void AutoFilter( void ); // 0x9E + void Scenman( void ); // 0xAE + void Scenario( void ); // 0xAF + void ReadBasic( void ); // 0xD3 + void Labelsst( void ); // 0xFD + + void Hlink( void ); // 0x01B8 + void Codename( BOOL bWBGlobals ); // 0x01BA void SheetProtection( void ); // 0x0867 virtual void EndSheet( void ); - virtual void PostDocLoad( void ); + virtual void PostDocLoad( void ); private: void LoadDocumentProperties(); @@ -95,20 +95,20 @@ private: class XclImpAutoFilterData : private ExcRoot { private: - ScDBData* pCurrDBData; - ScQueryParam aParam; - SCSIZE nFirstEmpty; - BOOL bActive; - BOOL bHasConflict; + ScDBData* pCurrDBData; + ScQueryParam aParam; + SCSIZE nFirstEmpty; + BOOL bActive; + BOOL bHasConflict; BOOL bCriteria; BOOL bAutoOrAdvanced; ScRange aCriteriaRange; String aFilterName; - void CreateFromDouble( String& rStr, double fVal ); - void SetCellAttribs(); - void InsertQueryParam(); - void AmendAFName(const BOOL bUseUnNamed); + void CreateFromDouble( String& rStr, double fVal ); + void SetCellAttribs(); + void InsertQueryParam(); + void AmendAFName(const BOOL bUseUnNamed); protected: public: @@ -119,19 +119,19 @@ public: inline bool IsActive() const { return bActive; } inline bool IsFiltered() const { return bAutoOrAdvanced; } - inline SCTAB Tab() const { return aParam.nTab; } - inline SCCOL StartCol() const { return aParam.nCol1; } - inline SCROW StartRow() const { return aParam.nRow1; } - inline SCCOL EndCol() const { return aParam.nCol2; } - inline SCROW EndRow() const { return aParam.nRow2; } + inline SCTAB Tab() const { return aParam.nTab; } + inline SCCOL StartCol() const { return aParam.nCol1; } + inline SCROW StartRow() const { return aParam.nRow1; } + inline SCCOL EndCol() const { return aParam.nCol2; } + inline SCROW EndRow() const { return aParam.nRow2; } - void ReadAutoFilter( XclImpStream& rStrm ); + void ReadAutoFilter( XclImpStream& rStrm ); - inline void Activate() { bActive = TRUE; } + inline void Activate() { bActive = TRUE; } void SetAdvancedRange( const ScRange* pRange ); - void SetExtractPos( const ScAddress& rAddr ); + void SetExtractPos( const ScAddress& rAddr ); inline void SetAutoOrAdvanced() { bAutoOrAdvanced = TRUE; } - void Apply( const BOOL bUseUnNamed = FALSE ); + void Apply( const BOOL bUseUnNamed = FALSE ); void CreateScDBData( const BOOL bUseUnNamed ); void EnableRemoveFilter(); }; @@ -144,23 +144,23 @@ private: UINT16 nAFActiveCount; - inline XclImpAutoFilterData* _First() { return (XclImpAutoFilterData*) List::First(); } - inline XclImpAutoFilterData* _Next() { return (XclImpAutoFilterData*) List::Next(); } + inline XclImpAutoFilterData* _First() { return (XclImpAutoFilterData*) List::First(); } + inline XclImpAutoFilterData* _Next() { return (XclImpAutoFilterData*) List::Next(); } - inline void Append( XclImpAutoFilterData* pData ) + inline void Append( XclImpAutoFilterData* pData ) { List::Insert( pData, LIST_APPEND ); } protected: public: XclImpAutoFilterBuffer(); - virtual ~XclImpAutoFilterBuffer(); + virtual ~XclImpAutoFilterBuffer(); - void Insert( RootData* pRoot, const ScRange& rRange, + void Insert( RootData* pRoot, const ScRange& rRange, const String& rName ); - void AddAdvancedRange( const ScRange& rRange ); - void AddExtractPos( const ScRange& rRange ); - void Apply(); + void AddAdvancedRange( const ScRange& rRange ); + void AddExtractPos( const ScRange& rRange ); + void Apply(); - XclImpAutoFilterData* GetByTab( SCTAB nTab ); + XclImpAutoFilterData* GetByTab( SCTAB nTab ); inline void IncrementActiveAF() { nAFActiveCount++; } inline BOOL UseUnNamed() { return nAFActiveCount == 1; } }; diff --git a/sc/source/filter/inc/excrecds.hxx b/sc/source/filter/inc/excrecds.hxx index a450fb00f368..dfd2e5683198 100644 --- a/sc/source/filter/inc/excrecds.hxx +++ b/sc/source/filter/inc/excrecds.hxx @@ -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 @@ -72,14 +72,14 @@ class ExcTable; class ExcRecord : public XclExpRecord { public: - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ); - virtual UINT16 GetNum() const = 0; + virtual UINT16 GetNum() const = 0; virtual sal_Size GetLen() const = 0; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); private: /** Writes the body of the record. */ @@ -94,8 +94,8 @@ class ExcEmptyRec : public ExcRecord private: protected: public: - virtual void Save( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; + virtual void Save( XclExpStream& rStrm ); + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -107,17 +107,17 @@ class ExcRecordList : protected List, public ExcEmptyRec private: protected: public: - virtual ~ExcRecordList(); + virtual ~ExcRecordList(); using List::Count; - inline ExcRecord* First( void ) { return ( ExcRecord* ) List::First(); } - inline ExcRecord* Next( void ) { return ( ExcRecord* ) List::Next(); } + inline ExcRecord* First( void ) { return ( ExcRecord* ) List::First(); } + inline ExcRecord* Next( void ) { return ( ExcRecord* ) List::Next(); } - inline void Append( ExcRecord* pNew ) { if( pNew ) List::Insert( pNew, LIST_APPEND ); } - inline const ExcRecord* Get( UINT32 nNum ) const { return ( ExcRecord* ) List::GetObject( nNum ); } + inline void Append( ExcRecord* pNew ) { if( pNew ) List::Insert( pNew, LIST_APPEND ); } + inline const ExcRecord* Get( UINT32 nNum ) const { return ( ExcRecord* ) List::GetObject( nNum ); } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); }; @@ -127,9 +127,9 @@ class ExcDummyRec : public ExcRecord { protected: public: - virtual void Save( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; - virtual const BYTE* GetData() const = 0; // byte data must contain header and body + virtual void Save( XclExpStream& rStrm ); + virtual UINT16 GetNum() const; + virtual const BYTE* GetData() const = 0; // byte data must contain header and body }; @@ -139,15 +139,15 @@ public: class ExcBoolRecord : public ExcRecord { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); protected: - BOOL bVal; + BOOL bVal; - inline ExcBoolRecord() : bVal( FALSE ) {} + inline ExcBoolRecord() : bVal( FALSE ) {} public: - inline ExcBoolRecord( const BOOL bDefault ) : bVal( bDefault ) {} + inline ExcBoolRecord( const BOOL bDefault ) : bVal( bDefault ) {} virtual sal_Size GetLen( void ) const; }; @@ -159,10 +159,10 @@ class ExcBof_Base : public ExcRecord { private: protected: - UINT16 nDocType; - UINT16 nVers; - UINT16 nRupBuild; - UINT16 nRupYear; + UINT16 nDocType; + UINT16 nVers; + UINT16 nRupBuild; + UINT16 nRupYear; public: ExcBof_Base( void ); }; @@ -174,11 +174,11 @@ public: class ExcBof : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBof( void ); - virtual UINT16 GetNum( void ) const; + virtual UINT16 GetNum( void ) const; virtual sal_Size GetLen( void ) const; }; @@ -189,11 +189,11 @@ public: class ExcBofW : public ExcBof_Base { private: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBofW( void ); - virtual UINT16 GetNum( void ) const; + virtual UINT16 GetNum( void ) const; virtual sal_Size GetLen( void ) const; }; @@ -204,7 +204,7 @@ class ExcEof : public ExcRecord { private: public: - virtual UINT16 GetNum( void ) const; + virtual UINT16 GetNum( void ) const; virtual sal_Size GetLen( void ) const; }; @@ -215,15 +215,15 @@ public: class ExcDummy_00 : public ExcDummyRec { private: - static const BYTE pMyData[]; + static const BYTE pMyData[]; static const sal_Size nMyLen; public: virtual sal_Size GetLen( void ) const; - virtual const BYTE* GetData( void ) const; + virtual const BYTE* GetData( void ) const; }; // EXC_ID_WINDOWPROTECTION -class XclExpWindowProtection : public XclExpBoolRecord +class XclExpWindowProtection : public XclExpBoolRecord { public: XclExpWindowProtection(bool bValue); @@ -232,7 +232,7 @@ class XclExpWindowProtection : public XclExpBoolRecord }; // EXC_ID_PROTECT Document Protection -class XclExpProtection : public XclExpBoolRecord +class XclExpProtection : public XclExpBoolRecord { public: XclExpProtection(bool bValue); @@ -258,11 +258,11 @@ private: class ExcDummy_040 : public ExcDummyRec { private: - static const BYTE pMyData[]; + static const BYTE pMyData[]; static const sal_Size nMyLen; public: virtual sal_Size GetLen( void ) const; - virtual const BYTE* GetData( void ) const; + virtual const BYTE* GetData( void ) const; }; @@ -270,11 +270,11 @@ public: class ExcDummy_041 : public ExcDummyRec { private: - static const BYTE pMyData[]; + static const BYTE pMyData[]; static const sal_Size nMyLen; public: virtual sal_Size GetLen( void ) const; - virtual const BYTE* GetData( void ) const; + virtual const BYTE* GetData( void ) const; }; @@ -284,7 +284,7 @@ class Exc1904 : public ExcBoolRecord { public: Exc1904( ScDocument& rDoc ); - virtual UINT16 GetNum( void ) const; + virtual UINT16 GetNum( void ) const; virtual void SaveXml( XclExpXmlStream& rStrm ); private: @@ -299,7 +299,7 @@ class ExcBundlesheetBase : public ExcRecord protected: sal_Size nStrPos; sal_Size nOwnPos; // Position NACH # und Len - UINT16 nGrbit; + UINT16 nGrbit; SCTAB nTab; ExcBundlesheetBase(); @@ -308,9 +308,9 @@ public: ExcBundlesheetBase( RootData& rRootData, SCTAB nTab ); inline void SetStreamPos( sal_Size nNewStrPos ) { nStrPos = nNewStrPos; } - void UpdateStreamPos( XclExpStream& rStrm ); + void UpdateStreamPos( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; }; @@ -318,9 +318,9 @@ public: class ExcBundlesheet : public ExcBundlesheetBase { private: - ByteString aName; + ByteString aName; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBundlesheet( RootData& rRootData, SCTAB nTab ); @@ -333,11 +333,11 @@ public: class ExcDummy_02a : public ExcDummyRec { private: - static const BYTE pMyData[]; + static const BYTE pMyData[]; static const sal_Size nMyLen; public: virtual sal_Size GetLen( void ) const; - virtual const BYTE* GetData( void ) const; + virtual const BYTE* GetData( void ) const; }; @@ -399,9 +399,9 @@ private: class ExcFilterCondition { private: - UINT8 nType; - UINT8 nOper; - double fVal; + UINT8 nType; + UINT8 nOper; + double fVal; XclExpString* pText; protected: @@ -409,15 +409,15 @@ public: ExcFilterCondition(); ~ExcFilterCondition(); - inline BOOL IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); } - inline BOOL HasEqual() const { return (nOper == EXC_AFOPER_EQUAL); } - ULONG GetTextBytes() const; + inline BOOL IsEmpty() const { return (nType == EXC_AFTYPE_NOTUSED); } + inline BOOL HasEqual() const { return (nOper == EXC_AFOPER_EQUAL); } + ULONG GetTextBytes() const; - void SetCondition( UINT8 nTp, UINT8 nOp, double fV, String* pT ); + void SetCondition( UINT8 nTp, UINT8 nOp, double fV, String* pT ); - void Save( XclExpStream& rStrm ); - void SaveXml( XclExpXmlStream& rStrm ); - void SaveText( XclExpStream& rStrm ); + void Save( XclExpStream& rStrm ); + void SaveXml( XclExpXmlStream& rStrm ); + void SaveText( XclExpStream& rStrm ); }; // ---------------------------------------------------------------------------- @@ -425,11 +425,11 @@ public: class XclExpAutofilter : public XclExpRecord, protected XclExpRoot { private: - UINT16 nCol; - UINT16 nFlags; - ExcFilterCondition aCond[ 2 ]; + UINT16 nCol; + UINT16 nFlags; + ExcFilterCondition aCond[ 2 ]; - BOOL AddCondition( ScQueryConnect eConn, UINT8 nType, + BOOL AddCondition( ScQueryConnect eConn, UINT8 nType, UINT8 nOp, double fVal, String* pText, BOOL bSimple = FALSE ); @@ -439,8 +439,8 @@ protected: public: XclExpAutofilter( const XclExpRoot& rRoot, UINT16 nC ); - inline UINT16 GetCol() const { return nCol; } - inline BOOL HasCondition() const { return !aCond[ 0 ].IsEmpty(); } + inline UINT16 GetCol() const { return nCol; } + inline BOOL HasCondition() const { return !aCond[ 0 ].IsEmpty(); } inline BOOL HasTop10() const { return ::get_flag( nFlags, EXC_AFFLAG_TOP10 ); } BOOL AddEntry( const ScQueryEntry& rEntry ); diff --git a/sc/source/filter/inc/excscen.hxx b/sc/source/filter/inc/excscen.hxx index 2d0d0c8246d3..849a9dce587f 100644 --- a/sc/source/filter/inc/excscen.hxx +++ b/sc/source/filter/inc/excscen.hxx @@ -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 @@ -44,14 +44,14 @@ class ScDocument; class ExcScenarioCell { private: - String aValue; + String aValue; public: - const UINT16 nCol; - const UINT16 nRow; + const UINT16 nCol; + const UINT16 nRow; ExcScenarioCell( const UINT16 nC, const UINT16 nR ); - void SetValue( const String& rVal ); - inline const String& GetValue( void ) const; + void SetValue( const String& rVal ); + inline const String& GetValue( void ) const; }; @@ -62,17 +62,17 @@ class ExcScenario : protected List private: friend class ExcScenarioList; protected: - String* pName; - String* pComment; - String* pUserName; - UINT8 nProtected; + String* pName; + String* pComment; + String* pUserName; + UINT8 nProtected; - const UINT16 nTab; + const UINT16 nTab; void Apply( const XclImpRoot& rRoot, const BOOL bLast = FALSE ); public: ExcScenario( XclImpStream& rIn, const RootData& rRoot ); - virtual ~ExcScenario(); + virtual ~ExcScenario(); }; @@ -81,22 +81,22 @@ public: class ExcScenarioList : protected List { private: - UINT16 nLastScenario; - inline ExcScenario* _First( void ) { return ( ExcScenario* ) List::First(); } - inline ExcScenario* _Next( void ) { return ( ExcScenario* ) List::Next(); } - inline ExcScenario* _Last( void ) { return ( ExcScenario* ) List::Last(); } - inline ExcScenario* _Prev( void ) { return ( ExcScenario* ) List::Prev(); } + UINT16 nLastScenario; + inline ExcScenario* _First( void ) { return ( ExcScenario* ) List::First(); } + inline ExcScenario* _Next( void ) { return ( ExcScenario* ) List::Next(); } + inline ExcScenario* _Last( void ) { return ( ExcScenario* ) List::Last(); } + inline ExcScenario* _Prev( void ) { return ( ExcScenario* ) List::Prev(); } protected: public: ExcScenarioList( void ); - virtual ~ExcScenarioList(); + virtual ~ExcScenarioList(); - inline void Append( ExcScenario* pNew ); + inline void Append( ExcScenario* pNew ); - inline void SetLast( const UINT16 nIndex4Last ); + inline void SetLast( const UINT16 nIndex4Last ); - inline const ExcScenario* First( void ); - inline const ExcScenario* Next( void ); + inline const ExcScenario* First( void ); + inline const ExcScenario* Next( void ); using List::Count; diff --git a/sc/source/filter/inc/exp_op.hxx b/sc/source/filter/inc/exp_op.hxx index ff1f1f11bcb5..e1fb6282a292 100644 --- a/sc/source/filter/inc/exp_op.hxx +++ b/sc/source/filter/inc/exp_op.hxx @@ -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 @@ -44,9 +44,9 @@ class SotStorage; class ExportTyp { protected: - SvStream& aOut; // Ausgabe-Stream - ScDocument* pD; // Dokument - CharSet eZielChar; // Ziel-Zeichensatz + SvStream& aOut; // Ausgabe-Stream + ScDocument* pD; // Dokument + CharSet eZielChar; // Ziel-Zeichensatz public: ExportTyp( SvStream& aStream, ScDocument* pDoc, CharSet eDest ): aOut( aStream ) @@ -55,7 +55,7 @@ public: pD = pDoc; } - virtual FltError Write() = 0; + virtual FltError Write() = 0; }; @@ -64,40 +64,40 @@ public: class ExportWK1 : public ExportTyp { private: - BYTE GenFormByte( const ScPatternAttr& ); - void Bof(); - void Eof(); - void Calcmode(); - void Calcorder(); - void Split(); - void Sync(); - void Dimensions(); - void Window1(); - void Colw(); - void Blank( const UINT16 nC, const UINT16 nR, const ScPatternAttr& ); - void Number( const UINT16 nC, const UINT16 nR, const double f, const ScPatternAttr& ); - void Label( const UINT16 nC, const UINT16 nR, const String&, const ScPatternAttr& ); - void Formula( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& ); - void Protect(); - void Footer(); - void Header(); - void Margins(); - void Labelfmt(); - void Calccount(); - void Cursorw12(); - void WKString( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& ); - void Snrange(); - void Hidcol(); - void Cpi(); + BYTE GenFormByte( const ScPatternAttr& ); + void Bof(); + void Eof(); + void Calcmode(); + void Calcorder(); + void Split(); + void Sync(); + void Dimensions(); + void Window1(); + void Colw(); + void Blank( const UINT16 nC, const UINT16 nR, const ScPatternAttr& ); + void Number( const UINT16 nC, const UINT16 nR, const double f, const ScPatternAttr& ); + void Label( const UINT16 nC, const UINT16 nR, const String&, const ScPatternAttr& ); + void Formula( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& ); + void Protect(); + void Footer(); + void Header(); + void Margins(); + void Labelfmt(); + void Calccount(); + void Cursorw12(); + void WKString( const UINT16 nC, const UINT16 nR, const ScFormulaCell*, const ScPatternAttr& ); + void Snrange(); + void Hidcol(); + void Cpi(); public: static const USHORT WK1MAXCOL; static const USHORT WK1MAXROW; - inline ExportWK1( SvStream& r, ScDocument* p, CharSet e ) : + inline ExportWK1( SvStream& r, ScDocument* p, CharSet e ) : ExportTyp( r, p, e ) {}; - FltError Write(); + FltError Write(); }; #endif @@ -106,15 +106,15 @@ public: class ExportBiff5 : public ExportTyp, protected XclExpRoot { private: - ExcDocument* pExcDoc; + ExcDocument* pExcDoc; protected: RootData* pExcRoot; public: ExportBiff5( XclExpRootData& rExpData, SvStream& rStrm ); - virtual ~ExportBiff5(); - FltError Write(); + virtual ~ExportBiff5(); + FltError Write(); }; @@ -124,7 +124,7 @@ class ExportBiff8 : public ExportBiff5 { public: ExportBiff8( XclExpRootData& rExpData, SvStream& rStrm ); - virtual ~ExportBiff8(); + virtual ~ExportBiff8(); }; diff --git a/sc/source/filter/inc/expbase.hxx b/sc/source/filter/inc/expbase.hxx index 1500e7d634f5..e734a818a0ed 100644 --- a/sc/source/filter/inc/expbase.hxx +++ b/sc/source/filter/inc/expbase.hxx @@ -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,37 +48,37 @@ public: protected: - SvStream& rStrm; - ScRange aRange; - ScDocument* pDoc; - SvNumberFormatter* pFormatter; - ScFieldEditEngine* pEditEngine; + SvStream& rStrm; + ScRange aRange; + ScDocument* pDoc; + SvNumberFormatter* pFormatter; + ScFieldEditEngine* pEditEngine; public: ScExportBase( SvStream&, ScDocument*, const ScRange& ); - virtual ~ScExportBase(); + virtual ~ScExportBase(); // Hidden Cols/Rows an den Raendern trimmen, // return: TRUE wenn Bereich vorhanden // Start/End/Col/Row muessen gueltige Ausgangswerte sein - BOOL TrimDataArea( SCTAB nTab, SCCOL& nStartCol, + BOOL TrimDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const; // Ausgabebereich einer Tabelle ermitteln, // Hidden Cols/Rows an den Raendern beruecksichtigt, // return: TRUE wenn Bereich vorhanden - BOOL GetDataArea( SCTAB nTab, SCCOL& nStartCol, + BOOL GetDataArea( SCTAB nTab, SCCOL& nStartCol, SCROW& nStartRow, SCCOL& nEndCol, SCROW& nEndRow ) const; // Tabelle nicht vorhanden oder leer - BOOL IsEmptyTable( SCTAB nTab ) const; + BOOL IsEmptyTable( SCTAB nTab ) const; - ScFieldEditEngine& GetEditEngine() const; + ScFieldEditEngine& GetEditEngine() const; }; -#endif // SC_EXPBASE_HXX +#endif // SC_EXPBASE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/fapihelper.hxx b/sc/source/filter/inc/fapihelper.hxx index babf2cc575d7..e1ddd8508721 100644 --- a/sc/source/filter/inc/fapihelper.hxx +++ b/sc/source/filter/inc/fapihelper.hxx @@ -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/inc/filt_pch.hxx b/sc/source/filter/inc/filt_pch.hxx index 3b9ebde307e8..139168aa8900 100644 --- a/sc/source/filter/inc/filt_pch.hxx +++ b/sc/source/filter/inc/filt_pch.hxx @@ -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 @@ -26,7 +26,7 @@ * ************************************************************************/ -// ItemID-Defines etc. muessen immer ganz vorne stehen +// ItemID-Defines etc. muessen immer ganz vorne stehen #include "scitems.hxx" diff --git a/sc/source/filter/inc/fkttab.h b/sc/source/filter/inc/fkttab.h index 5604fff3ac7d..aa7647e69e4e 100644 --- a/sc/source/filter/inc/fkttab.h +++ b/sc/source/filter/inc/fkttab.h @@ -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/inc/flttypes.hxx b/sc/source/filter/inc/flttypes.hxx index c34fff6c2299..7ff32aa59a6b 100644 --- a/sc/source/filter/inc/flttypes.hxx +++ b/sc/source/filter/inc/flttypes.hxx @@ -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/inc/formel.hxx b/sc/source/filter/inc/formel.hxx index 7abed0dade97..309f61ff09a6 100644 --- a/sc/source/filter/inc/formel.hxx +++ b/sc/source/filter/inc/formel.hxx @@ -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 @@ -54,10 +54,10 @@ struct ScComplexRefData; enum ConvErr { ConvOK = 0, - ConvErrNi, // nicht implemntierter/unbekannter Opcode aufgetreten - ConvErrNoMem, // Fehler beim Speicheranfordern + ConvErrNi, // nicht implemntierter/unbekannter Opcode aufgetreten + ConvErrNoMem, // Fehler beim Speicheranfordern ConvErrExternal,// Add-Ins aus Excel werden nicht umgesetzt - ConvErrCount // Nicht alle Bytes der Formel 'erwischt' + ConvErrCount // Nicht alle Bytes der Formel 'erwischt' }; @@ -78,17 +78,17 @@ class _ScRangeList : protected List private: protected: public: - virtual ~_ScRangeList(); - inline void Append( const ScRange& rRange ); - inline void Append( ScRange* pRange ); - inline void Append( const ScSingleRefData& rSRD ); - inline void Append( const ScComplexRefData& rCRD ); + virtual ~_ScRangeList(); + inline void Append( const ScRange& rRange ); + inline void Append( ScRange* pRange ); + inline void Append( const ScSingleRefData& rSRD ); + inline void Append( const ScComplexRefData& rCRD ); using List::Count; - inline BOOL HasRanges( void ) const; + inline BOOL HasRanges( void ) const; - inline const ScRange* First( void ); - inline const ScRange* Next( void ); + inline const ScRange* First( void ); + inline const ScRange* Next( void ); }; @@ -130,7 +130,7 @@ inline void _ScRangeList::Append( const ScSingleRefData& r ) inline void _ScRangeList::Append( const ScComplexRefData& r ) { - List::Insert( new ScRange( r.Ref1.nCol, r.Ref1.nRow, r.Ref1.nTab, + List::Insert( new ScRange( r.Ref1.nCol, r.Ref1.nRow, r.Ref1.nTab, r.Ref2.nCol, r.Ref2.nRow, r.Ref2.nTab ), LIST_APPEND ); } @@ -144,23 +144,23 @@ class _ScRangeListTabs { private: protected: - BOOL bHasRanges; - _ScRangeList** ppTabLists; - _ScRangeList* pAct; - UINT16 nAct; + BOOL bHasRanges; + _ScRangeList** ppTabLists; + _ScRangeList* pAct; + UINT16 nAct; public: _ScRangeListTabs( void ); - virtual ~_ScRangeListTabs(); + virtual ~_ScRangeListTabs(); - void Append( ScSingleRefData aSRD, SCsTAB nTab, const BOOL bLimit = TRUE ); - void Append( ScComplexRefData aCRD, SCsTAB nTab, const BOOL bLimit = TRUE ); + void Append( ScSingleRefData aSRD, SCsTAB nTab, const BOOL bLimit = TRUE ); + void Append( ScComplexRefData aCRD, SCsTAB nTab, const BOOL bLimit = TRUE ); - inline BOOL HasRanges( void ) const; + inline BOOL HasRanges( void ) const; - const ScRange* First( const UINT16 nTab = 0 ); - const ScRange* Next( void ); -// const ScRange* NextContinue( void ); - inline const _ScRangeList* GetActList( void ) const; + const ScRange* First( const UINT16 nTab = 0 ); + const ScRange* Next( void ); +// const ScRange* NextContinue( void ); + inline const _ScRangeList* GetActList( void ) const; }; @@ -181,23 +181,23 @@ inline const _ScRangeList* _ScRangeListTabs::GetActList( void ) const class ConverterBase { protected: - TokenPool aPool; // User Token + Predefined Token - TokenStack aStack; + TokenPool aPool; // User Token + Predefined Token + TokenStack aStack; ScAddress aEingPos; ConvErr eStatus; - sal_Char* pBuffer; // Universal-Puffer - UINT16 nBufferSize; // ...und seine Groesse + sal_Char* pBuffer; // Universal-Puffer + UINT16 nBufferSize; // ...und seine Groesse ConverterBase( UINT16 nNewBuffer ); - virtual ~ConverterBase(); + virtual ~ConverterBase(); - void Reset(); + void Reset(); public: - inline SCCOL GetEingabeCol( void ) const { return aEingPos.Col(); } - inline SCROW GetEingabeRow( void ) const { return aEingPos.Row(); } - inline SCTAB GetEingabeTab( void ) const { return aEingPos.Tab(); } - inline ScAddress GetEingPos( void ) const { return aEingPos; } + inline SCCOL GetEingabeCol( void ) const { return aEingPos.Col(); } + inline SCROW GetEingabeRow( void ) const { return aEingPos.Row(); } + inline SCTAB GetEingabeTab( void ) const { return aEingPos.Tab(); } + inline ScAddress GetEingPos( void ) const { return aEingPos; } }; @@ -206,10 +206,10 @@ class ExcelConverterBase : public ConverterBase { protected: ExcelConverterBase( UINT16 nNewBuffer ); - virtual ~ExcelConverterBase(); + virtual ~ExcelConverterBase(); public: - void Reset(); + void Reset(); void Reset( const ScAddress& rEingPos ); virtual ConvErr Convert( const ScTokenArray*& rpErg, XclImpStream& rStrm, sal_Size nFormulaLen, @@ -223,24 +223,24 @@ public: class LotusConverterBase : public ConverterBase { protected: - SvStream& aIn; - INT32 nBytesLeft; - - inline void Ignore( const long nSeekRel ); - inline void Read( sal_Char& nByte ); - inline void Read( BYTE& nByte ); - inline void Read( UINT16& nUINT16 ); - inline void Read( INT16& nINT16 ); - inline void Read( double& fDouble ); + SvStream& aIn; + INT32 nBytesLeft; + + inline void Ignore( const long nSeekRel ); + inline void Read( sal_Char& nByte ); + inline void Read( BYTE& nByte ); + inline void Read( UINT16& nUINT16 ); + inline void Read( INT16& nINT16 ); + inline void Read( double& fDouble ); inline void Read( UINT32& nUINT32 ); LotusConverterBase( SvStream& rStr, UINT16 nNewBuffer ); - virtual ~LotusConverterBase(); + virtual ~LotusConverterBase(); public: void Reset( const ScAddress& rEingPos ); - virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, + virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, const FORMULA_TYPE eFT = FT_CellFormula ) = 0; protected: diff --git a/sc/source/filter/inc/fprogressbar.hxx b/sc/source/filter/inc/fprogressbar.hxx index b65b12d981f0..751c9c63fa98 100644 --- a/sc/source/filter/inc/fprogressbar.hxx +++ b/sc/source/filter/inc/fprogressbar.hxx @@ -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/inc/ftools.hxx b/sc/source/filter/inc/ftools.hxx index d02cba498fcf..394c213d2318 100644 --- a/sc/source/filter/inc/ftools.hxx +++ b/sc/source/filter/inc/ftools.hxx @@ -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 @@ -510,16 +510,16 @@ class ScFormatFilterPluginImpl : public ScFormatFilterPlugin { virtual FltError ScImportLotus123( SfxMedium&, ScDocument*, CharSet eSrc = RTL_TEXTENCODING_DONTKNOW ); virtual FltError ScImportQuattroPro( SfxMedium &rMedium, ScDocument *pDoc ); virtual FltError ScImportExcel( SfxMedium&, ScDocument*, const EXCIMPFORMAT ); - // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet - // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) - // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) + // eFormat == EIF_AUTO -> passender Filter wird automatisch verwendet + // eFormat == EIF_BIFF5 -> nur Biff5-Stream fuehrt zum Erfolg (auch wenn in einem Excel97-Doc) + // eFormat == EIF_BIFF8 -> nur Biff8-Stream fuehrt zum Erfolg (nur in Excel97-Docs) // eFormat == EIF_BIFF_LE4 -> nur Nicht-Storage-Dateien _koennen_ zum Erfolg fuehren virtual FltError ScImportStarCalc10( SvStream&, ScDocument* ); virtual FltError ScImportDif( SvStream&, ScDocument*, const ScAddress& rInsPos, const CharSet eSrc = RTL_TEXTENCODING_DONTKNOW, UINT32 nDifOption = SC_DIFOPT_EXCEL ); virtual FltError ScImportRTF( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange ); - virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, - double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, + virtual FltError ScImportHTML( SvStream&, const String& rBaseURL, ScDocument*, ScRange& rRange, + double nOutputFactor = 1.0, BOOL bCalcWidthHeight = TRUE, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ); virtual ScEEAbsImport *CreateRTFImport( ScDocument* pDoc, const ScRange& rRange ); diff --git a/sc/source/filter/inc/funktion.h b/sc/source/filter/inc/funktion.h index 2377fbe16bf1..1a9e127d0a09 100644 --- a/sc/source/filter/inc/funktion.h +++ b/sc/source/filter/inc/funktion.h @@ -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 @@ -30,21 +30,21 @@ #define SC_FUNKTION_H // Bearbeitungsfunktionen -void P0( void ); // 0 Parameter -void P1( void ); // 1 Parameter -void P2( void ); // 2 Parameter -void P3( void ); // 3 Parameter -void P4( void ); // 4 Parameter -void P5( void ); // 5 Parameter -void Pn( void ); // n Parameter -void NI( void ); // nicht implementiert -void ConstFloat( void ); // 0 -void Variable( void ); // 1 -void LotusRange( void ); // 2 -void FormulaReturn( void ); // 3 -void Klammer( void ); // 4 -void ConstInt( void ); // 5 -void ConstString( void ); // 6 +void P0( void ); // 0 Parameter +void P1( void ); // 1 Parameter +void P2( void ); // 2 Parameter +void P3( void ); // 3 Parameter +void P4( void ); // 4 Parameter +void P5( void ); // 5 Parameter +void Pn( void ); // n Parameter +void NI( void ); // nicht implementiert +void ConstFloat( void ); // 0 +void Variable( void ); // 1 +void LotusRange( void ); // 2 +void FormulaReturn( void ); // 3 +void Klammer( void ); // 4 +void ConstInt( void ); // 5 +void ConstString( void ); // 6 // ACHTUNG: unbekannte Funktionen -> P0() #endif diff --git a/sc/source/filter/inc/htmlexp.hxx b/sc/source/filter/inc/htmlexp.hxx index 4a7e8f3f32b9..3cc00e39e4de 100644 --- a/sc/source/filter/inc/htmlexp.hxx +++ b/sc/source/filter/inc/htmlexp.hxx @@ -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,10 +49,10 @@ class ScEditCell; class SvxBorderLine; struct ScHTMLStyle -{ // Defaults aus StyleSheet - Color aBackgroundColor; - String aFontFamilyName; - UINT32 nFontHeight; // Item-Value +{ // Defaults aus StyleSheet + Color aBackgroundColor; + String aFontFamilyName; + UINT32 nFontHeight; // Item-Value USHORT nFontSizeNumber; // HTML value 1-7 BYTE nDefaultScriptType; // Font values are valid for the default script type BOOL bInitialized; @@ -62,9 +62,9 @@ struct ScHTMLStyle const ScHTMLStyle& operator=( const ScHTMLStyle& r ) { - aBackgroundColor = r.aBackgroundColor; - aFontFamilyName = r.aFontFamilyName; - nFontHeight = r.nFontHeight; + aBackgroundColor = r.aBackgroundColor; + aFontFamilyName = r.aFontFamilyName; + nFontHeight = r.nFontHeight; nFontSizeNumber = r.nFontSizeNumber; nDefaultScriptType = r.nDefaultScriptType; bInitialized = r.bInitialized; @@ -74,15 +74,15 @@ struct ScHTMLStyle struct ScHTMLGraphEntry { - ScRange aRange; // ueberlagerter Zellbereich - Size aSize; // Groesse in Pixeln - Size aSpace; // Spacing in Pixeln - SdrObject* pObject; - BOOL bInCell; // ob in Zelle ausgegeben wird - BOOL bWritten; + ScRange aRange; // ueberlagerter Zellbereich + Size aSize; // Groesse in Pixeln + Size aSpace; // Spacing in Pixeln + SdrObject* pObject; + BOOL bInCell; // ob in Zelle ausgegeben wird + BOOL bWritten; ScHTMLGraphEntry( SdrObject* pObj, const ScRange& rRange, - const Size& rSize, BOOL bIn, const Size& rSpace ) : + const Size& rSize, BOOL bIn, const Size& rSpace ) : aRange( rRange ), aSize( rSize ), aSpace( rSpace ), pObject( pObj ), bInCell( bIn ), bWritten( FALSE ) {} }; @@ -95,77 +95,77 @@ const short nIndentMax = 23; class ScHTMLExport : public ScExportBase { // default HtmlFontSz[1-7] - static const USHORT nDefaultFontSize[SC_HTML_FONTSIZES]; + static const USHORT nDefaultFontSize[SC_HTML_FONTSIZES]; // HtmlFontSz[1-7] in s*3.ini [user] - static USHORT nFontSize[SC_HTML_FONTSIZES]; - static const char* pFontSizeCss[SC_HTML_FONTSIZES]; - static const USHORT nCellSpacing; + static USHORT nFontSize[SC_HTML_FONTSIZES]; + static const char* pFontSizeCss[SC_HTML_FONTSIZES]; + static const USHORT nCellSpacing; static const sal_Char __FAR_DATA sIndentSource[]; - ScHTMLGraphList aGraphList; - ScHTMLStyle aHTMLStyle; + ScHTMLGraphList aGraphList; + ScHTMLStyle aHTMLStyle; String aBaseURL; - String aStreamPath; - String aCId; // Content-Id fuer Mail-Export - OutputDevice* pAppWin; // fuer Pixelei - SvStringsSortDtor* pSrcArr; // fuer CopyLocalFileToINet - SvStringsSortDtor* pDestArr; + String aStreamPath; + String aCId; // Content-Id fuer Mail-Export + OutputDevice* pAppWin; // fuer Pixelei + SvStringsSortDtor* pSrcArr; // fuer CopyLocalFileToINet + SvStringsSortDtor* pDestArr; String aNonConvertibleChars; // collect nonconvertible characters - rtl_TextEncoding eDestEnc; - SCTAB nUsedTables; - short nIndent; - sal_Char sIndent[nIndentMax+1]; - BOOL bAll; // ganzes Dokument - BOOL bTabHasGraphics; - BOOL bTabAlignedLeft; - BOOL bCalcAsShown; - BOOL bCopyLocalFileToINet; + rtl_TextEncoding eDestEnc; + SCTAB nUsedTables; + short nIndent; + sal_Char sIndent[nIndentMax+1]; + BOOL bAll; // ganzes Dokument + BOOL bTabHasGraphics; + BOOL bTabAlignedLeft; + BOOL bCalcAsShown; + BOOL bCopyLocalFileToINet; BOOL bTableDataWidth; BOOL bTableDataHeight; - const SfxItemSet& PageDefaults( SCTAB nTab ); + const SfxItemSet& PageDefaults( SCTAB nTab ); void WriteBody(); - void WriteHeader(); - void WriteOverview(); - void WriteTables(); - void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); - void WriteGraphEntry( ScHTMLGraphEntry* ); + void WriteHeader(); + void WriteOverview(); + void WriteTables(); + void WriteCell( SCCOL nCol, SCROW nRow, SCTAB nTab ); + void WriteGraphEntry( ScHTMLGraphEntry* ); void WriteImage( String& rLinkName, const Graphic&, const ByteString& rImgOptions, ULONG nXOutFlags = 0 ); // nXOutFlags fuer XOutBitmap::WriteGraphic // write to stream if and only if URL fields in edit cell - BOOL WriteFieldText( const ScEditCell* pCell ); + BOOL WriteFieldText( const ScEditCell* pCell ); // kopiere ggfs. eine lokale Datei ins Internet - BOOL CopyLocalFileToINet( String& rFileNm, + BOOL CopyLocalFileToINet( String& rFileNm, const String& rTargetNm, BOOL bFileToFile = FALSE ); - BOOL HasCId() { return aCId.Len() > 0; } - void MakeCIdURL( String& rURL ); + BOOL HasCId() { return aCId.Len() > 0; } + void MakeCIdURL( String& rURL ); - void PrepareGraphics( ScDrawLayer*, SCTAB nTab, + void PrepareGraphics( ScDrawLayer*, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void FillGraphList( const SdrPage*, SCTAB nTab, + void FillGraphList( const SdrPage*, SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ); - void BorderToStyle( ByteString& rOut, const char* pBorderName, + void BorderToStyle( ByteString& rOut, const char* pBorderName, const SvxBorderLine* pLine, bool& bInsertSemicolon ); - USHORT GetFontSizeNumber( USHORT nHeight ); - const char* GetFontSizeCss( USHORT nHeight ); - USHORT ToPixel( USHORT nTwips ); - Size MMToPixel( const Size& r100thMMSize ); - void IncIndent( short nVal ); - const sal_Char* GetIndentStr() { return sIndent; } + USHORT GetFontSizeNumber( USHORT nHeight ); + const char* GetFontSizeCss( USHORT nHeight ); + USHORT ToPixel( USHORT nTwips ); + Size MMToPixel( const Size& r100thMMSize ); + void IncIndent( short nVal ); + const sal_Char* GetIndentStr() { return sIndent; } public: ScHTMLExport( SvStream&, const String&, ScDocument*, const ScRange&, BOOL bAll, const String& aStreamPath ); - virtual ~ScHTMLExport(); + virtual ~ScHTMLExport(); ULONG Write(); const String& GetNonConvertibleChars() const { return aNonConvertibleChars; } diff --git a/sc/source/filter/inc/htmlimp.hxx b/sc/source/filter/inc/htmlimp.hxx index 31c2dd0dbd2b..551ea2530797 100644 --- a/sc/source/filter/inc/htmlimp.hxx +++ b/sc/source/filter/inc/htmlimp.hxx @@ -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 @@ -36,17 +36,17 @@ class ScHTMLParser; class ScHTMLImport : public ScEEImport { private: - static void InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange ); + static void InsertRangeName( ScDocument* pDoc, const String& rName, const ScRange& rRange ); public: ScHTMLImport( ScDocument* pDoc, const String& rBaseURL, const ScRange& rRange, BOOL bCalcWidthHeight = TRUE ); virtual ~ScHTMLImport(); const ScHTMLParser* GetParser() const { return (ScHTMLParser*)mpParser; } - virtual void WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, + virtual void WriteToDocument( BOOL bSizeColsRows = FALSE, double nOutputFactor = 1.0, SvNumberFormatter* pFormatter = NULL, bool bConvertDate = true ); - static String GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName ); + static String GetHTMLRangeNameList( ScDocument* pDoc, const String& rOrigName ); }; diff --git a/sc/source/filter/inc/htmlpars.hxx b/sc/source/filter/inc/htmlpars.hxx index ffad22b23828..0c4e3233ccae 100644 --- a/sc/source/filter/inc/htmlpars.hxx +++ b/sc/source/filter/inc/htmlpars.hxx @@ -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 @@ -62,7 +62,7 @@ public: explicit ScHTMLParser( EditEngine* pEditEngine, ScDocument* pDoc ); virtual ~ScHTMLParser(); - virtual ULONG Read( SvStream& rStrm, const String& rBaseURL ) = 0; + virtual ULONG Read( SvStream& rStrm, const String& rBaseURL ) = 0; /** Returns the "global table" which contains the entire HTML document. */ virtual const ScHTMLTable* GetGlobalTable() const = 0; @@ -75,19 +75,19 @@ SV_DECL_VARARR_SORT( ScHTMLColOffset, ULONG, 16, 4) struct ScHTMLTableStackEntry { - ScRangeListRef xLockedList; - ScEEParseEntry* pCellEntry; - ScHTMLColOffset* pLocalColOffset; - ULONG nFirstTableCell; - SCCOL nColCnt; - SCROW nRowCnt; - SCCOL nColCntStart; - SCCOL nMaxCol; - USHORT nTable; - USHORT nTableWidth; - USHORT nColOffset; - USHORT nColOffsetStart; - BOOL bFirstRow; + ScRangeListRef xLockedList; + ScEEParseEntry* pCellEntry; + ScHTMLColOffset* pLocalColOffset; + ULONG nFirstTableCell; + SCCOL nColCnt; + SCROW nRowCnt; + SCCOL nColCntStart; + SCCOL nMaxCol; + USHORT nTable; + USHORT nTableWidth; + USHORT nColOffset; + USHORT nColOffsetStart; + BOOL bFirstRow; ScHTMLTableStackEntry( ScEEParseEntry* pE, const ScRangeListRef& rL, ScHTMLColOffset* pTO, ULONG nFTC, @@ -110,9 +110,9 @@ DECLARE_STACK( ScHTMLTableStack, ScHTMLTableStackEntry* ) struct ScHTMLAdjustStackEntry { - SCCOL nLastCol; - SCROW nNextRow; - SCROW nCurRow; + SCCOL nLastCol; + SCROW nNextRow; + SCROW nCurRow; ScHTMLAdjustStackEntry( SCCOL nLCol, SCROW nNRow, SCROW nCRow ) : nLastCol( nLCol ), nNextRow( nNRow ), @@ -133,65 +133,65 @@ class ScHTMLLayoutParser : public ScHTMLParser private: Size aPageSize; String aBaseURL; - ScHTMLTableStack aTableStack; - String aString; - ScRangeListRef xLockedList; // je Table - Table* pTables; - ScHTMLColOffset* pColOffset; - ScHTMLColOffset* pLocalColOffset; // je Table - ULONG nFirstTableCell; // je Table - short nTableLevel; - USHORT nTable; - USHORT nMaxTable; - SCCOL nColCntStart; // erste Col je Table - SCCOL nMaxCol; // je Table - USHORT nTableWidth; // je Table - USHORT nColOffset; // aktuell, Pixel - USHORT nColOffsetStart; // Startwert je Table, in Pixel - USHORT nMetaCnt; // fuer ParseMetaOptions + ScHTMLTableStack aTableStack; + String aString; + ScRangeListRef xLockedList; // je Table + Table* pTables; + ScHTMLColOffset* pColOffset; + ScHTMLColOffset* pLocalColOffset; // je Table + ULONG nFirstTableCell; // je Table + short nTableLevel; + USHORT nTable; + USHORT nMaxTable; + SCCOL nColCntStart; // erste Col je Table + SCCOL nMaxCol; // je Table + USHORT nTableWidth; // je Table + USHORT nColOffset; // aktuell, Pixel + USHORT nColOffsetStart; // Startwert je Table, in Pixel + USHORT nMetaCnt; // fuer ParseMetaOptions USHORT nOffsetTolerance; // for use with SeekOffset and related - BOOL bCalcWidthHeight; // TRUE: calculate real column width + BOOL bCalcWidthHeight; // TRUE: calculate real column width // FALSE: 1 html-col = 1 sc-col - BOOL bTabInTabCell; - BOOL bFirstRow; // je Table, ob in erster Zeile - BOOL bInCell; - BOOL bInTitle; + BOOL bTabInTabCell; + BOOL bFirstRow; // je Table, ob in erster Zeile + BOOL bInCell; + BOOL bInTitle; DECL_LINK( HTMLImportHdl, ImportInfo* ); - void NewActEntry( ScEEParseEntry* ); - void EntryEnd( ScEEParseEntry*, const ESelection& ); - void ProcToken( ImportInfo* ); - void CloseEntry( ImportInfo* ); - void NextRow( ImportInfo* ); - void SkipLocked( ScEEParseEntry*, BOOL bJoin = TRUE ); - static BOOL SeekOffset( ScHTMLColOffset*, USHORT nOffset, + void NewActEntry( ScEEParseEntry* ); + void EntryEnd( ScEEParseEntry*, const ESelection& ); + void ProcToken( ImportInfo* ); + void CloseEntry( ImportInfo* ); + void NextRow( ImportInfo* ); + void SkipLocked( ScEEParseEntry*, BOOL bJoin = TRUE ); + static BOOL SeekOffset( ScHTMLColOffset*, USHORT nOffset, SCCOL* pCol, USHORT nOffsetTol ); - static void MakeCol( ScHTMLColOffset*, USHORT& nOffset, + static void MakeCol( ScHTMLColOffset*, USHORT& nOffset, USHORT& nWidth, USHORT nOffsetTol, USHORT nWidthTol ); - static void MakeColNoRef( ScHTMLColOffset*, USHORT nOffset, + static void MakeColNoRef( ScHTMLColOffset*, USHORT nOffset, USHORT nWidth, USHORT nOffsetTol, USHORT nWidthTol ); - static void ModifyOffset( ScHTMLColOffset*, USHORT& nOldOffset, + static void ModifyOffset( ScHTMLColOffset*, USHORT& nOldOffset, USHORT& nNewOffset, USHORT nOffsetTol ); - void Colonize( ScEEParseEntry* ); - USHORT GetWidth( ScEEParseEntry* ); - void SetWidths(); - void Adjust(); + void Colonize( ScEEParseEntry* ); + USHORT GetWidth( ScEEParseEntry* ); + void SetWidths(); + void Adjust(); - USHORT GetWidthPixel( const HTMLOption* ); - BOOL IsAtBeginningOfText( ImportInfo* ); + USHORT GetWidthPixel( const HTMLOption* ); + BOOL IsAtBeginningOfText( ImportInfo* ); - void TableOn( ImportInfo* ); + void TableOn( ImportInfo* ); void ColOn( ImportInfo* ); void TableRowOn( ImportInfo* ); void TableRowOff( ImportInfo* ); - void TableDataOn( ImportInfo* ); + void TableDataOn( ImportInfo* ); void TableDataOff( ImportInfo* ); - void TableOff( ImportInfo* ); + void TableOff( ImportInfo* ); void Image( ImportInfo* ); - void AnchorOn( ImportInfo* ); - void FontOn( ImportInfo* ); + void AnchorOn( ImportInfo* ); + void FontOn( ImportInfo* ); public: ScHTMLLayoutParser( EditEngine*, const String& rBaseURL, const Size& aPageSize, ScDocument* ); diff --git a/sc/source/filter/inc/imp_op.hxx b/sc/source/filter/inc/imp_op.hxx index f5d85328afdf..b403ea56ce82 100644 --- a/sc/source/filter/inc/imp_op.hxx +++ b/sc/source/filter/inc/imp_op.hxx @@ -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 @@ class ExcelToSc; class ImportTyp { protected: - CharSet eQuellChar; // Quell-Zeichensatz - ScDocument* pD; // Dokument + CharSet eQuellChar; // Quell-Zeichensatz + ScDocument* pD; // Dokument public: ImportTyp( ScDocument*, CharSet eSrc ); - virtual ~ImportTyp(); + virtual ~ImportTyp(); - virtual FltError Read( void ); + virtual FltError Read( void ); }; class XclImpOutlineDataBuffer : protected XclImpRoot @@ -90,7 +90,7 @@ private: class ImportExcel : public ImportTyp, protected XclImpRoot { protected: - static const double fExcToTwips; // Umrechnung 1/256 Zeichen -> Twips + static const double fExcToTwips; // Umrechnung 1/256 Zeichen -> Twips RootData* pExcRoot; @@ -101,7 +101,7 @@ protected: ScRange maScOleSize; /// Visible range if embedded. NameBuffer* pExtNameBuff; // ... externe Namen (Ind.-Basis=1) - ExcelToSc* pFormConv; // Formel-Konverter + ExcelToSc* pFormConv; // Formel-Konverter XclImpOutlineBuffer* pColOutlineBuff; XclImpOutlineBuffer* pRowOutlineBuff; @@ -111,13 +111,13 @@ protected: XclImpOutlineListBuffer* pOutlineListBuffer; sal_Int16 mnLastRefIdx; - UINT16 nIxfeIndex; // merkt sich Angabe im IXFE-Record - UINT16 nLastXF; // letzter XF in Formula-Record - SCTAB nBdshtTab; // Counter fuer Boundsheet - ScFormulaCell* pLastFormCell; // fuer String-Records + UINT16 nIxfeIndex; // merkt sich Angabe im IXFE-Record + UINT16 nLastXF; // letzter XF in Formula-Record + SCTAB nBdshtTab; // Counter fuer Boundsheet + ScFormulaCell* pLastFormCell; // fuer String-Records - BOOL bTabTruncated; // wenn Bereichsueberschreitung zum - // Abschneiden von Zellen fuehrt + BOOL bTabTruncated; // wenn Bereichsueberschreitung zum + // Abschneiden von Zellen fuehrt // Record-Funktionen void ReadFileSharing(); @@ -133,62 +133,62 @@ protected: void ReadRk(); void Window1(); - void Formula25( void ); // 0x06 -> excform.cxx - void Row25( void ); // 0x08 - void Bof2( void ); // 0x09 - void Eof( void ); // 0x0A - void DocProtect( void ); // 0x12 + void Formula25( void ); // 0x06 -> excform.cxx + void Row25( void ); // 0x08 + void Bof2( void ); // 0x09 + void Eof( void ); // 0x0A + void DocProtect( void ); // 0x12 void SheetProtect( void ); // 0x12 Sheet Protection void DocPasssword( void ); // 0x13 document password void SheetPassword( void ); // 0x13 sheet password - void Externsheet( void ); // 0x17 + void Externsheet( void ); // 0x17 void WinProtection( void ); // 0x19 - void Columndefault( void ); // 0x20 - void Array25( void ); // 0x21 - void Rec1904( void ); // 0x22 - void Externname25( void ); // 0x23 - void Colwidth( void ); // 0x24 - void Defrowheight2( void ); // 0x25 -// void Window1( void ); // 0x3D - void Codepage( void ); // 0x42 - void Ixfe( void ); // 0x44 - void DefColWidth( void ); // 0x55 - void Builtinfmtcnt( void ); // 0x56 - void Colinfo( void ); // 0x7D - void Wsbool( void ); // 0x81 - void Boundsheet( void ); // 0x85 - void Country( void ); // 0x8C - void Hideobj( void ); // 0x8D - void Bundleheader( void ); // 0x8F - void Standardwidth( void ); // 0x99 - void Shrfmla( void ); // 0xBC - void Mulrk( void ); // 0xBD - void Mulblank( void ); // 0xBE - void Rstring( void ); // 0xD6 + void Columndefault( void ); // 0x20 + void Array25( void ); // 0x21 + void Rec1904( void ); // 0x22 + void Externname25( void ); // 0x23 + void Colwidth( void ); // 0x24 + void Defrowheight2( void ); // 0x25 +// void Window1( void ); // 0x3D + void Codepage( void ); // 0x42 + void Ixfe( void ); // 0x44 + void DefColWidth( void ); // 0x55 + void Builtinfmtcnt( void ); // 0x56 + void Colinfo( void ); // 0x7D + void Wsbool( void ); // 0x81 + void Boundsheet( void ); // 0x85 + void Country( void ); // 0x8C + void Hideobj( void ); // 0x8D + void Bundleheader( void ); // 0x8F + void Standardwidth( void ); // 0x99 + void Shrfmla( void ); // 0xBC + void Mulrk( void ); // 0xBD + void Mulblank( void ); // 0xBE + void Rstring( void ); // 0xD6 void Cellmerging( void ); // 0xE5 void Olesize( void ); // 0xDE void ReadUsesElfs(); // 0x0160 - void Formula3( void ); // 0x0206 -> excform.cxx + void Formula3( void ); // 0x0206 -> excform.cxx // 0x0207 -> 0x07 - void Row34( void ); // 0x0208 - void Bof3( void ); // 0x0209 - void Array34( void ); // 0x0221 - void Externname34( void ); // 0x0223 - void Defrowheight345( void ); // 0x0225 - void TableOp( void ); // 0x0236 - //void Rk( void ); // 0x027E -> 0x7E - void Formula4( void ); // 0x0406 -> excform.cxx - void Bof4( void ); // 0x0409 - void Bof5( void ); // 0x0809 + void Row34( void ); // 0x0208 + void Bof3( void ); // 0x0209 + void Array34( void ); // 0x0221 + void Externname34( void ); // 0x0223 + void Defrowheight345( void ); // 0x0225 + void TableOp( void ); // 0x0236 + //void Rk( void ); // 0x027E -> 0x7E + void Formula4( void ); // 0x0406 -> excform.cxx + void Bof4( void ); // 0x0409 + void Bof5( void ); // 0x0809 // --------------------------------------------------------------- void Formula( const XclAddress& rXclPos, UINT16 nXF, UINT16 nFormLen, double &rCurVal, BOOL bShrFmla ); - // -> excform.cxx + // -> excform.cxx virtual void EndSheet( void ); - void NeueTabelle( void ); - const ScTokenArray* ErrorToFormula( BYTE bErrOrVal, BYTE nError, + void NeueTabelle( void ); + const ScTokenArray* ErrorToFormula( BYTE bErrOrVal, BYTE nError, double& rVal ); virtual void AdjustRowHeight(); @@ -197,9 +197,9 @@ protected: public: ImportExcel( XclImpRootData& rImpData, SvStream& rStrm ); - virtual ~ImportExcel( void ); + virtual ~ImportExcel( void ); - virtual FltError Read( void ); + virtual FltError Read( void ); }; #endif diff --git a/sc/source/filter/inc/lotattr.hxx b/sc/source/filter/inc/lotattr.hxx index f9c8c88fb222..3f4f1b926132 100644 --- a/sc/source/filter/inc/lotattr.hxx +++ b/sc/source/filter/inc/lotattr.hxx @@ -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,13 +47,13 @@ class LotAttrTable; struct LotAttrWK3 { - UINT8 nFont; - UINT8 nLineStyle; - UINT8 nFontCol; - UINT8 nBack; + UINT8 nFont; + UINT8 nLineStyle; + UINT8 nFontCol; + UINT8 nBack; - inline BOOL HasStyles( void ); - inline BOOL IsCentered( void ); + inline BOOL HasStyles( void ); + inline BOOL IsCentered( void ); }; @@ -77,41 +77,41 @@ private: struct ENTRY { - ScPatternAttr* pPattAttr; - UINT32 nHash0; + ScPatternAttr* pPattAttr; + UINT32 nHash0; - inline ENTRY( const ScPatternAttr& r ) { pPattAttr = new ScPatternAttr( r ); } + inline ENTRY( const ScPatternAttr& r ) { pPattAttr = new ScPatternAttr( r ); } - inline ENTRY( ScPatternAttr* p ) { pPattAttr = p; } + inline ENTRY( ScPatternAttr* p ) { pPattAttr = p; } - inline ~ENTRY() { delete pPattAttr; } + inline ~ENTRY() { delete pPattAttr; } - inline BOOL operator ==( const ENTRY& r ) const { return nHash0 == r.nHash0; } + inline BOOL operator ==( const ENTRY& r ) const { return nHash0 == r.nHash0; } - inline BOOL operator ==( const UINT32& r ) const { return nHash0 == r; } + inline BOOL operator ==( const UINT32& r ) const { return nHash0 == r; } }; - ScDocumentPool* pDocPool; - SvxColorItem* ppColorItems[ 6 ]; // 0 und 7 fehlen! - SvxColorItem* pBlack; - SvxColorItem* pWhite; - Color* pColTab; + ScDocumentPool* pDocPool; + SvxColorItem* ppColorItems[ 6 ]; // 0 und 7 fehlen! + SvxColorItem* pBlack; + SvxColorItem* pWhite; + Color* pColTab; - inline static void MakeHash( const LotAttrWK3& rAttr, UINT32& rOut ) + inline static void MakeHash( const LotAttrWK3& rAttr, UINT32& rOut ) { ( ( UINT8* ) &rOut )[ 0 ] = rAttr.nFont & 0x7F; ( ( UINT8* ) &rOut )[ 1 ] = rAttr.nLineStyle; ( ( UINT8* ) &rOut )[ 2 ] = rAttr.nFontCol; ( ( UINT8* ) &rOut )[ 3 ] = rAttr.nBack; } - static void LotusToScBorderLine( UINT8 nLine, SvxBorderLine& ); - const SvxColorItem& GetColorItem( const UINT8 nLotIndex ) const; - const Color& GetColor( const UINT8 nLotIndex ) const; + static void LotusToScBorderLine( UINT8 nLine, SvxBorderLine& ); + const SvxColorItem& GetColorItem( const UINT8 nLotIndex ) const; + const Color& GetColor( const UINT8 nLotIndex ) const; public: LotAttrCache( void ); ~LotAttrCache(); - const ScPatternAttr& GetPattAttr( const LotAttrWK3& ); + const ScPatternAttr& GetPattAttr( const LotAttrWK3& ); }; @@ -120,30 +120,30 @@ class LotAttrCol : private List private: struct ENTRY { - const ScPatternAttr* pPattAttr; - SCROW nFirstRow; - SCROW nLastRow; + const ScPatternAttr* pPattAttr; + SCROW nFirstRow; + SCROW nLastRow; }; public: ~LotAttrCol( void ); - void SetAttr( const SCROW nRow, const ScPatternAttr& ); - void Apply( const SCCOL nCol, const SCTAB nTab, const BOOL bClear = TRUE ); - void Clear( void ); + void SetAttr( const SCROW nRow, const ScPatternAttr& ); + void Apply( const SCCOL nCol, const SCTAB nTab, const BOOL bClear = TRUE ); + void Clear( void ); }; class LotAttrTable { private: - LotAttrCol pCols[ MAXCOLCOUNT ]; - LotAttrCache aAttrCache; + LotAttrCol pCols[ MAXCOLCOUNT ]; + LotAttrCache aAttrCache; public: LotAttrTable( void ); ~LotAttrTable(); - void SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow, const LotAttrWK3& ); - void Apply( const SCTAB nTabNum ); + void SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow, const LotAttrWK3& ); + void Apply( const SCTAB nTabNum ); }; diff --git a/sc/source/filter/inc/lotfntbf.hxx b/sc/source/filter/inc/lotfntbf.hxx index 0cbdda762bc4..26fdbaa297fb 100644 --- a/sc/source/filter/inc/lotfntbf.hxx +++ b/sc/source/filter/inc/lotfntbf.hxx @@ -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 @@ -45,12 +45,12 @@ class LotusFontBuffer private: struct ENTRY { - String* pTmpName; - SvxFontItem* pFont; - SvxFontHeightItem* pHeight; - SvxColorItem* pColor; - INT32 nType; // < 0 -> undefiniert - inline ENTRY( void ) + String* pTmpName; + SvxFontItem* pFont; + SvxFontHeightItem* pHeight; + SvxColorItem* pColor; + INT32 nType; // < 0 -> undefiniert + inline ENTRY( void ) { pTmpName = NULL; pFont = NULL; @@ -58,7 +58,7 @@ private: pColor = NULL; nType = -1; } - inline ~ENTRY() + inline ~ENTRY() { if( pTmpName ) delete pTmpName; @@ -69,42 +69,42 @@ private: if( pColor ) delete pColor; } - inline void TmpName( const String &rNew ) + inline void TmpName( const String &rNew ) { if( pTmpName ) *pTmpName = rNew; else pTmpName = new String( rNew ); } - inline void Font( SvxFontItem& rNew ) + inline void Font( SvxFontItem& rNew ) { if( pFont ) delete pFont; pFont = &rNew; } - inline void Height( SvxFontHeightItem& rNew ) + inline void Height( SvxFontHeightItem& rNew ) { if( pHeight ) delete pHeight; pHeight = &rNew; } - inline void Color( SvxColorItem& rNew ) + inline void Color( SvxColorItem& rNew ) { if( pColor ) delete pColor; pColor = &rNew; } - inline void Type( const UINT16 nNew ) { nType = nNew; } + inline void Type( const UINT16 nNew ) { nType = nNew; } }; - ENTRY pData[ 8 ]; - const static UINT16 nSize; - void MakeFont( ENTRY* pEntry ); + ENTRY pData[ 8 ]; + const static UINT16 nSize; + void MakeFont( ENTRY* pEntry ); public: - void Fill( const UINT8 nIndex, SfxItemSet& rItemSet ); - void SetName( const UINT16 nIndex, const String& rName ); - void SetHeight( const UINT16 nIndex, const UINT16 nHeight ); - void SetType( const UINT16 nIndex, const UINT16 nType ); + void Fill( const UINT8 nIndex, SfxItemSet& rItemSet ); + void SetName( const UINT16 nIndex, const String& rName ); + void SetHeight( const UINT16 nIndex, const UINT16 nHeight ); + void SetType( const UINT16 nIndex, const UINT16 nType ); }; diff --git a/sc/source/filter/inc/lotform.hxx b/sc/source/filter/inc/lotform.hxx index b9fac939192e..4a9e2735700e 100644 --- a/sc/source/filter/inc/lotform.hxx +++ b/sc/source/filter/inc/lotform.hxx @@ -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 @@ -37,34 +37,34 @@ enum FUNC_TYPE { - FT_Return = 0, // End Formula - FT_FuncFix0, // Funktion, 0 Parameter - FT_FuncFix1, // Funktion, 0 Parameter - FT_FuncFix2, // Funktion, 0 Parameter - FT_FuncFix3, // Funktion, 0 Parameter - FT_FuncFix4, // Funktion, 0 Parameter - FT_FuncVar, // ~, var. P. - FT_Neg, // Negierung - FT_Op, // Operator - FT_NotImpl, // nicht implementiert - FT_ConstFloat, // Double (8-Byte) - FT_Variable, // Single Ref - FT_Range, // Double Ref - FT_Braces, // Klammmern - FT_ConstInt, // Integer - FT_ConstString, // String - FT_NOP, // nichts + FT_Return = 0, // End Formula + FT_FuncFix0, // Funktion, 0 Parameter + FT_FuncFix1, // Funktion, 0 Parameter + FT_FuncFix2, // Funktion, 0 Parameter + FT_FuncFix3, // Funktion, 0 Parameter + FT_FuncFix4, // Funktion, 0 Parameter + FT_FuncVar, // ~, var. P. + FT_Neg, // Negierung + FT_Op, // Operator + FT_NotImpl, // nicht implementiert + FT_ConstFloat, // Double (8-Byte) + FT_Variable, // Single Ref + FT_Range, // Double Ref + FT_Braces, // Klammmern + FT_ConstInt, // Integer + FT_ConstString, // String + FT_NOP, // nichts // zusaetzlich ab WK3 - FT_Cref, // Cell Reference - FT_Rref, // Range Reference - FT_Nrref, // Named range reference - FT_Absnref, // Absolut named range - FT_Erref, // Err range reference - FT_Ecref, // Err cell reference - FT_Econstant, // Err constant - FT_Splfunc, // SPLfunction + FT_Cref, // Cell Reference + FT_Rref, // Range Reference + FT_Nrref, // Named range reference + FT_Absnref, // Absolut named range + FT_Erref, // Err range reference + FT_Ecref, // Err cell reference + FT_Econstant, // Err constant + FT_Splfunc, // SPLfunction FT_Const10Float,// Float (10-Byte) - FT_Snum // Const Short Num + FT_Snum // Const Short Num // fuer 'Problemfaelle' beim Import }; @@ -74,38 +74,38 @@ enum FUNC_TYPE class LotusToSc : public LotusConverterBase { private: - CharSet eSrcChar; - TokenId nAddToken; // ')+1.0' - TokenId nSubToken; // ~ - TokenId n0Token; // '0.0'; + CharSet eSrcChar; + TokenId nAddToken; // ')+1.0' + TokenId nSubToken; // ~ + TokenId n0Token; // '0.0'; // --------------------------------------------------------------- - static FUNC_TYPE IndexToType( BYTE ); - static DefTokenId IndexToToken( BYTE ); - static FUNC_TYPE IndexToTypeWK123( BYTE ); - static DefTokenId IndexToTokenWK123( BYTE ); - void DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName ); - void LotusRelToScRel( UINT16 nCol, UINT16 nRow, + static FUNC_TYPE IndexToType( BYTE ); + static DefTokenId IndexToToken( BYTE ); + static FUNC_TYPE IndexToTypeWK123( BYTE ); + static DefTokenId IndexToTokenWK123( BYTE ); + void DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtName ); + void LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD ); - BOOL bWK3; // alternative Codeumsetzung statt fuer < WK1 + BOOL bWK3; // alternative Codeumsetzung statt fuer < WK1 BOOL bWK123; // alternative for 123 // ------------------------------------------------------------------- - void ReadSRD( ScSingleRefData& rSRD, BYTE nFlags ); - inline void ReadCRD( ScComplexRefData& rCRD, BYTE nFlags ); - void IncToken( TokenId &rParam ); + void ReadSRD( ScSingleRefData& rSRD, BYTE nFlags ); + inline void ReadCRD( ScComplexRefData& rCRD, BYTE nFlags ); + void IncToken( TokenId &rParam ); // ACHTUNG: hier wird die aktuelle Token-Kette im Pool // mit '(<rParam>)+1' fortgeschrieben und mit // Store() abgeschlossen! - void DecToken( TokenId& rParam ); + void DecToken( TokenId& rParam ); // ACHTUNG: ~ - void NegToken( TokenId& rParam ); + void NegToken( TokenId& rParam ); // ACHTUNG: wie ~, nur wird '-(<rParam>)' gebildet public: LotusToSc( SvStream& aStr, CharSet eSrc, BOOL b ); - virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, + virtual ConvErr Convert( const ScTokenArray*& rpErg, INT32& nRest, const FORMULA_TYPE eFT = FT_CellFormula ); void Reset( const ScAddress& rEingPos ); - inline void SetWK3( void ); + inline void SetWK3( void ); private: using LotusConverterBase::Reset; diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 09efab80320a..99b0b9dcccc1 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -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 @@ -45,56 +45,56 @@ class SvxBorderLine; class ImportLotus : public ImportTyp { private: - SvStream* pIn; // benoetigt wegen multiplem Read()! - LotusFontBuffer* pFontBuff; - LotusToSc aConv; + SvStream* pIn; // benoetigt wegen multiplem Read()! + LotusFontBuffer* pFontBuff; + LotusToSc aConv; UINT16 nTab; // z.Zt. bearbeitete Tabelle - INT32 nExtTab; + INT32 nExtTab; // ------------------------------------------------------------------- // in WK?-Datei - void Bof( void ); // 0x0000 00 - BOOL BofFm3( void ); // 0x0000 00 - void Columnwidth( UINT16 nRecLen ); // 0x0007 07 - void Hiddencolumn( UINT16 nRecLen ); // 0x0008 08 - void Userrange( void ); // 0x0009 09 - void Errcell( void ); // 0x0014 20 - void Nacell( void ); // 0x0015 21 - void Labelcell( void ); // 0x0016 22 - void Numbercell( void ); // 0x0017 23 - void Smallnumcell( void ); // 0x0018 24 - ScFormulaCell* Formulacell( UINT16 nRecLen ); // 0x0019 25 - void Formulastring( ScFormulaCell& ); // 0x001a 26 - // 0x001b 27 special - void NamedSheet( void ); // 14000 - void RowPresentation( UINT16 nRecLen ); // 2007 + void Bof( void ); // 0x0000 00 + BOOL BofFm3( void ); // 0x0000 00 + void Columnwidth( UINT16 nRecLen ); // 0x0007 07 + void Hiddencolumn( UINT16 nRecLen ); // 0x0008 08 + void Userrange( void ); // 0x0009 09 + void Errcell( void ); // 0x0014 20 + void Nacell( void ); // 0x0015 21 + void Labelcell( void ); // 0x0016 22 + void Numbercell( void ); // 0x0017 23 + void Smallnumcell( void ); // 0x0018 24 + ScFormulaCell* Formulacell( UINT16 nRecLen ); // 0x0019 25 + void Formulastring( ScFormulaCell& ); // 0x001a 26 + // 0x001b 27 special + void NamedSheet( void ); // 14000 + void RowPresentation( UINT16 nRecLen ); // 2007 // ------------------------------------------------------------------- // in FM?-Datei - void Font_Face( void ); // 174 - void Font_Type( void ); // 176 - void Font_Ysize( void ); // 177 - void _Row( const UINT16 nRecLen ); // 197 ? + void Font_Face( void ); // 174 + void Font_Type( void ); // 176 + void Font_Ysize( void ); // 177 + void _Row( const UINT16 nRecLen ); // 197 ? // ------------------------------------------------------------------- - inline void Read( ScAddress& ); - inline void Read( ScRange& ); + inline void Read( ScAddress& ); + inline void Read( ScRange& ); // fuer Addresses/Ranges im Format Row(16)/Tab(8)/Col(8) - inline void Read( sal_Char& ); - inline void Read( BYTE& ); - inline void Read( UINT16& ); - inline void Read( INT16& ); - inline void Read( UINT32& ); - inline void Read( double& ); // 10-Byte-IEEE lesen - inline void Read( LotAttrWK3& ); - void Read( String& ); // 0-terminierten String einlesen - inline void Skip( const UINT16 nNumBytes ); + inline void Read( sal_Char& ); + inline void Read( BYTE& ); + inline void Read( UINT16& ); + inline void Read( INT16& ); + inline void Read( UINT32& ); + inline void Read( double& ); // 10-Byte-IEEE lesen + inline void Read( LotAttrWK3& ); + void Read( String& ); // 0-terminierten String einlesen + inline void Skip( const UINT16 nNumBytes ); // ------------------------------------------------------------------- public: ImportLotus( SvStream&, ScDocument*, CharSet eSrc ); - virtual ~ImportLotus(); + virtual ~ImportLotus(); - FltError Read(); - FltError Read( SvStream& ); // special for *.fm3-Dateien + FltError Read(); + FltError Read( SvStream& ); // special for *.fm3-Dateien }; diff --git a/sc/source/filter/inc/lotrange.hxx b/sc/source/filter/inc/lotrange.hxx index 2f520deff2c9..d97b4cfec2b6 100644 --- a/sc/source/filter/inc/lotrange.hxx +++ b/sc/source/filter/inc/lotrange.hxx @@ -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 @@ -36,30 +36,30 @@ class LotusRangeList; -typedef UINT16 LR_ID; -#define ID_FAIL 0xFFFF +typedef UINT16 LR_ID; +#define ID_FAIL 0xFFFF class LotusRange { friend class LotusRangeList; private: - UINT32 nHash; - SCCOL nColStart; - SCROW nRowStart; - SCCOL nColEnd; - SCROW nRowEnd; - LR_ID nId; - void MakeHash( void ); - inline void Copy( const LotusRange& ); - inline void SetId( LR_ID nId ); + UINT32 nHash; + SCCOL nColStart; + SCROW nRowStart; + SCCOL nColEnd; + SCROW nRowEnd; + LR_ID nId; + void MakeHash( void ); + inline void Copy( const LotusRange& ); + inline void SetId( LR_ID nId ); public: LotusRange( SCCOL nCol, SCROW nRow ); LotusRange( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE ); LotusRange( const LotusRange& ); - inline LotusRange &operator =( const LotusRange& ); - inline BOOL operator ==( const LotusRange& ) const; - inline BOOL operator !=( const LotusRange& ) const; - inline BOOL IsSingle( void ) const; + inline LotusRange &operator =( const LotusRange& ); + inline BOOL operator ==( const LotusRange& ) const; + inline BOOL operator !=( const LotusRange& ) const; + inline BOOL IsSingle( void ) const; }; @@ -113,20 +113,20 @@ inline BOOL LotusRange::IsSingle( void ) const class LotusRangeList : private List { private: - LR_ID nIdCnt; - ScComplexRefData aComplRef; - static SCCOL nEingCol; - static SCROW nEingRow; + LR_ID nIdCnt; + ScComplexRefData aComplRef; + static SCCOL nEingCol; + static SCROW nEingRow; public: LotusRangeList( void ); ~LotusRangeList( void ); - inline UINT16 GetIndex( SCCOL nCol, SCROW nRow ); - inline UINT16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE ); - UINT16 GetIndex( const LotusRange& ); - inline void Append( SCCOL nCol, SCROW nRow, const String& ); - inline void Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE, const String& ); - void Append( LotusRange* pLR, const String& rName ); - inline static void SetEing( const SCCOL nCol, const SCROW nRow ); + inline UINT16 GetIndex( SCCOL nCol, SCROW nRow ); + inline UINT16 GetIndex( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE ); + UINT16 GetIndex( const LotusRange& ); + inline void Append( SCCOL nCol, SCROW nRow, const String& ); + inline void Append( SCCOL nColS, SCROW nRowS, SCCOL nColE, SCROW nRowE, const String& ); + void Append( LotusRange* pLR, const String& rName ); + inline static void SetEing( const SCCOL nCol, const SCROW nRow ); }; diff --git a/sc/source/filter/inc/namebuff.hxx b/sc/source/filter/inc/namebuff.hxx index d0eac381722c..ecac34b2157f 100644 --- a/sc/source/filter/inc/namebuff.hxx +++ b/sc/source/filter/inc/namebuff.hxx @@ -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 @@ -50,17 +50,17 @@ class StringHashEntry { private: friend class NameBuffer; - String aString; - UINT32 nHash; + String aString; + UINT32 nHash; - static UINT32 MakeHashCode( const String& ); + static UINT32 MakeHashCode( const String& ); public: - inline StringHashEntry( const String& ); - inline StringHashEntry( void ); - inline void operator =( const sal_Char* ); - inline void operator =( const String& ); - inline void operator =( const StringHashEntry& ); - inline BOOL operator ==( const StringHashEntry& ) const; + inline StringHashEntry( const String& ); + inline StringHashEntry( void ); + inline void operator =( const sal_Char* ); + inline void operator =( const String& ); + inline void operator =( const StringHashEntry& ); + inline BOOL operator ==( const StringHashEntry& ) const; }; @@ -106,17 +106,17 @@ inline BOOL StringHashEntry::operator ==( const StringHashEntry& r ) const class NameBuffer : private List, public ExcRoot { private: - UINT16 nBase; // Index-Basis + UINT16 nBase; // Index-Basis public: // inline NameBuffer( void ); //#94039# prevent empty rootdata - inline NameBuffer( RootData* ); - inline NameBuffer( RootData*, UINT16 nNewBase ); - - virtual ~NameBuffer(); - inline const String* Get( UINT16 nIndex ); - inline UINT16 GetLastIndex( void ); - inline void SetBase( UINT16 nNewBase = 0 ); - void operator <<( const String& rNewString ); + inline NameBuffer( RootData* ); + inline NameBuffer( RootData*, UINT16 nNewBase ); + + virtual ~NameBuffer(); + inline const String* Get( UINT16 nIndex ); + inline UINT16 GetLastIndex( void ); + inline void SetBase( UINT16 nNewBase = 0 ); + void operator <<( const String& rNewString ); }; //#94039# prevent empty rootdata @@ -177,20 +177,20 @@ class ShrfmlaBuffer : public ExcRoot size_t operator() (const ScAddress &addr) const; }; typedef std::hash_map <ScAddress, USHORT, ScAddressHashFunc> ShrfmlaHash; - typedef std::list <ScRange> ShrfmlaList; + typedef std::list <ScRange> ShrfmlaList; - ShrfmlaHash index_hash; - ShrfmlaList index_list; + ShrfmlaHash index_hash; + ShrfmlaList index_list; size_t mnCurrIdx; public: ShrfmlaBuffer( RootData* pRD ); - virtual ~ShrfmlaBuffer(); + virtual ~ShrfmlaBuffer(); void Clear(); - void Store( const ScRange& rRange, const ScTokenArray& ); + void Store( const ScRange& rRange, const ScTokenArray& ); USHORT Find (const ScAddress & rAddress ) const; - static String CreateName( const ScRange& ); + static String CreateName( const ScRange& ); }; @@ -201,12 +201,12 @@ class RangeNameBufferWK3 : private List private: struct ENTRY { - StringHashEntry aStrHashEntry; - ScComplexRefData aScComplexRefDataRel; - String aScAbsName; - UINT16 nAbsInd; // == 0 -> noch keine Abs-Name! - UINT16 nRelInd; - BOOL bSingleRef; + StringHashEntry aStrHashEntry; + ScComplexRefData aScComplexRefDataRel; + String aScAbsName; + UINT16 nAbsInd; // == 0 -> noch keine Abs-Name! + UINT16 nRelInd; + BOOL bSingleRef; ENTRY( const String& rName, const String& rScName, const ScComplexRefData& rCRD ) : aStrHashEntry( rName ), aScComplexRefDataRel( rCRD ), @@ -217,23 +217,23 @@ private: } }; - ScTokenArray* pScTokenArray; - UINT16 nIntCount; + ScTokenArray* pScTokenArray; + UINT16 nIntCount; public: RangeNameBufferWK3( void ); - virtual ~RangeNameBufferWK3(); - void Add( const String& rName, const ScComplexRefData& rCRD ); - inline void Add( const String& rName, const ScRange& aScRange ); - BOOL FindRel( const String& rRef, UINT16& rIndex ); - BOOL FindAbs( const String& rRef, UINT16& rIndex ); + virtual ~RangeNameBufferWK3(); + void Add( const String& rName, const ScComplexRefData& rCRD ); + inline void Add( const String& rName, const ScRange& aScRange ); + BOOL FindRel( const String& rRef, UINT16& rIndex ); + BOOL FindAbs( const String& rRef, UINT16& rIndex ); }; inline void RangeNameBufferWK3::Add( const String& rName, const ScRange& aScRange ) { - ScComplexRefData aCRD; - ScSingleRefData* pSRD; - const ScAddress* pScAddr; + ScComplexRefData aCRD; + ScSingleRefData* pSRD; + const ScAddress* pScAddr; pSRD = &aCRD.Ref1; pScAddr = &aScRange.aStart; @@ -270,18 +270,18 @@ class ExtSheetBuffer : private List, public ExcRoot private: struct Cont { - String aFile; - String aTab; - UINT16 nTabNum; // 0xFFFF -> noch nicht angelegt + String aFile; + String aTab; + UINT16 nTabNum; // 0xFFFF -> noch nicht angelegt // 0xFFFE -> versucht anzulegen, ging aber schief // 0xFFFD -> soll im selben Workbook sein, findet's aber nicht - BOOL bSWB; - BOOL bLink; + BOOL bSWB; + BOOL bLink; Cont( const String& rFilePathAndName, const String& rTabName ) : aFile( rFilePathAndName ), aTab( rTabName ) { - nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt + nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt bSWB = bLink = FALSE; } Cont( const String& rFilePathAndName, const String& rTabName, @@ -289,23 +289,23 @@ private: aFile( rFilePathAndName ), aTab( rTabName ) { - nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt + nTabNum = 0xFFFF; // -> Tabelle noch nicht erzeugt bSWB = bSameWB; bLink = FALSE; } }; public: - inline ExtSheetBuffer( RootData* ); - virtual ~ExtSheetBuffer(); + inline ExtSheetBuffer( RootData* ); + virtual ~ExtSheetBuffer(); sal_Int16 Add( const String& rFilePathAndName, const String& rTabName, const BOOL bSameWorkbook = FALSE ); - BOOL GetScTabIndex( UINT16 nExcSheetIndex, UINT16& rIn_LastTab_Out_ScIndex ); - BOOL IsLink( const UINT16 nExcSheetIndex ) const; - BOOL GetLink( const UINT16 nExcSheetIndex, String &rAppl, String &rDoc ) const; + BOOL GetScTabIndex( UINT16 nExcSheetIndex, UINT16& rIn_LastTab_Out_ScIndex ); + BOOL IsLink( const UINT16 nExcSheetIndex ) const; + BOOL GetLink( const UINT16 nExcSheetIndex, String &rAppl, String &rDoc ) const; - void Reset( void ); + void Reset( void ); }; @@ -318,13 +318,13 @@ inline ExtSheetBuffer::ExtSheetBuffer( RootData* p ) : ExcRoot( p ) struct ExtName { - String aName; - UINT32 nStorageId; - UINT16 nFlags; + String aName; + UINT32 nStorageId; + UINT16 nFlags; inline ExtName( const String& r, sal_uInt16 n ) : aName( r ), nStorageId( 0 ), nFlags( n ) {} - BOOL IsDDE( void ) const; + BOOL IsDDE( void ) const; BOOL IsOLE( void ) const; }; diff --git a/sc/source/filter/inc/op.h b/sc/source/filter/inc/op.h index d44053de2a44..14f89a328791 100644 --- a/sc/source/filter/inc/op.h +++ b/sc/source/filter/inc/op.h @@ -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 @@ -40,10 +40,10 @@ void OP_EOF( SvStream &aStream, USHORT nLaenge ); void OP_Integer( SvStream &aStream, USHORT nLaenge ); void OP_Number( SvStream &aStream, USHORT nLaenge ); void OP_Label( SvStream &aStream, USHORT nLaenge ); -void OP_Integer3( SvStream &aStream, USHORT nLaenge ); // WK3 -void OP_Number3( SvStream &aStream, USHORT nLaenge ); // WK3 +void OP_Integer3( SvStream &aStream, USHORT nLaenge ); // WK3 +void OP_Number3( SvStream &aStream, USHORT nLaenge ); // WK3 void OP_Formula( SvStream &aStream, USHORT nLaenge ); -void OP_Formula3( SvStream &aStream, USHORT nLaenge ); // WK3 +void OP_Formula3( SvStream &aStream, USHORT nLaenge ); // WK3 void OP_ColumnWidth( SvStream &aStream, USHORT nLaenge ); void OP_NamedRange( SvStream &aStream, USHORT nLaenge ); void OP_SymphNamedRange( SvStream &aStream, USHORT nLaenge ); diff --git a/sc/source/filter/inc/optab.h b/sc/source/filter/inc/optab.h index f4fb22af08c1..1587f89571bf 100644 --- a/sc/source/filter/inc/optab.h +++ b/sc/source/filter/inc/optab.h @@ -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 @@ -31,15 +31,15 @@ typedef void ( *OPCODE_FKT )( SvStream &aStream, USHORT nLaenge ); -#define FKT_LIMIT 101 +#define FKT_LIMIT 101 -#define FKT_LIMIT123 101 +#define FKT_LIMIT123 101 -#define LOTUS_EOF 0x01 +#define LOTUS_EOF 0x01 #define LOTUS_FILEPASSWD 0x4b -#define LOTUS_PATTERN 0x284 +#define LOTUS_PATTERN 0x284 #define LOTUS_FORMAT_INDEX 0x800 diff --git a/sc/source/filter/inc/otlnbuff.hxx b/sc/source/filter/inc/otlnbuff.hxx index 9ed84056f182..236e01318583 100644 --- a/sc/source/filter/inc/otlnbuff.hxx +++ b/sc/source/filter/inc/otlnbuff.hxx @@ -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/inc/qpro.hxx b/sc/source/filter/inc/qpro.hxx index 460e0a83ba8c..a94c995e9321 100644 --- a/sc/source/filter/inc/qpro.hxx +++ b/sc/source/filter/inc/qpro.hxx @@ -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/inc/qproform.hxx b/sc/source/filter/inc/qproform.hxx index 6e06827ad958..f1c777ce8730 100644 --- a/sc/source/filter/inc/qproform.hxx +++ b/sc/source/filter/inc/qproform.hxx @@ -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 @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - + #ifndef SC_QPROFORM_HXX #define SC_QPROFORM_HXX @@ -40,35 +40,35 @@ typedef OpCode DefTokenId; enum FUNC_TYPE { - FT_Return, + FT_Return, FT_FuncFix0, - FT_FuncFix1, - FT_FuncFix2, - FT_FuncFix3, - FT_FuncFix4, + FT_FuncFix1, + FT_FuncFix2, + FT_FuncFix3, + FT_FuncFix4, FT_FuncFix5, FT_FuncFix6, - FT_FuncVar, + FT_FuncVar, FT_DLL, - FT_Neg, - FT_Op, - FT_NotImpl, - FT_ConstFloat, - FT_Range, + FT_Neg, + FT_Op, + FT_NotImpl, + FT_ConstFloat, + FT_Range, FT_Braces, - FT_ConstInt, + FT_ConstInt, FT_ConstString, - FT_NOP, - FT_Cref + FT_NOP, + FT_Cref }; - + class QProToSc : public ConverterBase { private: - TokenId mnAddToken; - TokenId mnSubToken; - TokenId mn0Token; - SvStream& maIn; + TokenId mnAddToken; + TokenId mnSubToken; + TokenId mn0Token; + SvStream& maIn; public: static const size_t nBufSize = 256; @@ -77,7 +77,7 @@ class QProToSc : public ConverterBase ConvErr Convert( const ScTokenArray*& pArray, sal_uInt16 nLen, const FORMULA_TYPE eFT = FT_CellFormula ); void DoFunc( DefTokenId eOc, sal_uInt16 nArgs, const sal_Char* pExtString ); - void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); + void ReadSRD( ScSingleRefData& rR, sal_Int8 nPage, sal_Int8 nCol, sal_uInt16 rRel ); void IncToken( TokenId &aParam ); DefTokenId IndexToToken( sal_uInt16 nToken ); FUNC_TYPE IndexToType( sal_uInt8 nToken ); diff --git a/sc/source/filter/inc/qprostyle.hxx b/sc/source/filter/inc/qprostyle.hxx index f52ce655d4bf..1fc3f196885b 100644 --- a/sc/source/filter/inc/qprostyle.hxx +++ b/sc/source/filter/inc/qprostyle.hxx @@ -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/inc/root.hxx b/sc/source/filter/inc/root.hxx index 4c9800216a0f..6ecb77bc35a5 100644 --- a/sc/source/filter/inc/root.hxx +++ b/sc/source/filter/inc/root.hxx @@ -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 @@ -58,12 +58,12 @@ class XclExpRoot; // ---------------------------------------------------------- Excel Imp~/Exp~ - -struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! +struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! { - BiffTyp eDateiTyp; // feine Differenzierung - ExtSheetBuffer* pExtSheetBuff; - ShrfmlaBuffer* pShrfmlaBuff; - ExtNameBuff* pExtNameBuff; + BiffTyp eDateiTyp; // feine Differenzierung + ExtSheetBuffer* pExtSheetBuff; + ShrfmlaBuffer* pShrfmlaBuff; + ExtNameBuff* pExtNameBuff; ExcelToSc* pFmlaConverter; XclImpColRowSettings* pColRowBuff; // Col/Row-Einstellungen 1 Tabelle @@ -79,14 +79,14 @@ struct RootData // -> Inkarnation jeweils im ImportExcel-Objekt! XclImpRoot* pIR; XclExpRoot* pER; - RootData( void ); // -> exctools.cxx - ~RootData(); // -> exctools.cxx + RootData( void ); // -> exctools.cxx + ~RootData(); // -> exctools.cxx }; class ExcRoot { protected: - RootData* pExcRoot; + RootData* pExcRoot; inline ExcRoot( RootData* pNexExcRoot ) : pExcRoot( pNexExcRoot ) {} inline ExcRoot( const ExcRoot& rCopy ) : pExcRoot( rCopy.pExcRoot ) {} }; @@ -100,19 +100,19 @@ class LotAttrTable; struct LOTUS_ROOT { - ScDocument* pDoc; - LotusRangeList* pRangeNames; - ScRangeName* pScRangeName; - CharSet eCharsetQ; - Lotus123Typ eFirstType; - Lotus123Typ eActType; - ScRange aActRange; - RangeNameBufferWK3* pRngNmBffWK3; - LotusFontBuffer* pFontBuff; - LotAttrTable* pAttrTable; + ScDocument* pDoc; + LotusRangeList* pRangeNames; + ScRangeName* pScRangeName; + CharSet eCharsetQ; + Lotus123Typ eFirstType; + Lotus123Typ eActType; + ScRange aActRange; + RangeNameBufferWK3* pRngNmBffWK3; + LotusFontBuffer* pFontBuff; + LotAttrTable* pAttrTable; }; -extern LOTUS_ROOT* pLotusRoot; // -> Inkarn. in filter.cxx +extern LOTUS_ROOT* pLotusRoot; // -> Inkarn. in filter.cxx // ---------------------------------------------------------------------------- diff --git a/sc/source/filter/inc/rtfexp.hxx b/sc/source/filter/inc/rtfexp.hxx index c37e647f5ec5..af52a4d8b1fe 100644 --- a/sc/source/filter/inc/rtfexp.hxx +++ b/sc/source/filter/inc/rtfexp.hxx @@ -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 @@ -34,21 +34,21 @@ class ScRTFExport : public ScExportBase { - ULONG* pCellX; // kumulierte Zellbreiten einer Tabelle + ULONG* pCellX; // kumulierte Zellbreiten einer Tabelle - void WriteTab( SCTAB nTab ); - void WriteRow( SCTAB nTab, SCROW nRow ); - void WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ); + void WriteTab( SCTAB nTab ); + void WriteRow( SCTAB nTab, SCROW nRow ); + void WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ); public: ScRTFExport( SvStream&, ScDocument*, const ScRange& ); - virtual ~ScRTFExport(); + virtual ~ScRTFExport(); - ULONG Write(); + ULONG Write(); }; -#endif // SC_RTFEXP_HXX +#endif // SC_RTFEXP_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/inc/rtfimp.hxx b/sc/source/filter/inc/rtfimp.hxx index 8278c497f6af..f3306a22120d 100644 --- a/sc/source/filter/inc/rtfimp.hxx +++ b/sc/source/filter/inc/rtfimp.hxx @@ -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/inc/rtfparse.hxx b/sc/source/filter/inc/rtfparse.hxx index e2011e8206de..d4580c6768f6 100644 --- a/sc/source/filter/inc/rtfparse.hxx +++ b/sc/source/filter/inc/rtfparse.hxx @@ -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 @@ -35,10 +35,10 @@ struct ScRTFCellDefault { - SfxItemSet aItemSet; - SCCOL nCol; - USHORT nTwips; // rechter Rand der Zelle - SCCOL nColOverlap; // MergeCell wenn >1, merged cells wenn 0 + SfxItemSet aItemSet; + SCCOL nCol; + USHORT nTwips; // rechter Rand der Zelle + SCCOL nColOverlap; // MergeCell wenn >1, merged cells wenn 0 ScRTFCellDefault( SfxItemPool* pPool ) : aItemSet( *pPool ), nColOverlap(1) {} @@ -49,13 +49,13 @@ DECLARE_LIST( ScRTFDefaultList, ScRTFCellDefault* ) // deswegen ULONG, typedef bringt's auch nicht :-( SV_DECL_VARARR_SORT( ScRTFColTwips, ULONG, 16, 4) -#else // SC_RTFPARSE_CXX +#else // SC_RTFPARSE_CXX struct ScRTFCellDefault; class ScRTFDefaultList; class ScRTFColTwips; -#endif // SC_RTFPARSE_CXX +#endif // SC_RTFPARSE_CXX class EditEngine; @@ -63,26 +63,26 @@ class EditEngine; class ScRTFParser : public ScEEParser { private: - ScRTFDefaultList* pDefaultList; - ScRTFColTwips* pColTwips; - ScRTFCellDefault* pInsDefault; - ScRTFCellDefault* pActDefault; - ScRTFCellDefault* pDefMerge; - ULONG nStartAdjust; - USHORT nLastWidth; - BOOL bNewDef; + ScRTFDefaultList* pDefaultList; + ScRTFColTwips* pColTwips; + ScRTFCellDefault* pInsDefault; + ScRTFCellDefault* pActDefault; + ScRTFCellDefault* pDefMerge; + ULONG nStartAdjust; + USHORT nLastWidth; + BOOL bNewDef; DECL_LINK( RTFImportHdl, ImportInfo* ); - inline void NextRow(); - void EntryEnd( ScEEParseEntry*, const ESelection& ); - void ProcToken( ImportInfo* ); - void ColAdjust(); - BOOL SeekTwips( USHORT nTwips, SCCOL* pCol ); - void NewCellRow( ImportInfo* ); + inline void NextRow(); + void EntryEnd( ScEEParseEntry*, const ESelection& ); + void ProcToken( ImportInfo* ); + void ColAdjust(); + BOOL SeekTwips( USHORT nTwips, SCCOL* pCol ); + void NewCellRow( ImportInfo* ); public: ScRTFParser( EditEngine* ); - virtual ~ScRTFParser(); + virtual ~ScRTFParser(); virtual ULONG Read( SvStream&, const String& rBaseURL ); }; diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index de8e342ac28d..08a26af192b9 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -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 @@ -34,192 +34,192 @@ #include <tools/solar.h> // FehlerNummern -#define errUnknownFormat 1 -#define errUnknownID 2 -#define errOutOfMemory 3 +#define errUnknownFormat 1 +#define errUnknownID 2 +#define errOutOfMemory 3 // Identifiers im FileFormat -#define ColWidthID 1 -#define ColAttrID 2 -#define RowHeightID 3 -#define RowAttrID 4 -#define FontID 5 -#define NameID 6 -#define TableID 7 -#define ObjectID 8 -#define PatternID 9 -#define DataBaseID 10 +#define ColWidthID 1 +#define ColAttrID 2 +#define RowHeightID 3 +#define RowAttrID 4 +#define FontID 5 +#define NameID 6 +#define TableID 7 +#define ObjectID 8 +#define PatternID 9 +#define DataBaseID 10 // Zeilen/Spalten Flags -#define crfSoftBreak 1 -#define crfHardBreak 2 -#define crfHidden 4 +#define crfSoftBreak 1 +#define crfHardBreak 2 +#define crfHidden 4 // Zelltypen -#define ctValue 1 -#define ctString 2 -#define ctFormula 3 -#define ctNote 4 +#define ctValue 1 +#define ctString 2 +#define ctFormula 3 +#define ctNote 4 // FontStyles -#define ffDontCare 0x00 -#define ffRoman 0x10 -#define ffSwiss 0x20 -#define ffModern 0x30 -#define ffScript 0x40 -#define ffDecorative 0x50 +#define ffDontCare 0x00 +#define ffRoman 0x10 +#define ffSwiss 0x20 +#define ffModern 0x30 +#define ffScript 0x40 +#define ffDecorative 0x50 // FontWeight -#define fwNormal 400 +#define fwNormal 400 // FontAttribute -#define atNone 0 -#define atBold 1 -#define atItalic 2 -#define atUnderline 4 -#define atStrikeOut 8 +#define atNone 0 +#define atBold 1 +#define atItalic 2 +#define atUnderline 4 +#define atStrikeOut 8 // Horizontale Ausrichtung -#define hjNone 0 -#define hjLeft 1 -#define hjCenter 2 -#define hjRight 3 +#define hjNone 0 +#define hjLeft 1 +#define hjCenter 2 +#define hjRight 3 // Vertikale Ausrichtung -#define vjNone 0 -#define vjTop 1 -#define vjCenter 2 -#define vjBottom 3 +#define vjNone 0 +#define vjTop 1 +#define vjCenter 2 +#define vjBottom 3 // AusrichtungsFlags -#define ojWordBreak 0x01 -#define ojBottomTop 0x02 -#define ojTopBottom 0x04 +#define ojWordBreak 0x01 +#define ojBottomTop 0x02 +#define ojTopBottom 0x04 // ZellRaster -#define raNone 0 -#define raGray12 1 -#define raGray25 2 -#define raGray50 3 -#define raGray75 4 -#define raGray100 5 +#define raNone 0 +#define raGray12 1 +#define raGray25 2 +#define raGray50 3 +#define raGray75 4 +#define raGray100 5 // Zellschutz -#define paProtect 1 -#define paHideFormula 2 -#define paHideAll 4 -#define paHidePrint 8 +#define paProtect 1 +#define paHideFormula 2 +#define paHideAll 4 +#define paHidePrint 8 // ZahlenFormatFlags -#define vfStandard 0 -#define vfMoney 1 -#define vfThousend 2 -#define vfPercent 3 -#define vfExponent 4 -#define vfZerro 5 -#define vfDate 6 -#define vfTime 7 -#define vfBoolean 8 -#define vfStandardRed 9 -#define vfMoneyRed 10 -#define vfThousendRed 11 -#define vfPercentRed 12 -#define vfExponentRed 13 -#define vfFormula 14 -#define vfString 15 -#define vfNone 16 +#define vfStandard 0 +#define vfMoney 1 +#define vfThousend 2 +#define vfPercent 3 +#define vfExponent 4 +#define vfZerro 5 +#define vfDate 6 +#define vfTime 7 +#define vfBoolean 8 +#define vfStandardRed 9 +#define vfMoneyRed 10 +#define vfThousendRed 11 +#define vfPercentRed 12 +#define vfExponentRed 13 +#define vfFormula 14 +#define vfString 15 +#define vfNone 16 // DatumsFormatFlags -#define df_NDMY_Long 0 -#define df_DMY_Long 1 -#define df_MY_Long 2 -#define df_NDM_Long 3 -#define df_DM_Long 4 -#define df_M_Long 5 -#define df_NDMY_Short 6 -#define df_DMY_Short 7 -#define df_MY_Short 8 -#define df_NDM_Short 9 -#define df_DM_Short 10 -#define df_M_Short 11 -#define df_Q_Long 12 -#define df_Q_Short 13 +#define df_NDMY_Long 0 +#define df_DMY_Long 1 +#define df_MY_Long 2 +#define df_NDM_Long 3 +#define df_DM_Long 4 +#define df_M_Long 5 +#define df_NDMY_Short 6 +#define df_DMY_Short 7 +#define df_MY_Short 8 +#define df_NDM_Short 9 +#define df_DM_Short 10 +#define df_M_Short 11 +#define df_Q_Long 12 +#define df_Q_Short 13 // ZeitFormatFlags -#define tf_HMS_Long 0 -#define tf_HM_Long 1 -#define tf_HMS_Short 2 -#define tf_HM_Short 3 +#define tf_HMS_Long 0 +#define tf_HM_Long 1 +#define tf_HMS_Short 2 +#define tf_HM_Short 3 // Attribute fuer FormatVorlage -#define pfValue 0x01 -#define pfFont 0x02 -#define pfJustify 0x04 -#define pfFrame 0x08 -#define pfRaster 0x10 -#define pfProtection 0x20 +#define pfValue 0x01 +#define pfFont 0x02 +#define pfJustify 0x04 +#define pfFrame 0x08 +#define pfRaster 0x10 +#define pfProtection 0x20 // Displayflags fuer die Tabelle -#define dfFormula 0x0001 // Formeln -#define dfZerro 0x0002 // Nullwerte -#define dfGrid 0x0004 // Gitternetz -#define dfPageBreak 0x0008 // Seitenumbruch +#define dfFormula 0x0001 // Formeln +#define dfZerro 0x0002 // Nullwerte +#define dfGrid 0x0004 // Gitternetz +#define dfPageBreak 0x0008 // Seitenumbruch #define dfColRowBar 0x0010 // Zeilen/Spalten Koepfe (Dummy) -#define dfSyntax 0x0020 // Syntax Highlighting -#define dfPrintPage 0x0040 // Druckbildansicht (Dummy) -#define dfObjectAll 0x0080 // Objekte anzeigen -#define dfObjectFrame 0x0100 // Objekte als Platzhalter -#define dfObjectNone 0x0200 // Objekte nicht anzeigen -#define dfNoteMark 0x0400 // Notizanzeiger -#define dfProtectMark 0x0800 // Schutzanzeiger +#define dfSyntax 0x0020 // Syntax Highlighting +#define dfPrintPage 0x0040 // Druckbildansicht (Dummy) +#define dfObjectAll 0x0080 // Objekte anzeigen +#define dfObjectFrame 0x0100 // Objekte als Platzhalter +#define dfObjectNone 0x0200 // Objekte nicht anzeigen +#define dfNoteMark 0x0400 // Notizanzeiger +#define dfProtectMark 0x0800 // Schutzanzeiger // Objekt Typen -#define otNone 0 // s.u. -#define otOle 1 -#define otImage 2 -#define otChart 3 +#define otNone 0 // s.u. +#define otOle 1 +#define otImage 2 +#define otChart 3 // Grafik Typen -#define gtNone 0 // Kann nicht vorkommen -#define gtOle 1 // Ole 1.0 Objekt -#define gtImage 2 // Image (Bitmap oder Metafile) -#define gtChart 3 // Chart +#define gtNone 0 // Kann nicht vorkommen +#define gtOle 1 // Ole 1.0 Objekt +#define gtImage 2 // Image (Bitmap oder Metafile) +#define gtChart 3 // Chart // Datum/Uhrzeit struct Sc10DateTime { - USHORT Year; - USHORT Month; - USHORT Day; - USHORT Hour; - USHORT Min; - USHORT Sec; + USHORT Year; + USHORT Month; + USHORT Day; + USHORT Hour; + USHORT Min; + USHORT Sec; }; // ZahlenFormate struct Sc10ValueFormat { - BYTE Format; // Zahl, Waehrung, Prozent etc. - BYTE Info; // Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat + BYTE Format; // Zahl, Waehrung, Prozent etc. + BYTE Info; // Anzahl Nachkommastellen, Anzahl Stellen, bzw. Datums/Zeitformat }; // Fontbeschreibung struct Sc10LogFont { - INT16 lfHeight; - INT16 lfWidth; - INT16 lfEscapement; - INT16 lfOrientation; - INT16 lfWeight; - BYTE lfItalic; - BYTE lfUnderline; - BYTE lfStrikeOut; - BYTE lfCharSet; - BYTE lfOutPrecision; - BYTE lfClipPrecision; - BYTE lfQuality; - BYTE lfPitchAndFamily; - sal_Char lfFaceName[32]; + INT16 lfHeight; + INT16 lfWidth; + INT16 lfEscapement; + INT16 lfOrientation; + INT16 lfWeight; + BYTE lfItalic; + BYTE lfUnderline; + BYTE lfStrikeOut; + BYTE lfCharSet; + BYTE lfOutPrecision; + BYTE lfClipPrecision; + BYTE lfQuality; + BYTE lfPitchAndFamily; + sal_Char lfFaceName[32]; int operator==( const Sc10LogFont& rData ) const; }; @@ -227,69 +227,69 @@ struct Sc10LogFont // RGB-Frabwerte struct Sc10Color { - BYTE Dummy; - BYTE Blue; - BYTE Green; - BYTE Red; + BYTE Dummy; + BYTE Blue; + BYTE Green; + BYTE Red; int operator==( const Sc10Color& rColor ) const; }; // Blockbeschreibung struct Sc10BlockRect { - INT16 x1; - INT16 y1; - INT16 x2; - INT16 y2; + INT16 x1; + INT16 y1; + INT16 x2; + INT16 y2; }; // Datenbank-Bereich struct Sc10DataBaseRec { - sal_Char Name[32]; - INT16 Tab; - Sc10BlockRect Block; - BYTE RowHeader; - INT16 SortField0; - BYTE SortUpOrder0; - INT16 SortField1; - BYTE SortUpOrder1; - INT16 SortField2; - BYTE SortUpOrder2; - BYTE IncludeFormat; - INT16 QueryField0; - INT16 QueryOp0; - BYTE QueryByString0; - sal_Char QueryString0[64]; - double QueryValue0; - INT16 QueryConnect1; - INT16 QueryField1; - INT16 QueryOp1; - BYTE QueryByString1; - sal_Char QueryString1[64]; - double QueryValue1; - INT16 QueryConnect2; - INT16 QueryField2; - INT16 QueryOp2; - BYTE QueryByString2; - sal_Char QueryString2[64]; - double QueryValue2; + sal_Char Name[32]; + INT16 Tab; + Sc10BlockRect Block; + BYTE RowHeader; + INT16 SortField0; + BYTE SortUpOrder0; + INT16 SortField1; + BYTE SortUpOrder1; + INT16 SortField2; + BYTE SortUpOrder2; + BYTE IncludeFormat; + INT16 QueryField0; + INT16 QueryOp0; + BYTE QueryByString0; + sal_Char QueryString0[64]; + double QueryValue0; + INT16 QueryConnect1; + INT16 QueryField1; + INT16 QueryOp1; + BYTE QueryByString1; + sal_Char QueryString1[64]; + double QueryValue1; + INT16 QueryConnect2; + INT16 QueryField2; + INT16 QueryOp2; + BYTE QueryByString2; + sal_Char QueryString2[64]; + double QueryValue2; }; // Kopf/Fusszeilen-Beschreibung struct Sc10HeadFootLine { - sal_Char Title[128]; - Sc10LogFont LogFont; - BYTE HorJustify; - BYTE VerJustify; - USHORT Raster; - USHORT Frame; - Sc10Color TextColor; - Sc10Color BackColor; - Sc10Color RasterColor; - USHORT FrameColor; // Nibble Codierte Farben link oben rechts unten - USHORT Reserved; + sal_Char Title[128]; + Sc10LogFont LogFont; + BYTE HorJustify; + BYTE VerJustify; + USHORT Raster; + USHORT Frame; + Sc10Color TextColor; + Sc10Color BackColor; + Sc10Color RasterColor; + USHORT FrameColor; // Nibble Codierte Farben link oben rechts unten + USHORT Reserved; int operator==( const Sc10HeadFootLine& rData ) const; }; @@ -297,34 +297,34 @@ struct Sc10HeadFootLine // Seitenformat struct Sc10PageFormat { - Sc10HeadFootLine HeadLine; - Sc10HeadFootLine FootLine; - INT16 Orientation; - INT16 Width; - INT16 Height; - INT16 NonPrintableX; - INT16 NonPrintableY; - INT16 Left; - INT16 Top; - INT16 Right; - INT16 Bottom; - INT16 Head; - INT16 Foot; - BYTE HorCenter; - BYTE VerCenter; - BYTE PrintGrid; - BYTE PrintColRow; - BYTE PrintNote; - BYTE TopBottomDir; - sal_Char PrintAreaName[32]; - Sc10BlockRect PrintArea; - sal_Char PrnZoom[6]; // Pascal 6 Byte Realzahl - USHORT FirstPageNo; - INT16 RowRepeatStart; - INT16 RowRepeatEnd; - INT16 ColRepeatStart; - INT16 ColRepeatEnd; - sal_Char Reserved[26]; + Sc10HeadFootLine HeadLine; + Sc10HeadFootLine FootLine; + INT16 Orientation; + INT16 Width; + INT16 Height; + INT16 NonPrintableX; + INT16 NonPrintableY; + INT16 Left; + INT16 Top; + INT16 Right; + INT16 Bottom; + INT16 Head; + INT16 Foot; + BYTE HorCenter; + BYTE VerCenter; + BYTE PrintGrid; + BYTE PrintColRow; + BYTE PrintNote; + BYTE TopBottomDir; + sal_Char PrintAreaName[32]; + Sc10BlockRect PrintArea; + sal_Char PrnZoom[6]; // Pascal 6 Byte Realzahl + USHORT FirstPageNo; + INT16 RowRepeatStart; + INT16 RowRepeatEnd; + INT16 ColRepeatStart; + INT16 ColRepeatEnd; + sal_Char Reserved[26]; int operator==( const Sc10PageFormat& rData ) const; }; @@ -332,89 +332,89 @@ struct Sc10PageFormat // Tabellenschutz struct Sc10TableProtect { - sal_Char PassWord[16]; - USHORT Flags; - BYTE Protect; + sal_Char PassWord[16]; + USHORT Flags; + BYTE Protect; }; // Documentschutz struct Sc10SheetProtect { - sal_Char PassWord[16]; - USHORT Flags; - BYTE Protect; + sal_Char PassWord[16]; + USHORT Flags; + BYTE Protect; }; // Dateikopf StarCalc 1.0 Datei struct Sc10FileHeader { - sal_Char CopyRight[30]; - USHORT Version; - sal_Char Reserved[32]; + sal_Char CopyRight[30]; + USHORT Version; + sal_Char Reserved[32]; }; // Benutzer-Definierte Datei-Beschreibung struct Sc10FileInfo { - sal_Char Title[64]; - sal_Char Thema[64]; - sal_Char Keys[64]; - sal_Char Note[256]; - sal_Char InfoLabel0[16]; - sal_Char InfoLabel1[16]; - sal_Char InfoLabel2[16]; - sal_Char InfoLabel3[16]; - sal_Char Info0[32]; - sal_Char Info1[32]; - sal_Char Info2[32]; - sal_Char Info3[32]; - sal_Char CreateAuthor[64]; - sal_Char ChangeAuthor[64]; - sal_Char PrintAuthor[64]; - Sc10DateTime CreateDate; - Sc10DateTime ChangeDate; - Sc10DateTime PrintDate; - sal_uInt32 PageCount; - sal_uInt32 ChartCount; - sal_uInt32 PictureCount; - sal_uInt32 GraphCount; - sal_uInt32 OleCount; - sal_uInt32 NoteCount; - sal_uInt32 TextCellCount; - sal_uInt32 ValueCellCount; - sal_uInt32 FormulaCellCount; - sal_uInt32 CellCount; - sal_Char Reserved[52]; + sal_Char Title[64]; + sal_Char Thema[64]; + sal_Char Keys[64]; + sal_Char Note[256]; + sal_Char InfoLabel0[16]; + sal_Char InfoLabel1[16]; + sal_Char InfoLabel2[16]; + sal_Char InfoLabel3[16]; + sal_Char Info0[32]; + sal_Char Info1[32]; + sal_Char Info2[32]; + sal_Char Info3[32]; + sal_Char CreateAuthor[64]; + sal_Char ChangeAuthor[64]; + sal_Char PrintAuthor[64]; + Sc10DateTime CreateDate; + Sc10DateTime ChangeDate; + Sc10DateTime PrintDate; + sal_uInt32 PageCount; + sal_uInt32 ChartCount; + sal_uInt32 PictureCount; + sal_uInt32 GraphCount; + sal_uInt32 OleCount; + sal_uInt32 NoteCount; + sal_uInt32 TextCellCount; + sal_uInt32 ValueCellCount; + sal_uInt32 FormulaCellCount; + sal_uInt32 CellCount; + sal_Char Reserved[52]; }; // Letze Cursorposition struct Sc10EditStateInfo { // Cursor Position - USHORT CarretX; - USHORT CarretY; - USHORT CarretZ; + USHORT CarretX; + USHORT CarretY; + USHORT CarretZ; // Linke obere Ecke der Tabelle im Fenster - USHORT DeltaX; - USHORT DeltaY; - USHORT DeltaZ; + USHORT DeltaX; + USHORT DeltaY; + USHORT DeltaZ; // Ueberfluessig in StarCalc 3.0 - BYTE DataBaseMode; - sal_Char Reserved[51]; + BYTE DataBaseMode; + sal_Char Reserved[51]; }; // Attribut-Eintrag struct Sc10ColData { - USHORT Row; - USHORT Value; + USHORT Row; + USHORT Value; }; // ZellAttribut-Beschreibung struct Sc10ColAttr { - USHORT Count; - Sc10ColData* pData; + USHORT Count; + Sc10ColData* pData; Sc10ColAttr() : pData(NULL) {} }; @@ -422,115 +422,115 @@ struct Sc10ColAttr // GraphHeader struct Sc10GraphHeader { - BYTE Typ; // Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object) - INT16 CarretX; // ZellPosition der Grafik - INT16 CarretY; - INT16 CarretZ; - INT32 x; // x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege) - INT32 y; - INT32 w; // w,h Breite und Hoehe in Pixel - INT32 h; - BYTE IsRelPos; // Ist die Position relativ zur Zelle oder absolute in der Tabelle - BYTE DoPrint; // Soll die Grafik ausgedruckt werden - USHORT FrameType; // Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick) - BYTE IsTransparent; // Soll der Hintergrund gezeichnet werden - Sc10Color FrameColor; // Umrandungsfarbe als RGB-Wert - Sc10Color BackColor; // Hintergrundfarbe als RGB-Wert - sal_Char Reserved[32]; // Na was wohl + BYTE Typ; // Typ der Grafik (Ole-Objekt, Image (Bitmap oder MetaFile), Chart-Object) + INT16 CarretX; // ZellPosition der Grafik + INT16 CarretY; + INT16 CarretZ; + INT32 x; // x,y Abstand zum Zellrand in Pixel (Pixel weil ich Grafiken in Fenstern ablege) + INT32 y; + INT32 w; // w,h Breite und Hoehe in Pixel + INT32 h; + BYTE IsRelPos; // Ist die Position relativ zur Zelle oder absolute in der Tabelle + BYTE DoPrint; // Soll die Grafik ausgedruckt werden + USHORT FrameType; // Art der Umrandung um die Grafik (Keine, Einfach, Doppelt, Einfach Dick, Doppelt Dick) + BYTE IsTransparent; // Soll der Hintergrund gezeichnet werden + Sc10Color FrameColor; // Umrandungsfarbe als RGB-Wert + Sc10Color BackColor; // Hintergrundfarbe als RGB-Wert + sal_Char Reserved[32]; // Na was wohl }; // ImageHeader struct Sc10ImageHeader { sal_Char FileName[128]; // Dateiname des urspruenglich eingefuegten Bildes - INT16 Typ; // Typ der Grafik (Bitmap oder Metafile) - BYTE Linked; // Kann nicht vorkommen - INT16 x1; // Urspruengliche Groesse der Grafik (nur fuer Metafiles) - INT16 y1; - INT16 x2; - INT16 y2; - sal_uInt32 Size; // Groesse der Grafik in BYTES + INT16 Typ; // Typ der Grafik (Bitmap oder Metafile) + BYTE Linked; // Kann nicht vorkommen + INT16 x1; // Urspruengliche Groesse der Grafik (nur fuer Metafiles) + INT16 y1; + INT16 x2; + INT16 y2; + sal_uInt32 Size; // Groesse der Grafik in BYTES }; // ChartHeader struct Sc10ChartHeader { - INT16 MM; // Meatfile Struktur MapMode, Breite, Hoehe - INT16 xExt; - INT16 yExt; - sal_uInt32 Size; // Groesse der Grafik in BYTES + INT16 MM; // Meatfile Struktur MapMode, Breite, Hoehe + INT16 xExt; + INT16 yExt; + sal_uInt32 Size; // Groesse der Grafik in BYTES }; // ChartSheetData struct Sc10ChartSheetData { - BYTE HasTitle; // Hat das Chart Daten aus der Tabell fuer einen Titel - INT16 TitleX; // Zellposition des Titels - INT16 TitleY; - BYTE HasSubTitle; // Hat das Chart Daten aus der Tabell fuer einen Untertitel - INT16 SubTitleX; // Zellposition des Untertitels - INT16 SubTitleY; - BYTE HasLeftTitle; // Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel - INT16 LeftTitleX; // Zellposition des Linken-Titels - INT16 LeftTitleY; - BYTE HasLegend; // Hat das Chart Daten aus der Tabelle fuer eine Legende - INT16 LegendX1; // Zellen der Legende - INT16 LegendY1; - INT16 LegendX2; - INT16 LegendY2; - BYTE HasLabel; // Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung - INT16 LabelX1; // Zellen der Achsbeschriftung - INT16 LabelY1; - INT16 LabelX2; - INT16 LabelY2; - INT16 DataX1; // Zellen der Daten - INT16 DataY1; - INT16 DataX2; - INT16 DataY2; - sal_Char Reserved[64]; + BYTE HasTitle; // Hat das Chart Daten aus der Tabell fuer einen Titel + INT16 TitleX; // Zellposition des Titels + INT16 TitleY; + BYTE HasSubTitle; // Hat das Chart Daten aus der Tabell fuer einen Untertitel + INT16 SubTitleX; // Zellposition des Untertitels + INT16 SubTitleY; + BYTE HasLeftTitle; // Hat das Chart Daten aus der Tabelle fuer einen Linken-Titel + INT16 LeftTitleX; // Zellposition des Linken-Titels + INT16 LeftTitleY; + BYTE HasLegend; // Hat das Chart Daten aus der Tabelle fuer eine Legende + INT16 LegendX1; // Zellen der Legende + INT16 LegendY1; + INT16 LegendX2; + INT16 LegendY2; + BYTE HasLabel; // Hat das Chart Daten aus der Tabelle fuer die Achsbeschriftung + INT16 LabelX1; // Zellen der Achsbeschriftung + INT16 LabelY1; + INT16 LabelX2; + INT16 LabelY2; + INT16 DataX1; // Zellen der Daten + INT16 DataY1; + INT16 DataX2; + INT16 DataY2; + sal_Char Reserved[64]; }; -#define AGPie2D 1 // Pie Chart 2D -#define AGPie3D 2 // Pie Chart 3D -#define AGBar2D 3 // Bar Chart 2D -#define AGBar3D 4 // Bar Chart 3D -#define AGGantt 5 // Gantt Diagramm -#define AGLine 6 // Line Chart -#define AGLogLine 7 // Logarythmic-Coordinate Chart -#define AGArea 8 // Area Chart -#define AGHLC 11 // High-Low-Close Chart -#define AGPolar 10 // Polar-Coordinate Chart +#define AGPie2D 1 // Pie Chart 2D +#define AGPie3D 2 // Pie Chart 3D +#define AGBar2D 3 // Bar Chart 2D +#define AGBar3D 4 // Bar Chart 3D +#define AGGantt 5 // Gantt Diagramm +#define AGLine 6 // Line Chart +#define AGLogLine 7 // Logarythmic-Coordinate Chart +#define AGArea 8 // Area Chart +#define AGHLC 11 // High-Low-Close Chart +#define AGPolar 10 // Polar-Coordinate Chart typedef sal_Char Sc10ChartText[30]; struct Sc10ChartTypeData { - INT16 NumSets; - INT16 NumPoints; - INT16 DrawMode; - INT16 GraphType; - INT16 GraphStyle; - sal_Char GraphTitle[80]; - sal_Char BottomTitle[80]; - INT16 SymbolData[256]; - INT16 ColorData[256]; - INT16 ThickLines[256]; - INT16 PatternData[256]; - INT16 LinePatternData[256]; - INT16 NumGraphStyles[11]; - INT16 ShowLegend; - Sc10ChartText LegendText[256]; - INT16 ExplodePie; - INT16 FontUse; - INT16 FontFamily[5]; - INT16 FontStyle[5]; - INT16 FontSize[5]; - INT16 GridStyle; - INT16 Labels; - INT16 LabelEvery; - Sc10ChartText LabelText[50]; - sal_Char LeftTitle[80]; - sal_Char Reserved[4646]; + INT16 NumSets; + INT16 NumPoints; + INT16 DrawMode; + INT16 GraphType; + INT16 GraphStyle; + sal_Char GraphTitle[80]; + sal_Char BottomTitle[80]; + INT16 SymbolData[256]; + INT16 ColorData[256]; + INT16 ThickLines[256]; + INT16 PatternData[256]; + INT16 LinePatternData[256]; + INT16 NumGraphStyles[11]; + INT16 ShowLegend; + Sc10ChartText LegendText[256]; + INT16 ExplodePie; + INT16 FontUse; + INT16 FontFamily[5]; + INT16 FontStyle[5]; + INT16 FontSize[5]; + INT16 GridStyle; + INT16 Labels; + INT16 LabelEvery; + Sc10ChartText LabelText[50]; + sal_Char LeftTitle[80]; + sal_Char Reserved[4646]; }; @@ -538,10 +538,10 @@ struct Sc10ChartTypeData class Sc10FontData : public ScDataObject { public: - INT16 Height; - BYTE CharSet; - BYTE PitchAndFamily; - sal_Char FaceName[32]; + INT16 Height; + BYTE CharSet; + BYTE PitchAndFamily; + sal_Char FaceName[32]; Sc10FontData( const Sc10FontData& rData ) : ScDataObject( rData ), @@ -553,7 +553,7 @@ public: FaceName[sizeof(FaceName)-1] = 0; } Sc10FontData( SvStream& rStream ); - virtual ScDataObject* Clone() const { return new Sc10FontData(*this); } + virtual ScDataObject* Clone() const { return new Sc10FontData(*this); } }; @@ -564,8 +564,8 @@ protected: ULONG nError; public: Sc10FontCollection( SvStream& rStream ); - ULONG GetError() { return nError; } - Sc10FontData* At(USHORT nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); } + ULONG GetError() { return nError; } + Sc10FontData* At(USHORT nIndex) { return (Sc10FontData*)ScCollection::At(nIndex); } private: using ScCollection::At; }; @@ -575,9 +575,9 @@ private: class Sc10NameData : public ScDataObject { public : - sal_Char Name[32]; - sal_Char Reference[64]; - sal_Char Reserved[12]; + sal_Char Name[32]; + sal_Char Reference[64]; + sal_Char Reserved[12]; Sc10NameData(const Sc10NameData& rData) : ScDataObject( rData ) @@ -589,7 +589,7 @@ public : memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10NameData(SvStream& rStream); - virtual ScDataObject* Clone() const { return new Sc10NameData(*this); } + virtual ScDataObject* Clone() const { return new Sc10NameData(*this); } }; @@ -597,11 +597,11 @@ public : class Sc10NameCollection : public ScCollection { protected: - ULONG nError; + ULONG nError; public: Sc10NameCollection(SvStream& rStream); -ULONG GetError() { return nError; } -Sc10NameData* At(USHORT nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); } +ULONG GetError() { return nError; } +Sc10NameData* At(USHORT nIndex) { return (Sc10NameData*)ScCollection::At(nIndex); } private: using ScCollection::At; }; @@ -611,18 +611,18 @@ private: class Sc10PatternData : public ScDataObject { public: - sal_Char Name[32]; - Sc10ValueFormat ValueFormat; - Sc10LogFont LogFont; - USHORT Attr; - USHORT Justify; - USHORT Frame; - USHORT Raster; - USHORT nColor; - USHORT FrameColor; - USHORT Flags; - USHORT FormatFlags; - sal_Char Reserved[8]; + sal_Char Name[32]; + Sc10ValueFormat ValueFormat; + Sc10LogFont LogFont; + USHORT Attr; + USHORT Justify; + USHORT Frame; + USHORT Raster; + USHORT nColor; + USHORT FrameColor; + USHORT Flags; + USHORT FormatFlags; + sal_Char Reserved[8]; Sc10PatternData(const Sc10PatternData& rData) : ScDataObject( rData ) @@ -642,7 +642,7 @@ public: memcpy(Reserved, rData.Reserved, sizeof(Reserved)); } Sc10PatternData(SvStream& rStream); -virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); } +virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); } }; @@ -650,11 +650,11 @@ virtual ScDataObject* Clone() const { return new Sc10PatternData(*this); } class Sc10PatternCollection : public ScCollection { protected: - ULONG nError; + ULONG nError; public: Sc10PatternCollection(SvStream& rStream); - ULONG GetError() { return nError; } - Sc10PatternData* At(USHORT nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); } + ULONG GetError() { return nError; } + Sc10PatternData* At(USHORT nIndex) { return (Sc10PatternData*)ScCollection::At(nIndex); } private: using ScCollection::At; }; @@ -664,7 +664,7 @@ private: class Sc10DataBaseData : public ScDataObject { public: - Sc10DataBaseRec DataBaseRec; + Sc10DataBaseRec DataBaseRec; Sc10DataBaseData(const Sc10DataBaseData& rData) : ScDataObject( rData ) @@ -672,7 +672,7 @@ public: memcpy(&DataBaseRec, &rData.DataBaseRec, sizeof(DataBaseRec)); } Sc10DataBaseData(SvStream& rStream); -virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); } +virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); } }; @@ -680,12 +680,12 @@ virtual ScDataObject* Clone() const { return new Sc10DataBaseData(*this); class Sc10DataBaseCollection : public ScCollection { protected: - ULONG nError; - sal_Char ActName[32]; + ULONG nError; + sal_Char ActName[32]; public: Sc10DataBaseCollection(SvStream& rStream); - ULONG GetError() { return nError; } - Sc10DataBaseData* At(USHORT nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); } + ULONG GetError() { return nError; } + Sc10DataBaseData* At(USHORT nIndex) { return (Sc10DataBaseData*)ScCollection::At(nIndex); } private: using ScCollection::At; }; @@ -694,11 +694,11 @@ private: class Sc10PageData : public ScDataObject { public: - Sc10PageFormat aPageFormat; + Sc10PageFormat aPageFormat; Sc10PageData( const Sc10PageFormat& rFormat ) : aPageFormat(rFormat) {} - int operator==( const Sc10PageData& rData ) const + int operator==( const Sc10PageData& rData ) const { return aPageFormat == rData.aPageFormat; } - virtual ScDataObject* Clone() const; + virtual ScDataObject* Clone() const; }; // Seitenformat-Collection @@ -706,9 +706,9 @@ class Sc10PageCollection : public ScCollection { public: Sc10PageCollection() : ScCollection(1,1) {}; - Sc10PageData* At(USHORT nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); } + Sc10PageData* At(USHORT nIndex) { return (Sc10PageData*)ScCollection::At(nIndex); } USHORT InsertFormat( const Sc10PageFormat& rData ); - void PutToDoc( ScDocument* pDoc ); + void PutToDoc( ScDocument* pDoc ); private: using ScCollection::At; }; @@ -719,46 +719,46 @@ class ScfStreamProgressBar; // Import-Klasse class Sc10Import { - SvStream& rStream; - ScDocument* pDoc; - Sc10Color TextPalette[16]; - Sc10Color BackPalette[16]; - Sc10Color RasterPalette[16]; - Sc10Color FramePalette[16]; - Sc10SheetProtect SheetProtect; - Sc10FontCollection* pFontCollection; - Sc10NameCollection* pNameCollection; - Sc10PatternCollection* pPatternCollection; - Sc10DataBaseCollection* pDataBaseCollection; + SvStream& rStream; + ScDocument* pDoc; + Sc10Color TextPalette[16]; + Sc10Color BackPalette[16]; + Sc10Color RasterPalette[16]; + Sc10Color FramePalette[16]; + Sc10SheetProtect SheetProtect; + Sc10FontCollection* pFontCollection; + Sc10NameCollection* pNameCollection; + Sc10PatternCollection* pPatternCollection; + Sc10DataBaseCollection* pDataBaseCollection; ULONG nError; - INT16 TabCount; - SCTAB nShowTab; - ScViewOptions aSc30ViewOpt; + INT16 TabCount; + SCTAB nShowTab; + ScViewOptions aSc30ViewOpt; ScfStreamProgressBar* pPrgrsBar; public: Sc10Import( SvStream& rStr, ScDocument* pDocument ); ~Sc10Import(); - ULONG Import(); - void LoadFileHeader(); - void LoadFileInfo(); - void LoadEditStateInfo(); - void LoadProtect(); - void LoadViewColRowBar(); - void LoadScrZoom(); - void LoadPalette(); - void LoadFontCollection(); - void LoadNameCollection(); - void ImportNameCollection(); - void LoadPatternCollection(); - void LoadDataBaseCollection(); - void LoadTables(); - void LoadCol(SCCOL Col, SCTAB Tab); - void LoadColAttr(SCCOL Col, SCTAB Tab); - void LoadAttr(Sc10ColAttr& rAttr); - void ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey); - void LoadObjects(); + ULONG Import(); + void LoadFileHeader(); + void LoadFileInfo(); + void LoadEditStateInfo(); + void LoadProtect(); + void LoadViewColRowBar(); + void LoadScrZoom(); + void LoadPalette(); + void LoadFontCollection(); + void LoadNameCollection(); + void ImportNameCollection(); + void LoadPatternCollection(); + void LoadDataBaseCollection(); + void LoadTables(); + void LoadCol(SCCOL Col, SCTAB Tab); + void LoadColAttr(SCCOL Col, SCTAB Tab); + void LoadAttr(Sc10ColAttr& rAttr); + void ChangeFormat(USHORT nFormat, USHORT nInfo, ULONG& nKey); + void LoadObjects(); }; #endif diff --git a/sc/source/filter/inc/scfobj.hxx b/sc/source/filter/inc/scfobj.hxx index a83c2ea0a1d5..84b7f8be830d 100644 --- a/sc/source/filter/inc/scfobj.hxx +++ b/sc/source/filter/inc/scfobj.hxx @@ -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/inc/scmem.h b/sc/source/filter/inc/scmem.h index 029351639f72..96c57585e6f6 100644 --- a/sc/source/filter/inc/scmem.h +++ b/sc/source/filter/inc/scmem.h @@ -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/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx index 0fc780bab344..eb4ac68a970b 100644 --- a/sc/source/filter/inc/tokstack.hxx +++ b/sc/source/filter/inc/tokstack.hxx @@ -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 @@ -42,21 +42,21 @@ typedef OpCode DefTokenId; //typedef UINT16 TokenId; struct TokenId { - UINT16 nId; + UINT16 nId; TokenId() : nId( 0 ) {} TokenId( UINT16 n ) : nId( n ) {} TokenId( const TokenId& r ) : nId( r.nId ) {} - inline TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; } - inline TokenId& operator =( UINT16 n ) { nId = n; return *this; } - inline operator UINT16&() { return nId; } - inline operator const UINT16&() const { return nId; } - inline BOOL operator <( UINT16 n ) const { return nId < n; } - inline BOOL operator >( UINT16 n ) const { return nId > n; } - inline BOOL operator <=( UINT16 n ) const { return nId <= n; } - inline BOOL operator >=( UINT16 n ) const { return nId >= n; } - inline BOOL operator ==( UINT16 n ) const { return nId == n; } - inline BOOL operator !=( UINT16 n ) const { return nId != n; } + inline TokenId& operator =( const TokenId& r ) { nId = r.nId; return *this; } + inline TokenId& operator =( UINT16 n ) { nId = n; return *this; } + inline operator UINT16&() { return nId; } + inline operator const UINT16&() const { return nId; } + inline BOOL operator <( UINT16 n ) const { return nId < n; } + inline BOOL operator >( UINT16 n ) const { return nId > n; } + inline BOOL operator <=( UINT16 n ) const { return nId <= n; } + inline BOOL operator >=( UINT16 n ) const { return nId >= n; } + inline BOOL operator ==( UINT16 n ) const { return nId == n; } + inline BOOL operator !=( UINT16 n ) const { return nId != n; } }; @@ -68,20 +68,20 @@ class ScToken; enum E_TYPE { - T_Id, // Id-Folge - T_Str, // String - T_D, // Double + T_Id, // Id-Folge + T_Str, // String + T_D, // Double T_Err, // Error code - T_RefC, // Cell Reference - T_RefA, // Area Reference - T_RN, // Range Name - T_Ext, // irgendwas Unbekanntes mit Funktionsnamen - T_Nlf, // token for natural language formula - T_Matrix, // token for inline arrays + T_RefC, // Cell Reference + T_RefA, // Area Reference + T_RN, // Range Name + T_Ext, // irgendwas Unbekanntes mit Funktionsnamen + T_Nlf, // token for natural language formula + T_Matrix, // token for inline arrays T_ExtName, // token for external names T_ExtRefC, T_ExtRefA, - T_Error // fuer Abfrage im Fehlerfall + T_Error // fuer Abfrage im Fehlerfall }; @@ -92,50 +92,50 @@ class TokenPool // !ACHTUNG!: externe Id-Basis ist 1, interne 0! // Ausgabe Id = 0 -> Fehlerfall private: - String** ppP_Str; // Pool fuer Strings - UINT16 nP_Str; // ...mit Groesse - UINT16 nP_StrAkt; // ...und Schreibmarke + String** ppP_Str; // Pool fuer Strings + UINT16 nP_Str; // ...mit Groesse + UINT16 nP_StrAkt; // ...und Schreibmarke - double* pP_Dbl; // Pool fuer Doubles - UINT16 nP_Dbl; - UINT16 nP_DblAkt; + double* pP_Dbl; // Pool fuer Doubles + UINT16 nP_Dbl; + UINT16 nP_DblAkt; USHORT* pP_Err; // Pool for error codes UINT16 nP_Err; UINT16 nP_ErrAkt; - ScSingleRefData** ppP_RefTr; // Pool fuer Referenzen - UINT16 nP_RefTr; - UINT16 nP_RefTrAkt; + ScSingleRefData** ppP_RefTr; // Pool fuer Referenzen + UINT16 nP_RefTr; + UINT16 nP_RefTrAkt; - UINT16* pP_Id; // Pool fuer Id-Folgen - UINT16 nP_Id; - UINT16 nP_IdAkt; - UINT16 nP_IdLast; // letzter Folgen-Beginn + UINT16* pP_Id; // Pool fuer Id-Folgen + UINT16 nP_Id; + UINT16 nP_IdAkt; + UINT16 nP_IdLast; // letzter Folgen-Beginn - struct EXTCONT + struct EXTCONT { - DefTokenId eId; - String aText; + DefTokenId eId; + String aText; EXTCONT( const DefTokenId e, const String& r ) : eId( e ), aText( r ){} }; - EXTCONT** ppP_Ext; - UINT16 nP_Ext; - UINT16 nP_ExtAkt; + EXTCONT** ppP_Ext; + UINT16 nP_Ext; + UINT16 nP_ExtAkt; - struct NLFCONT + struct NLFCONT { - ScSingleRefData aRef; - NLFCONT( const ScSingleRefData& r ) : aRef( r ) {} + ScSingleRefData aRef; + NLFCONT( const ScSingleRefData& r ) : aRef( r ) {} }; - NLFCONT** ppP_Nlf; - UINT16 nP_Nlf; - UINT16 nP_NlfAkt; + NLFCONT** ppP_Nlf; + UINT16 nP_Nlf; + UINT16 nP_NlfAkt; - ScMatrix** ppP_Matrix; // Pool fuer Matricies - UINT16 nP_Matrix; - UINT16 nP_MatrixAkt; + ScMatrix** ppP_Matrix; // Pool fuer Matricies + UINT16 nP_Matrix; + UINT16 nP_MatrixAkt; /** for storage of external names */ struct ExtName @@ -149,7 +149,7 @@ class TokenPool struct ExtCellRef { sal_uInt16 mnFileId; - String maTabName; + String maTabName; ScSingleRefData maRef; }; ::std::vector<ExtCellRef> maExtCellRefs; @@ -158,66 +158,66 @@ class TokenPool struct ExtAreaRef { sal_uInt16 mnFileId; - String maTabName; + String maTabName; ScComplexRefData maRef; }; ::std::vector<ExtAreaRef> maExtAreaRefs; - UINT16* pElement; // Array mit Indizes fuer Elemente - E_TYPE* pType; // ...mit Typ-Info - UINT16* pSize; // ...mit Laengenangabe (Anz. UINT16) - UINT16 nElement; - UINT16 nElementAkt; + UINT16* pElement; // Array mit Indizes fuer Elemente + E_TYPE* pType; // ...mit Typ-Info + UINT16* pSize; // ...mit Laengenangabe (Anz. UINT16) + UINT16 nElement; + UINT16 nElementAkt; - static const UINT16 nScTokenOff;// Offset fuer SC-Token + static const UINT16 nScTokenOff;// Offset fuer SC-Token #ifdef DBG_UTIL - UINT16 nRek; // Rekursionszaehler + UINT16 nRek; // Rekursionszaehler #endif - ScTokenArray* pScToken; // Tokenbastler - - void GrowString( void ); - void GrowDouble( void ); - void GrowTripel( void ); - void GrowId( void ); - void GrowElement( void ); - void GrowExt( void ); - void GrowNlf( void ); - void GrowMatrix( void ); - void GetElement( const UINT16 nId ); - void GetElementRek( const UINT16 nId ); + ScTokenArray* pScToken; // Tokenbastler + + void GrowString( void ); + void GrowDouble( void ); + void GrowTripel( void ); + void GrowId( void ); + void GrowElement( void ); + void GrowExt( void ); + void GrowNlf( void ); + void GrowMatrix( void ); + void GetElement( const UINT16 nId ); + void GetElementRek( const UINT16 nId ); public: TokenPool( void ); ~TokenPool(); - inline TokenPool& operator <<( const TokenId nId ); - inline TokenPool& operator <<( const DefTokenId eId ); - inline TokenPool& operator <<( TokenStack& rStack ); - void operator >>( TokenId& rId ); - inline void operator >>( TokenStack& rStack ); - inline const TokenId Store( void ); - const TokenId Store( const double& rDouble ); + inline TokenPool& operator <<( const TokenId nId ); + inline TokenPool& operator <<( const DefTokenId eId ); + inline TokenPool& operator <<( TokenStack& rStack ); + void operator >>( TokenId& rId ); + inline void operator >>( TokenStack& rStack ); + inline const TokenId Store( void ); + const TokenId Store( const double& rDouble ); // nur fuer Range-Names - const TokenId Store( const UINT16 nIndex ); - inline const TokenId Store( const INT16 nWert ); - const TokenId Store( const String& rString ); - const TokenId Store( const ScSingleRefData& rTr ); - const TokenId Store( const ScComplexRefData& rTr ); + const TokenId Store( const UINT16 nIndex ); + inline const TokenId Store( const INT16 nWert ); + const TokenId Store( const String& rString ); + const TokenId Store( const ScSingleRefData& rTr ); + const TokenId Store( const ScComplexRefData& rTr ); - const TokenId Store( const DefTokenId eId, const String& rName ); + const TokenId Store( const DefTokenId eId, const String& rName ); // 4 externals (e.g. AddIns, Makros...) - const TokenId StoreNlf( const ScSingleRefData& rTr ); + const TokenId StoreNlf( const ScSingleRefData& rTr ); const TokenId StoreMatrix(); const TokenId StoreExtName( sal_uInt16 nFileId, const String& rName ); const TokenId StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScSingleRefData& rRef ); const TokenId StoreExtRef( sal_uInt16 nFileId, const String& rTabName, const ScComplexRefData& rRef ); - inline const TokenId LastId( void ) const; - inline const ScTokenArray* operator []( const TokenId nId ); - void Reset( void ); - inline E_TYPE GetType( const TokenId& nId ) const; - BOOL IsSingleOp( const TokenId& nId, const DefTokenId eId ) const; + inline const TokenId LastId( void ) const; + inline const ScTokenArray* operator []( const TokenId nId ); + void Reset( void ); + inline E_TYPE GetType( const TokenId& nId ) const; + BOOL IsSingleOp( const TokenId& nId, const DefTokenId eId ) const; const String* GetExternal( const TokenId& nId ) const; - ScMatrix* GetMatrix( unsigned int n ) const; + ScMatrix* GetMatrix( unsigned int n ) const; }; @@ -225,22 +225,22 @@ class TokenPool class TokenStack // Stack fuer Token-Ids: Id 0 sollte reserviert bleiben als - // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert + // fehlerhafte Id, da z.B. Get() im Fehlerfall 0 liefert { private: - TokenId* pStack; // Stack als Array - UINT16 nPos; // Schreibmarke - UINT16 nSize; // Erster Index ausserhalb des Stacks + TokenId* pStack; // Stack als Array + UINT16 nPos; // Schreibmarke + UINT16 nSize; // Erster Index ausserhalb des Stacks public: TokenStack( UINT16 nNewSize = 1024 ); ~TokenStack(); - inline TokenStack& operator <<( const TokenId nNewId ); - inline void operator >>( TokenId &rId ); + inline TokenStack& operator <<( const TokenId nNewId ); + inline void operator >>( TokenId &rId ); - inline void Reset( void ); + inline void Reset( void ); inline bool HasMoreTokens() const { return nPos > 0; } - inline const TokenId Get( void ); + inline const TokenId Get( void ); }; @@ -301,7 +301,7 @@ inline void TokenStack::Reset( void ) inline TokenPool& TokenPool::operator <<( const TokenId nId ) { // POST: nId's werden hintereinander im Pool unter einer neuen Id - // abgelegt. Vorgang wird mit >> oder Store() abgeschlossen + // abgelegt. Vorgang wird mit >> oder Store() abgeschlossen // nId -> ( UINT16 ) nId - 1; DBG_ASSERT( ( UINT16 ) nId < nScTokenOff, "-TokenPool::operator <<: TokenId im DefToken-Bereich!" ); diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h index c0c936798fa3..a5638c0cb91a 100644 --- a/sc/source/filter/inc/tool.h +++ b/sc/source/filter/inc/tool.h @@ -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 @@ -33,18 +33,18 @@ #include <document.hxx> // Defaultwerte -const BYTE nDezStd = 0; // Dezimalstellen fuer Standard-Zellen -const BYTE nDezFloat = 2; // " " Float-Zellen +const BYTE nDezStd = 0; // Dezimalstellen fuer Standard-Zellen +const BYTE nDezFloat = 2; // " " Float-Zellen -void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString ); +void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char *pString ); -void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt ); +void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt ); -void InitPage( void ); +void InitPage( void ); -String DosToSystem( sal_Char *pSource ); +String DosToSystem( sal_Char *pSource ); -double SnumToDouble( INT16 nVal ); +double SnumToDouble( INT16 nVal ); double Snum32ToDouble( UINT32 nValue ); @@ -57,8 +57,8 @@ typedef UINT16 StampTyp; class FormIdent { private: - StampTyp nStamp; // Identifikations-Schluessel - SfxUInt32Item* pAttr; // zugehoeriges Attribut + StampTyp nStamp; // Identifikations-Schluessel + SfxUInt32Item* pAttr; // zugehoeriges Attribut public: FormIdent( void ) { @@ -78,27 +78,27 @@ public: pAttr = NULL; } - BOOL operator ==( const FormIdent& rComp ) const + BOOL operator ==( const FormIdent& rComp ) const { return ( nStamp == rComp.nStamp ); } - BOOL operator ==( const StampTyp& rStamp ) const + BOOL operator ==( const StampTyp& rStamp ) const { return ( nStamp == rStamp ); } - StampTyp GetStamp( void ) const + StampTyp GetStamp( void ) const { return nStamp; } - SfxUInt32Item* GetAttr( void ) + SfxUInt32Item* GetAttr( void ) { return pAttr; } - void SetStamp( BYTE nFormat, BYTE nSt ) + void SetStamp( BYTE nFormat, BYTE nSt ) { nStamp = MAKE_STAMP( nFormat, nSt ); } @@ -113,21 +113,21 @@ public: class FormCache { private: - FormIdent aIdents[ __nSize ]; //gepufferte Formate - BOOL bValid[ __nSize ]; - FormIdent aCompareIdent; // zum Vergleichen - BYTE nDefaultFormat; // Defaultformat der Datei - SvNumberFormatter* pFormTable; // Value-Format-Table-Anker - StampTyp nIndex; - LanguageType eLanguage; // Systemsprache - - SfxUInt32Item* NewAttr( BYTE nFormat, BYTE nSt ); + FormIdent aIdents[ __nSize ]; //gepufferte Formate + BOOL bValid[ __nSize ]; + FormIdent aCompareIdent; // zum Vergleichen + BYTE nDefaultFormat; // Defaultformat der Datei + SvNumberFormatter* pFormTable; // Value-Format-Table-Anker + StampTyp nIndex; + LanguageType eLanguage; // Systemsprache + + SfxUInt32Item* NewAttr( BYTE nFormat, BYTE nSt ); public: FormCache( ScDocument*, BYTE nNewDefaultFormat = 0xFF ); ~FormCache(); - inline const SfxUInt32Item* GetAttr( BYTE nFormat, BYTE nSt ); - void SetDefaultFormat( BYTE nD = 0xFF ) + inline const SfxUInt32Item* GetAttr( BYTE nFormat, BYTE nSt ); + void SetDefaultFormat( BYTE nD = 0xFF ) { nDefaultFormat = nD; } @@ -136,11 +136,11 @@ public: inline const SfxUInt32Item* FormCache::GetAttr( BYTE nFormat, BYTE nSt ) { - // PREC: nFormat = Lotus-Format-Byte - // nSt = Stellenzahl - // POST: return = zu nFormat und nSt passendes SC-Format - SfxUInt32Item* pAttr; - SfxUInt32Item* pRet; + // PREC: nFormat = Lotus-Format-Byte + // nSt = Stellenzahl + // POST: return = zu nFormat und nSt passendes SC-Format + SfxUInt32Item* pAttr; + SfxUInt32Item* pRet; aCompareIdent.SetStamp( nFormat, nSt ); nIndex = aCompareIdent.GetStamp(); diff --git a/sc/source/filter/inc/xcl97dum.hxx b/sc/source/filter/inc/xcl97dum.hxx index 771a3edadfed..f5ccbeb2be53 100644 --- a/sc/source/filter/inc/xcl97dum.hxx +++ b/sc/source/filter/inc/xcl97dum.hxx @@ -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/inc/xcl97esc.hxx b/sc/source/filter/inc/xcl97esc.hxx index d48933bdbb62..e82bf96596c5 100644 --- a/sc/source/filter/inc/xcl97esc.hxx +++ b/sc/source/filter/inc/xcl97esc.hxx @@ -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 @@ -114,11 +114,11 @@ public: virtual EscherExHostAppData* StartShape( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape>& rxShape, const Rectangle* pChildAnchor ); - virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID ); - virtual EscherExHostAppData* EnterAdditionalTextGroup(); + virtual void EndShape( UINT16 nShapeType, UINT32 nShapeID ); + virtual EscherExHostAppData* EnterAdditionalTextGroup(); /// Flush and merge PicStream into EscherStream - void EndDocument(); + void EndDocument(); #if EXC_EXP_OCX_CTRL /** Creates an OCX form control OBJ record from the passed form control. @@ -162,13 +162,13 @@ private: class XclEscherHostAppData : public EscherExHostAppData { private: - BOOL bStackedGroup; + BOOL bStackedGroup; public: XclEscherHostAppData() : bStackedGroup( FALSE ) {} - inline void SetStackedGroup( BOOL b ) { bStackedGroup = b; } - inline BOOL IsStackedGroup() const { return bStackedGroup; } + inline void SetStackedGroup( BOOL b ) { bStackedGroup = b; } + inline BOOL IsStackedGroup() const { return bStackedGroup; } }; diff --git a/sc/source/filter/inc/xcl97rec.hxx b/sc/source/filter/inc/xcl97rec.hxx index f15ed6b635bb..eef1eb799ca2 100644 --- a/sc/source/filter/inc/xcl97rec.hxx +++ b/sc/source/filter/inc/xcl97rec.hxx @@ -83,12 +83,12 @@ protected: XclEscherEx& mrEscherEx; XclExpMsoDrawing* pMsodrawing; XclExpMsoDrawing* pClientTextbox; - XclTxo* pTxo; + XclTxo* pTxo; sal_uInt16 mnObjType; - UINT16 nObjId; - UINT16 nGrbit; + UINT16 nObjId; + UINT16 nGrbit; SCTAB mnScTab; - BOOL bFirstOnSheet; + BOOL bFirstOnSheet; bool mbOwnEscher; /// true = Escher part created on the fly. @@ -101,30 +101,30 @@ protected: // overwritten for writing MSODRAWING record virtual void WriteBody( XclExpStream& rStrm ); virtual void WriteSubRecs( XclExpStream& rStrm ); - void SaveTextRecs( XclExpStream& rStrm ); + void SaveTextRecs( XclExpStream& rStrm ); public: - virtual ~XclObj(); + virtual ~XclObj(); inline sal_uInt16 GetObjType() const { return mnObjType; } - inline void SetId( UINT16 nId ) { nObjId = nId; } + inline void SetId( UINT16 nId ) { nObjId = nId; } inline sal_uInt16 GetId() const { return nObjId; } inline void SetTab( SCTAB nScTab ) { mnScTab = nScTab; } inline SCTAB GetTab() const { return mnScTab; } - inline void SetLocked( BOOL b ) + inline void SetLocked( BOOL b ) { b ? nGrbit |= 0x0001 : nGrbit &= ~0x0001; } - inline void SetPrintable( BOOL b ) + inline void SetPrintable( BOOL b ) { b ? nGrbit |= 0x0010 : nGrbit &= ~0x0010; } - inline void SetAutoFill( BOOL b ) + inline void SetAutoFill( BOOL b ) { b ? nGrbit |= 0x2000 : nGrbit &= ~0x2000; } - inline void SetAutoLine( BOOL b ) + inline void SetAutoLine( BOOL b ) { b ? nGrbit |= 0x4000 : nGrbit &= ~0x4000; } // set corresponding Excel object type in OBJ/ftCmo - void SetEscherShapeType( UINT16 nType ); + void SetEscherShapeType( UINT16 nType ); inline void SetEscherShapeTypeGroup() { mnObjType = EXC_OBJTYPE_GROUP; } /** If set to true, this object has created its own escher data. @@ -142,7 +142,7 @@ public: //! actually writes ESCHER_ClientTextbox void SetText( const XclExpRoot& rRoot, const SdrTextObj& rObj ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); }; // --- class XclObjComment ------------------------------------------- @@ -159,7 +159,7 @@ class XclObjComment : public XclObj public: XclObjComment( XclExpObjectManager& rObjMgr, const Rectangle& rRect, const EditTextObject& rEditObj, SdrCaptionObj* pCaption, bool bVisible, const ScAddress& rAddress, Rectangle &rFrom, Rectangle &To ); - virtual ~XclObjComment(); + virtual ~XclObjComment(); /** c'tor process for formatted text objects above . @descr used to construct the MSODRAWING Escher object properties. */ @@ -167,7 +167,7 @@ public: const Rectangle& rRect, SdrObject* pCaption, bool bVisible ); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); virtual void SaveXml( XclExpXmlStream& rStrm ); }; @@ -177,14 +177,14 @@ public: class XclObjDropDown : public XclObj { private: - BOOL bIsFiltered; + BOOL bIsFiltered; virtual void WriteSubRecs( XclExpStream& rStrm ); protected: public: XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& rPos, BOOL bFilt ); - virtual ~XclObjDropDown(); + virtual ~XclObjDropDown(); }; @@ -202,9 +202,9 @@ public: inline void SetHorAlign( sal_uInt8 nHorAlign ) { mnHorAlign = nHorAlign; } inline void SetVerAlign( sal_uInt8 nVerAlign ) { mnVerAlign = nVerAlign; } - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; private: @@ -224,16 +224,16 @@ class XclObjOle : public XclObj { private: - const SdrObject& rOleObj; + const SdrObject& rOleObj; SotStorage* pRootStorage; virtual void WriteSubRecs( XclExpStream& rStrm ); public: XclObjOle( XclExpObjectManager& rObjMgr, const SdrObject& rObj ); - virtual ~XclObjOle(); + virtual ~XclObjOle(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); }; @@ -247,14 +247,14 @@ protected: public: XclObjAny( XclExpObjectManager& rObjMgr, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape ); - virtual ~XclObjAny(); + virtual ~XclObjAny(); com::sun::star::uno::Reference< com::sun::star::drawing::XShape > GetShape() const { return mxShape; } - virtual void Save( XclExpStream& rStrm ); - virtual void SaveXml( XclExpXmlStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); + virtual void SaveXml( XclExpXmlStream& rStrm ); static void WriteFromTo( XclExpXmlStream& rStrm, const XclObjAny& rObj ); static void WriteFromTo( XclExpXmlStream& rStrm, const com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape, SCTAB nTab ); @@ -269,15 +269,15 @@ private: class ExcBof8_Base : public ExcBof_Base { protected: - UINT32 nFileHistory; // bfh - UINT32 nLowestBiffVer; // sfo + UINT32 nFileHistory; // bfh + UINT32 nLowestBiffVer; // sfo - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBof8_Base(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -310,7 +310,7 @@ private: String sUnicodeName; XclExpString GetName() const; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: ExcBundlesheet8( RootData& rRootData, SCTAB nTab ); @@ -327,7 +327,7 @@ public: class XclObproj : public ExcRecord { public: - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -338,25 +338,25 @@ class XclCodename : public ExcRecord { private: XclExpString aName; - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclCodename( const String& ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; // ---- Scenarios ---------------------------------------------------- -// - ExcEScenarioCell a cell of a scenario range -// - ExcEScenario all ranges of a scenario table -// - ExcEScenarioManager list of scenario tables +// - ExcEScenarioCell a cell of a scenario range +// - ExcEScenario all ranges of a scenario table +// - ExcEScenarioManager list of scenario tables class ExcEScenarioCell { private: - UINT16 nCol; - UINT16 nRow; + UINT16 nCol; + UINT16 nRow; XclExpString sText; protected: @@ -366,8 +366,8 @@ public: inline sal_Size GetStringBytes() { return sText.GetSize(); } - void WriteAddress( XclExpStream& rStrm ); - void WriteText( XclExpStream& rStrm ); + void WriteAddress( XclExpStream& rStrm ); + void WriteText( XclExpStream& rStrm ); void SaveXml( XclExpXmlStream& rStrm ); }; @@ -383,19 +383,19 @@ private: XclExpString sUserName; UINT8 nProtected; - inline ExcEScenarioCell* _First() { return (ExcEScenarioCell*) List::First(); } - inline ExcEScenarioCell* _Next() { return (ExcEScenarioCell*) List::Next(); } + inline ExcEScenarioCell* _First() { return (ExcEScenarioCell*) List::First(); } + inline ExcEScenarioCell* _Next() { return (ExcEScenarioCell*) List::Next(); } - BOOL Append( UINT16 nCol, UINT16 nRow, const String& rTxt ); + BOOL Append( UINT16 nCol, UINT16 nRow, const String& rTxt ); - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); protected: public: ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ); - virtual ~ExcEScenario(); + virtual ~ExcEScenario(); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -406,25 +406,25 @@ public: class ExcEScenarioManager : public ExcRecord, private List { private: - UINT16 nActive; + UINT16 nActive; - inline ExcEScenario* _First() { return (ExcEScenario*) List::First(); } - inline ExcEScenario* _Next() { return (ExcEScenario*) List::Next(); } + inline ExcEScenario* _First() { return (ExcEScenario*) List::First(); } + inline ExcEScenario* _Next() { return (ExcEScenario*) List::Next(); } - inline void Append( ExcEScenario* pScen ) + inline void Append( ExcEScenario* pScen ) { List::Insert( pScen, LIST_APPEND ); } - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); protected: public: ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ); - virtual ~ExcEScenarioManager(); + virtual ~ExcEScenarioManager(); - virtual void Save( XclExpStream& rStrm ); + virtual void Save( XclExpStream& rStrm ); virtual void SaveXml( XclExpXmlStream& rStrm ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; }; @@ -450,13 +450,13 @@ private: class XclCalccount : public ExcRecord { private: - UINT16 nCount; + UINT16 nCount; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclCalccount( const ScDocument& ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -468,13 +468,13 @@ public: class XclIteration : public ExcRecord { private: - UINT16 nIter; + UINT16 nIter; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclIteration( const ScDocument& ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); @@ -486,13 +486,13 @@ public: class XclDelta : public ExcRecord { private: - double fDelta; + double fDelta; protected: - virtual void SaveCont( XclExpStream& rStrm ); + virtual void SaveCont( XclExpStream& rStrm ); public: XclDelta( const ScDocument& ); - virtual UINT16 GetNum() const; + virtual UINT16 GetNum() const; virtual sal_Size GetLen() const; virtual void SaveXml( XclExpXmlStream& rStrm ); diff --git a/sc/source/filter/inc/xechart.hxx b/sc/source/filter/inc/xechart.hxx index bbf9c764539e..71fdbd20cb0d 100644 --- a/sc/source/filter/inc/xechart.hxx +++ b/sc/source/filter/inc/xechart.hxx @@ -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/inc/xecontent.hxx b/sc/source/filter/inc/xecontent.hxx index 41ceb8410b02..b6e97aa5510b 100644 --- a/sc/source/filter/inc/xecontent.hxx +++ b/sc/source/filter/inc/xecontent.hxx @@ -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/inc/xeformula.hxx b/sc/source/filter/inc/xeformula.hxx index 5cc3107bd25d..9a6492f2155f 100644 --- a/sc/source/filter/inc/xeformula.hxx +++ b/sc/source/filter/inc/xeformula.hxx @@ -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/inc/xehelper.hxx b/sc/source/filter/inc/xehelper.hxx index 00d758dd1991..e82eacabc04d 100644 --- a/sc/source/filter/inc/xehelper.hxx +++ b/sc/source/filter/inc/xehelper.hxx @@ -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/inc/xename.hxx b/sc/source/filter/inc/xename.hxx index 66e903553da8..7fd7dd93bdec 100644 --- a/sc/source/filter/inc/xename.hxx +++ b/sc/source/filter/inc/xename.hxx @@ -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/inc/xepage.hxx b/sc/source/filter/inc/xepage.hxx index be8d1a1ac08c..a463eef211c0 100644 --- a/sc/source/filter/inc/xepage.hxx +++ b/sc/source/filter/inc/xepage.hxx @@ -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/inc/xepivot.hxx b/sc/source/filter/inc/xepivot.hxx index c2e226a75b39..97df866797dc 100644 --- a/sc/source/filter/inc/xepivot.hxx +++ b/sc/source/filter/inc/xepivot.hxx @@ -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/inc/xerecord.hxx b/sc/source/filter/inc/xerecord.hxx index 712da2b89d6e..dc536e4bcdc7 100644 --- a/sc/source/filter/inc/xerecord.hxx +++ b/sc/source/filter/inc/xerecord.hxx @@ -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/inc/xestream.hxx b/sc/source/filter/inc/xestream.hxx index d0e56961e812..8c636ef1a360 100644 --- a/sc/source/filter/inc/xestream.hxx +++ b/sc/source/filter/inc/xestream.hxx @@ -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/inc/xestring.hxx b/sc/source/filter/inc/xestring.hxx index 6b1c12474dd0..6117b99db3be 100644 --- a/sc/source/filter/inc/xestring.hxx +++ b/sc/source/filter/inc/xestring.hxx @@ -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/inc/xestyle.hxx b/sc/source/filter/inc/xestyle.hxx index fa2d3e8eb782..d0733f4eaa48 100644 --- a/sc/source/filter/inc/xestyle.hxx +++ b/sc/source/filter/inc/xestyle.hxx @@ -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/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx index 2c18f14d91f0..564182374fdf 100644 --- a/sc/source/filter/inc/xetable.hxx +++ b/sc/source/filter/inc/xetable.hxx @@ -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/inc/xeview.hxx b/sc/source/filter/inc/xeview.hxx index eb1bf5c403f8..709b43362032 100644 --- a/sc/source/filter/inc/xeview.hxx +++ b/sc/source/filter/inc/xeview.hxx @@ -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/inc/xichart.hxx b/sc/source/filter/inc/xichart.hxx index 12b2e2d473b2..72b3e89046f8 100644 --- a/sc/source/filter/inc/xichart.hxx +++ b/sc/source/filter/inc/xichart.hxx @@ -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/inc/xicontent.hxx b/sc/source/filter/inc/xicontent.hxx index 6bd2e38355f6..982cfae44cdd 100644 --- a/sc/source/filter/inc/xicontent.hxx +++ b/sc/source/filter/inc/xicontent.hxx @@ -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/inc/xiescher.hxx b/sc/source/filter/inc/xiescher.hxx index bf623b4a2da5..2ae222d4514b 100644 --- a/sc/source/filter/inc/xiescher.hxx +++ b/sc/source/filter/inc/xiescher.hxx @@ -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/inc/xiformula.hxx b/sc/source/filter/inc/xiformula.hxx index 5ed9d04b0ea9..7dc5e4852945 100644 --- a/sc/source/filter/inc/xiformula.hxx +++ b/sc/source/filter/inc/xiformula.hxx @@ -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 @@ -50,11 +50,11 @@ public: ScRangeList& rScRanges, XclFormulaType eType, const XclTokenArray& rXclTokArr, XclImpStream& rStrm ); - /** - * Creates a formula token array from the Excel token array. Note that - * the caller must create a copy of the token array instance returend by - * this function if the caller needs to persistently store the array, - * because the pointer points to an array instance on the stack. + /** + * Creates a formula token array from the Excel token array. Note that + * the caller must create a copy of the token array instance returend by + * this function if the caller needs to persistently store the array, + * because the pointer points to an array instance on the stack. */ const ScTokenArray* CreateFormula( XclFormulaType eType, const XclTokenArray& rXclTokArr ); diff --git a/sc/source/filter/inc/xilink.hxx b/sc/source/filter/inc/xilink.hxx index 2f06ddb2f7b0..bd2b9c1267b9 100644 --- a/sc/source/filter/inc/xilink.hxx +++ b/sc/source/filter/inc/xilink.hxx @@ -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/inc/xiname.hxx b/sc/source/filter/inc/xiname.hxx index bf260a76548e..c31e654eebc2 100644 --- a/sc/source/filter/inc/xiname.hxx +++ b/sc/source/filter/inc/xiname.hxx @@ -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/inc/xipage.hxx b/sc/source/filter/inc/xipage.hxx index 5f8e7c6b3f70..d5ef49193916 100644 --- a/sc/source/filter/inc/xipage.hxx +++ b/sc/source/filter/inc/xipage.hxx @@ -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/inc/xipivot.hxx b/sc/source/filter/inc/xipivot.hxx index 72bb174b8d62..be29646956ea 100644 --- a/sc/source/filter/inc/xipivot.hxx +++ b/sc/source/filter/inc/xipivot.hxx @@ -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/inc/xiroot.hxx b/sc/source/filter/inc/xiroot.hxx index c53c09029bdc..68e39a1f534e 100644 --- a/sc/source/filter/inc/xiroot.hxx +++ b/sc/source/filter/inc/xiroot.hxx @@ -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/inc/xistream.hxx b/sc/source/filter/inc/xistream.hxx index 6dff1a867f2e..ee7319b6f72f 100644 --- a/sc/source/filter/inc/xistream.hxx +++ b/sc/source/filter/inc/xistream.hxx @@ -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/inc/xistring.hxx b/sc/source/filter/inc/xistring.hxx index f76e3af4321c..1dd1c501858e 100644 --- a/sc/source/filter/inc/xistring.hxx +++ b/sc/source/filter/inc/xistring.hxx @@ -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/inc/xistyle.hxx b/sc/source/filter/inc/xistyle.hxx index b4aa9e96d384..d8e7f370d02d 100644 --- a/sc/source/filter/inc/xistyle.hxx +++ b/sc/source/filter/inc/xistyle.hxx @@ -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/inc/xiview.hxx b/sc/source/filter/inc/xiview.hxx index 29c3f98bbb04..f5d37814b262 100644 --- a/sc/source/filter/inc/xiview.hxx +++ b/sc/source/filter/inc/xiview.hxx @@ -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/inc/xladdress.hxx b/sc/source/filter/inc/xladdress.hxx index 2152c19913c2..9b12fe51355f 100644 --- a/sc/source/filter/inc/xladdress.hxx +++ b/sc/source/filter/inc/xladdress.hxx @@ -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/inc/xlchart.hxx b/sc/source/filter/inc/xlchart.hxx index c6ebe7382c7b..6f63d71c13d4 100644 --- a/sc/source/filter/inc/xlchart.hxx +++ b/sc/source/filter/inc/xlchart.hxx @@ -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 @@ -1475,7 +1475,7 @@ struct XclChRootData const Rectangle& rChartRect ); /** Finishes the API chart document conversion. Must be called once before any API access. */ void FinishConversion(); - + /** Returns the drawing shape interface of the specified title object. */ ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetTitleShape( const XclChTextKey& rTitleKey ) const; diff --git a/sc/source/filter/inc/xlconst.hxx b/sc/source/filter/inc/xlconst.hxx index 0ce2025d3d0c..117d173dc4b9 100644 --- a/sc/source/filter/inc/xlconst.hxx +++ b/sc/source/filter/inc/xlconst.hxx @@ -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/inc/xlcontent.hxx b/sc/source/filter/inc/xlcontent.hxx index ae8f5c7dc7fd..68ce65ce0211 100644 --- a/sc/source/filter/inc/xlcontent.hxx +++ b/sc/source/filter/inc/xlcontent.hxx @@ -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/inc/xlescher.hxx b/sc/source/filter/inc/xlescher.hxx index c81df26fa0c1..e6cdc50f0aff 100644 --- a/sc/source/filter/inc/xlescher.hxx +++ b/sc/source/filter/inc/xlescher.hxx @@ -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/inc/xlformula.hxx b/sc/source/filter/inc/xlformula.hxx index 5dfdb3ca1c12..d89e01d6555d 100644 --- a/sc/source/filter/inc/xlformula.hxx +++ b/sc/source/filter/inc/xlformula.hxx @@ -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/inc/xllink.hxx b/sc/source/filter/inc/xllink.hxx index 760df8173055..1cba13d3a62d 100644 --- a/sc/source/filter/inc/xllink.hxx +++ b/sc/source/filter/inc/xllink.hxx @@ -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/inc/xlname.hxx b/sc/source/filter/inc/xlname.hxx index 4fbafb280f03..6e7e34fe8a4c 100644 --- a/sc/source/filter/inc/xlname.hxx +++ b/sc/source/filter/inc/xlname.hxx @@ -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/inc/xlpage.hxx b/sc/source/filter/inc/xlpage.hxx index dfed44b91afd..2accb869c604 100644 --- a/sc/source/filter/inc/xlpage.hxx +++ b/sc/source/filter/inc/xlpage.hxx @@ -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/inc/xlpivot.hxx b/sc/source/filter/inc/xlpivot.hxx index e46bf30dd398..2468b9314093 100644 --- a/sc/source/filter/inc/xlpivot.hxx +++ b/sc/source/filter/inc/xlpivot.hxx @@ -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/inc/xlroot.hxx b/sc/source/filter/inc/xlroot.hxx index e1261be05be0..d1772768737a 100644 --- a/sc/source/filter/inc/xlroot.hxx +++ b/sc/source/filter/inc/xlroot.hxx @@ -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/inc/xlstream.hxx b/sc/source/filter/inc/xlstream.hxx index e83b1068fc09..d006117a73c4 100644 --- a/sc/source/filter/inc/xlstream.hxx +++ b/sc/source/filter/inc/xlstream.hxx @@ -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/inc/xlstring.hxx b/sc/source/filter/inc/xlstring.hxx index 15adf3f919d9..2d1ac25d9d2d 100644 --- a/sc/source/filter/inc/xlstring.hxx +++ b/sc/source/filter/inc/xlstring.hxx @@ -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/inc/xlstyle.hxx b/sc/source/filter/inc/xlstyle.hxx index b9b1f1902b9e..d3bdd1901aed 100644 --- a/sc/source/filter/inc/xlstyle.hxx +++ b/sc/source/filter/inc/xlstyle.hxx @@ -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/inc/xltable.hxx b/sc/source/filter/inc/xltable.hxx index 7c276ea477e2..76aaa858288b 100644 --- a/sc/source/filter/inc/xltable.hxx +++ b/sc/source/filter/inc/xltable.hxx @@ -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/inc/xltools.hxx b/sc/source/filter/inc/xltools.hxx index 7ae02d758151..1663ad67e8c1 100644 --- a/sc/source/filter/inc/xltools.hxx +++ b/sc/source/filter/inc/xltools.hxx @@ -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 @@ -233,7 +233,7 @@ public: static void SkipSubStream( XclImpStream& rStrm ); // Basic macro names ------------------------------------------------------ - + /** Returns the full StarBasic macro URL from an Excel macro name. */ static ::rtl::OUString GetSbMacroUrl( const String& rMacroName, SfxObjectShell* pDocShell = 0 ); /** Returns the full StarBasic macro URL from an Excel module and macro name. */ diff --git a/sc/source/filter/inc/xltracer.hxx b/sc/source/filter/inc/xltracer.hxx index 3e4c6e87c9d4..27151cf812e2 100644 --- a/sc/source/filter/inc/xltracer.hxx +++ b/sc/source/filter/inc/xltracer.hxx @@ -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/inc/xlview.hxx b/sc/source/filter/inc/xlview.hxx index 0b2f91ad6e21..0aeb34a943eb 100644 --- a/sc/source/filter/inc/xlview.hxx +++ b/sc/source/filter/inc/xlview.hxx @@ -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 @@ -89,8 +89,8 @@ const sal_uInt16 EXC_ID_SCL = 0x00A0; // (0x0862) SHEETEXT ---------------------------------------------------------- -const sal_uInt16 EXC_ID_SHEETEXT = 0x0862; /// header id for sheetext -const sal_uInt8 EXC_SHEETEXT_TABCOLOR = 0x7F; /// mask for tab color +const sal_uInt16 EXC_ID_SHEETEXT = 0x0862; /// header id for sheetext +const sal_uInt8 EXC_SHEETEXT_TABCOLOR = 0x7F; /// mask for tab color const sal_uInt16 EXC_COLOR_NOTABBG = 0x7F; /// Excel ignores Tab color when set to this value... // Structs ==================================================================== diff --git a/sc/source/filter/lotus/expop.cxx b/sc/source/filter/lotus/expop.cxx index 33ecf7d87d07..a77c07f88157 100644 --- a/sc/source/filter/lotus/expop.cxx +++ b/sc/source/filter/lotus/expop.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 @@ -52,47 +52,47 @@ BYTE ExportWK1::GenFormByte( const ScPatternAttr& /*aAttr*/ ) inline void ExportWK1::Bof() -{ // (0x00) +{ // (0x00) aOut << ( USHORT ) 0x00 << ( USHORT ) 2 << ( USHORT ) 0x0406; // Version 1-2-3/2, Symhony/1.1 } inline void ExportWK1::Eof() -{ // (0x01) +{ // (0x01) aOut << ( USHORT ) 0x01 << ( USHORT ) 0; } inline void ExportWK1::Calcmode() -{ // (0x02) +{ // (0x02) // Calculationmode = automatic aOut << ( USHORT ) 0x02 << ( USHORT ) 1 << ( BYTE ) 0xFF; } inline void ExportWK1::Calcorder() -{ // (0x03) +{ // (0x03) // order = natural aOut << ( USHORT ) 0x03 << ( USHORT ) 1 << ( BYTE ) 0x00; } inline void ExportWK1::Split() -{ // (0x04) +{ // (0x04) // not split aOut << ( USHORT ) 0x04 << ( USHORT ) 1 << ( BYTE ) 0x00; } inline void ExportWK1::Sync() -{ // (0x05) +{ // (0x05) // not synchronized aOut << ( USHORT ) 0x05 << ( USHORT ) 1 << ( BYTE ) 0x00; } inline void ExportWK1::Dimensions() -{ // (0x06) +{ // (0x06) SCCOL nEndCol; SCROW nEndRow; aOut << ( USHORT ) 0x06 << ( USHORT ) 8 << ( USHORT ) 0 << ( USHORT ) 0; // Starting Col/Row @@ -109,7 +109,7 @@ inline void ExportWK1::Dimensions() inline void ExportWK1::Window1() -{ // (0x07) +{ // (0x07) aOut << ( USHORT ) 0x07 << ( USHORT ) 32 << ( USHORT ) 0 << ( USHORT ) 0 // Cursor Col/Row << ( BYTE ) 0xFF // Format: protected, special, default @@ -127,10 +127,10 @@ inline void ExportWK1::Window1() inline void ExportWK1::Colw() -{ // (0x08) +{ // (0x08) // ACHTUNG: muss nach Window1 und vor hidden cols record kommen! - USHORT nWidth; - BYTE nWidthSpaces; + USHORT nWidth; + BYTE nWidthSpaces; for( USHORT nCol = 0 ; nCol < 256 ; nCol++ ) { nWidth = pD->GetColWidth( static_cast<SCCOL>(nCol), 0 ); @@ -141,7 +141,7 @@ inline void ExportWK1::Colw() void ExportWK1::Blank( const USHORT nCol, const USHORT nRow, const ScPatternAttr& aAttr ) -{ // (0x0C) +{ // (0x0C) // PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Blank(): Col > WK1MAXCOL" ); DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Blank(): Row > WK1MAXROW" ); @@ -151,7 +151,7 @@ void ExportWK1::Blank( const USHORT nCol, const USHORT nRow, const ScPatternAttr void ExportWK1::Number( const USHORT nCol, const USHORT nRow, const double fWert, const ScPatternAttr &aAttr ) -{ // (0x0E) +{ // (0x0E) // PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Number(): Col > WK1MAXCOL" ); DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Number(): Row > WK1MAXROW" ); @@ -161,16 +161,16 @@ void ExportWK1::Number( const USHORT nCol, const USHORT nRow, const double fWert void ExportWK1::Label( const USHORT nCol, const USHORT nRow, const String& rStr, const ScPatternAttr& aAttr ) -{ // (0x0F) +{ // (0x0F) // PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Label(): Col > WK1MAXCOL" ); DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Label(): Row > WK1MAXROW" ); - ByteString aStr( rStr, eZielChar ); + ByteString aStr( rStr, eZielChar ); - USHORT nLaenge = 7; // Anzahl Bytes vor String+Nullbyte am Ende + Alignment-Char + USHORT nLaenge = 7; // Anzahl Bytes vor String+Nullbyte am Ende + Alignment-Char - xub_StrLen nAnz = aStr.Len(); + xub_StrLen nAnz = aStr.Len(); if( nAnz > 240 ) // max. 240 Zeichen im String @@ -188,13 +188,13 @@ void ExportWK1::Label( const USHORT nCol, const USHORT nRow, const String& rStr, void ExportWK1::Formula( const USHORT nCol, const USHORT nRow, const ScFormulaCell* pFC, const ScPatternAttr& aAttr ) -{ // (0x10) +{ // (0x10) // PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Formula(): Col > WK1MAXCOL" ); DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Formula(): Row > WK1MAXROW" ); - USHORT nLaenge = 15; // Bytes bis Formel - double fErgebnis; + USHORT nLaenge = 15; // Bytes bis Formel + double fErgebnis; // zunaechst nur Dummy-Angaben (Formel := Ergebnis der Berechnung ) nLaenge += 9+1; @@ -212,14 +212,14 @@ void ExportWK1::Formula( const USHORT nCol, const USHORT nRow, const ScFormulaCe inline void ExportWK1::Protect() -{ // (0x24) +{ // (0x24) //Global protection off aOut << ( USHORT ) 0x24 << ( USHORT ) 1 << ( BYTE ) 0x00; } inline void ExportWK1::Footer() -{ // (0x25) +{ // (0x25) // zunaechst nur leerer C-String aOut << ( USHORT ) 0x25 << ( USHORT ) 242 << ( sal_Char ) '\''; // linksbuendiger leerer String for( short nLauf = 0 ; nLauf < 241 ; nLauf++ ) @@ -228,7 +228,7 @@ inline void ExportWK1::Footer() inline void ExportWK1::Header() -{ // (0x26) +{ // (0x26) // zunaechst nur leerer C-String aOut << ( USHORT ) 0x26 << ( USHORT ) 242 << ( sal_Char ) '\''; // linksbuendiger leerer String for( short nLauf = 0 ; nLauf < 241 ; nLauf++ ) @@ -237,7 +237,7 @@ inline void ExportWK1::Header() inline void ExportWK1::Margins() -{ // (0x28) +{ // (0x28) aOut << ( USHORT ) 0x28 << ( USHORT ) 10 << ( USHORT ) 4 << ( USHORT ) 76 // Left/right margin << ( USHORT ) 66 // Page length @@ -246,28 +246,28 @@ inline void ExportWK1::Margins() inline void ExportWK1::Labelfmt() -{ // (0x29) +{ // (0x29) // Global label alignment = left aOut << ( USHORT ) 0x29 << ( USHORT ) 1 << ( BYTE ) 0x27; } inline void ExportWK1::Calccount() -{ // (0x2F) +{ // (0x2F) // Iteration count = 16 (oder so aehnlich) aOut << ( USHORT ) 0x2F << ( USHORT ) 1 << ( BYTE ) 16; } inline void ExportWK1::Cursorw12() -{ // (0x31) +{ // (0x31) // Cursor location in window 1 aOut << ( USHORT ) 0x31 << ( USHORT ) 1 << ( BYTE ) 1; } void ExportWK1::WKString( const USHORT /*nCol*/, const USHORT /*nRow*/, const ScFormulaCell* /*pFC*/, const ScPatternAttr& /*aAttr*/ ) -{ // (0x33) +{ // (0x33) // PREC: nCol <= WK1MAXCOL, nRow <= WK1MAXROW /* DBG_ASSERT( nCol <= WK1MAXCOL, "ExportWK1::Label(): Col > WK1MAXCOL" ); DBG_ASSERT( nRow <= WK1MAXROW, "ExportWK1::Label(): Row > WK1MAXROW" ); @@ -297,7 +297,7 @@ void ExportWK1::WKString( const USHORT /*nCol*/, const USHORT /*nRow*/, const Sc inline void ExportWK1::Snrange() -{ // (0x47) +{ // (0x47) //aOut << ( USHORT ) 0x47 << ( USHORT ) x /* ScRangeName *pRanges = pD->GetRangeName(); ScRangeData *pData; @@ -315,7 +315,7 @@ inline void ExportWK1::Snrange() inline void ExportWK1::Hidcol() -{ // (0x64) +{ // (0x64) sal_uInt32 nHide = 0x00000000; // ...niemand ist versteckt aOut << ( USHORT ) 0x64 << ( USHORT ) 32; @@ -326,7 +326,7 @@ inline void ExportWK1::Hidcol() inline void ExportWK1::Cpi() -{ // (0x96) +{ // (0x96) //aOut << ( USHORT ) 0x96 << ( USHORT ) x; } @@ -353,15 +353,15 @@ FltError ExportWK1::Write() //Labelfmt(); // Zellen-Bemachung - ScDocumentIterator aIter( pD, 0, 0 ); - ScBaseCell* pCell; - USHORT nCol, nRow; - SCTAB nTab; - const ScPatternAttr* pPatAttr; + ScDocumentIterator aIter( pD, 0, 0 ); + ScBaseCell* pCell; + USHORT nCol, nRow; + SCTAB nTab; + const ScPatternAttr* pPatAttr; if( aIter.GetFirst() ) do - { // ueber alle Zellen der ersten Tabelle iterieren + { // ueber alle Zellen der ersten Tabelle iterieren pPatAttr = aIter.GetPattern(); pCell = aIter.GetCell(); SCCOL nScCol; @@ -377,14 +377,14 @@ FltError ExportWK1::Write() { case CELLTYPE_VALUE: { - double fVal; + double fVal; fVal = ( ( ScValueCell * ) pCell)->GetValue(); Number( nCol, nRow, fVal, *pPatAttr ); } break; case CELLTYPE_STRING: { - String aStr; + String aStr; ( ( ScStringCell * ) pCell)->GetString( aStr ); Label( nCol, nRow, aStr, *pPatAttr ); } diff --git a/sc/source/filter/lotus/export.cxx b/sc/source/filter/lotus/export.cxx index 5ca8cc7c6f49..96166cd4e593 100644 --- a/sc/source/filter/lotus/export.cxx +++ b/sc/source/filter/lotus/export.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/lotus/filter.cxx b/sc/source/filter/lotus/filter.cxx index d521aec97315..809b447c51fb 100644 --- a/sc/source/filter/lotus/filter.cxx +++ b/sc/source/filter/lotus/filter.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 @@ -54,38 +54,38 @@ #include "op.h" // Konstanten ------------------------------------------------------------ -const UINT16 nBOF = 0x0000; +const UINT16 nBOF = 0x0000; // externe Variablen ----------------------------------------------------- -extern WKTYP eTyp; // Typ der gerade in bearbeitung befindlichen Datei -WKTYP eTyp; +extern WKTYP eTyp; // Typ der gerade in bearbeitung befindlichen Datei +WKTYP eTyp; -extern BOOL bEOF; // zeigt Ende der Datei -BOOL bEOF; +extern BOOL bEOF; // zeigt Ende der Datei +BOOL bEOF; -extern CharSet eCharNach; // Zeichenkonvertierung von->nach -CharSet eCharNach; +extern CharSet eCharNach; // Zeichenkonvertierung von->nach +CharSet eCharNach; -extern CharSet eCharVon; -CharSet eCharVon; +extern CharSet eCharVon; +CharSet eCharVon; -extern ScDocument* pDoc; // Aufhaenger zum Dokumentzugriff -ScDocument* pDoc; +extern ScDocument* pDoc; // Aufhaenger zum Dokumentzugriff +ScDocument* pDoc; -extern sal_Char* pPuffer; // -> memory.cxx -extern sal_Char* pDummy1; // -> memory.cxx +extern sal_Char* pPuffer; // -> memory.cxx +extern sal_Char* pDummy1; // -> memory.cxx -extern OPCODE_FKT pOpFkt[ FKT_LIMIT ]; +extern OPCODE_FKT pOpFkt[ FKT_LIMIT ]; // -> optab.cxx, Tabelle moeglicher Opcodes -extern OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ]; +extern OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ]; // -> optab.cxx, Table of possible Opcodes -extern long nDateiLaenge; // -> datei.cpp, ...der gerade offenen Datei +extern long nDateiLaenge; // -> datei.cpp, ...der gerade offenen Datei -LOTUS_ROOT* pLotusRoot = NULL; +LOTUS_ROOT* pLotusRoot = NULL; std::map<UINT16, ScPatternAttr> aLotusPatternPool; @@ -108,9 +108,9 @@ generate_Opcodes( SvStream& aStream, ScDocument& rDoc, pOps = pOpFkt123; nOps = FKT_LIMIT123; break; - case eWK3: return eERR_NI; - case eWK_Error: return eERR_FORMAT; - default: return eERR_UNKN_WK; + case eWK3: return eERR_NI; + case eWK_Error: return eERR_FORMAT; + default: return eERR_UNKN_WK; } // #i76299# seems that SvStream::IsEof() does not work correctly @@ -168,7 +168,7 @@ WKTYP ScanVersion( SvStream& aStream ) { // PREC: pWKDatei: Zeiger auf offene Datei // POST: return: Typ der Datei - UINT16 nOpcode, nVersNr, nRecLen; + UINT16 nOpcode, nVersNr, nRecLen; // erstes Byte muss wegen BOF zwingend 0 sein! aStream >> nOpcode; @@ -198,7 +198,7 @@ WKTYP ScanVersion( SvStream& aStream ) aStream >> nVersNr; if( aStream.IsEof() ) return eWK_Error; if( nVersNr == 0x0004 && nRecLen == 26 ) - { // 4 Bytes von 26 gelesen->22 ueberlesen + { // 4 Bytes von 26 gelesen->22 ueberlesen aStream.Read( pDummy1, 22 ); return eWK3; } diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index 1644ee51856a..1f290c5451a9 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.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 @@ -116,7 +116,7 @@ LotAttrCache::LotAttrCache( void ) LotAttrCache::~LotAttrCache() { - ENTRY* pAkt = ( ENTRY* ) List::First(); + ENTRY* pAkt = ( ENTRY* ) List::First(); while( pAkt ) { @@ -136,8 +136,8 @@ LotAttrCache::~LotAttrCache() const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) { - UINT32 nRefHash; - ENTRY* pAkt = ( ENTRY* ) List::First(); + UINT32 nRefHash; + ENTRY* pAkt = ( ENTRY* ) List::First(); MakeHash( rAttr, nRefHash ); @@ -150,8 +150,8 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) } // neues PatternAttribute erzeugen - ScPatternAttr* pNewPatt = new ScPatternAttr( pDocPool ); - SfxItemSet& rItemSet = pNewPatt->GetItemSet(); + ScPatternAttr* pNewPatt = new ScPatternAttr( pDocPool ); + SfxItemSet& rItemSet = pNewPatt->GetItemSet(); pAkt = new ENTRY( pNewPatt ); pAkt->nHash0 = nRefHash; @@ -161,8 +161,8 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) UINT8 nLine = rAttr.nLineStyle; if( nLine ) { - SvxBoxItem aBox( ATTR_BORDER ); - SvxBorderLine aTop, aLeft, aBottom, aRight; + SvxBoxItem aBox( ATTR_BORDER ); + SvxBorderLine aTop, aLeft, aBottom, aRight; LotusToScBorderLine( nLine, aLeft ); nLine >>= 2; @@ -180,7 +180,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) rItemSet.Put( aBox ); } - UINT8 nFontCol = rAttr.nFontCol & 0x07; + UINT8 nFontCol = rAttr.nFontCol & 0x07; if( nFontCol ) { // nFontCol > 0 @@ -216,7 +216,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr ) { DBG_ASSERT( ValidRow(nRow), "*LotAttrCol::SetAttr(): ... und rums?!" ); - ENTRY* pAkt = ( ENTRY* ) List::Last(); + ENTRY* pAkt = ( ENTRY* ) List::Last(); if( pAkt ) { @@ -232,7 +232,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr ) } } else - { // erster Eintrag + { // erster Eintrag pAkt = new ENTRY; pAkt->pPattAttr = &rAttr; pAkt->nFirstRow = pAkt->nLastRow = nRow; @@ -243,8 +243,8 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr ) void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const BOOL /*bClear*/ ) { - ScDocument* pDoc = pLotusRoot->pDoc; - ENTRY* pAkt = ( ENTRY* ) List::First(); + ScDocument* pDoc = pLotusRoot->pDoc; + ENTRY* pAkt = ( ENTRY* ) List::First(); while( pAkt ) { @@ -258,7 +258,7 @@ void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const BOOL /*b void LotAttrCol::Clear( void ) { - ENTRY* pAkt = ( ENTRY* ) List::First(); + ENTRY* pAkt = ( ENTRY* ) List::First(); while( pAkt ) { @@ -281,8 +281,8 @@ LotAttrTable::~LotAttrTable() void LotAttrTable::SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const SCROW nRow, const LotAttrWK3& rAttr ) { - const ScPatternAttr& rPattAttr = aAttrCache.GetPattAttr( rAttr ); - SCCOL nColCnt; + const ScPatternAttr& rPattAttr = aAttrCache.GetPattAttr( rAttr ); + SCCOL nColCnt; for( nColCnt = nColFirst ; nColCnt <= nColLast ; nColCnt++ ) pCols[ nColCnt ].SetAttr( nRow, rPattAttr ); @@ -291,9 +291,9 @@ void LotAttrTable::SetAttr( const SCCOL nColFirst, const SCCOL nColLast, const S void LotAttrTable::Apply( const SCTAB nTabNum ) { - SCCOL nColCnt; + SCCOL nColCnt; for( nColCnt = 0 ; nColCnt <= MAXCOL ; nColCnt++ ) - pCols[ nColCnt ].Apply( nColCnt, nTabNum ); // macht auch gleich ein Clear() am Ende + pCols[ nColCnt ].Apply( nColCnt, nTabNum ); // macht auch gleich ein Clear() am Ende } diff --git a/sc/source/filter/lotus/lotform.cxx b/sc/source/filter/lotus/lotform.cxx index c307af332680..bd5140072b5f 100644 --- a/sc/source/filter/lotus/lotform.cxx +++ b/sc/source/filter/lotus/lotform.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 @@ -44,36 +44,36 @@ #include <math.h> -extern WKTYP eTyp; +extern WKTYP eTyp; -static const sal_Char* GetAddInName( const UINT8 nIndex ); +static const sal_Char* GetAddInName( const UINT8 nIndex ); -static DefTokenId lcl_KnownAddIn( const ByteString& sTest ); +static DefTokenId lcl_KnownAddIn( const ByteString& sTest ); //extern double decipher_Number123( UINT32 nValue ); void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString ) { - TokenId eParam[ 256 ]; - INT32 nLauf; - TokenId nMerk0, nMerk1; + TokenId eParam[ 256 ]; + INT32 nLauf; + TokenId nMerk0, nMerk1; - BOOL bAddIn = FALSE; - BOOL bNeg = FALSE; + BOOL bAddIn = FALSE; + BOOL bNeg = FALSE; DBG_ASSERT( nAnz < 128, "-LotusToSc::DoFunc(): Neee! -so viel kann ich nicht!" ); if( eOc == ocNoName ) { - ByteString t; + ByteString t; if( pExtString ) { - const ByteString s( "@<<@123>>" ); + const ByteString s( "@<<@123>>" ); t = pExtString; - xub_StrLen n = t.Search( s ); + xub_StrLen n = t.Search( s ); if( n != STRING_NOTFOUND ) t.Erase( 0, n + s.Len() ); @@ -148,10 +148,10 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString ) DBG_ASSERT( nAnz == 3, "*LotusToSc::DoFunc(): ZINS() hat 3 Parameter!" ); nAnz = 4; - eParam[ 3 ] = eParam[ 0 ]; // 3. -> 1. - eParam[ 0 ] = eParam[ 2 ]; // 1. -> 4. - NegToken( eParam[ 1 ] ); // 2. -> -2. (+ 2. -> 3.) - eParam[ 2 ] = n0Token; // -> 2. als Default + eParam[ 3 ] = eParam[ 0 ]; // 3. -> 1. + eParam[ 0 ] = eParam[ 2 ]; // 1. -> 4. + NegToken( eParam[ 1 ] ); // 2. -> -2. (+ 2. -> 3.) + eParam[ 2 ] = n0Token; // -> 2. als Default } break; default:; @@ -166,13 +166,13 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString ) if( nAnz > 0 ) { - INT16 nNull = -1; // gibt einen auszulassenden Parameter an + INT16 nNull = -1; // gibt einen auszulassenden Parameter an // ACHTUNG: 0 ist der letzte Parameter, nAnz-1 der erste INT16 nLast = nAnz - 1; if( eOc == ocRMZ ) - { // Extrawurst ocRMZ letzter Parameter negiert! + { // Extrawurst ocRMZ letzter Parameter negiert! // zusaetzlich: 1. -> 3., 3. -> 2., 2. -> 1. DBG_ASSERT( nAnz == 3, "+LotusToSc::DoFunc(): ocRMZ hat genau 3 Parameter!" ); @@ -180,7 +180,7 @@ void LotusToSc::DoFunc( DefTokenId eOc, BYTE nAnz, const sal_Char* pExtString ) << ocNegSub << eParam[ 2 ]; } else - { // Normalfall + { // Normalfall // [Parameter{;Parameter}] aPool << eParam[ nLast ]; @@ -304,8 +304,8 @@ void LotusToSc::LotusRelToScRel( UINT16 nCol, UINT16 nRow, ScSingleRefData& rSRD void LotusToSc::ReadSRD( ScSingleRefData& rSRD, BYTE nRelBit ) { - BYTE nTab, nCol; - UINT16 nRow; + BYTE nTab, nCol; + UINT16 nRow; Read( nRow ); Read( nTab ); @@ -381,31 +381,31 @@ typedef DefTokenId ( FuncType2 ) ( BYTE ); ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, const FORMULA_TYPE /*eFT*/ ) { - BYTE nOc; - BYTE nAnz; - BYTE nRelBits; - UINT16 nStrLen; - UINT16 nRngIndex; - FUNC_TYPE eType = FT_NOP; - TokenId nMerk0; - DefTokenId eOc; + BYTE nOc; + BYTE nAnz; + BYTE nRelBits; + UINT16 nStrLen; + UINT16 nRngIndex; + FUNC_TYPE eType = FT_NOP; + TokenId nMerk0; + DefTokenId eOc; const sal_Char* pExtName = 0; - RangeNameBufferWK3& rRangeNameBufferWK3 = *pLotusRoot->pRngNmBffWK3; + RangeNameBufferWK3& rRangeNameBufferWK3 = *pLotusRoot->pRngNmBffWK3; - ScComplexRefData aCRD; + ScComplexRefData aCRD; aCRD.InitFlags(); - ScSingleRefData& rR = aCRD.Ref1; + ScSingleRefData& rR = aCRD.Ref1; - LR_ID nId; - TokenId nNewId; + LR_ID nId; + TokenId nNewId; - LotusRangeList& rRangeList = *pLotusRoot->pRangeNames; + LotusRangeList& rRangeList = *pLotusRoot->pRangeNames; - FuncType1* pIndexToType; - FuncType2* pIndexToToken; + FuncType1* pIndexToType; + FuncType2* pIndexToToken; if( bWK3 ) - { // for > WK3 + { // for > WK3 pIndexToType = IndexToTypeWK123; pIndexToToken = IndexToTokenWK123; } @@ -429,7 +429,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, nBytesLeft = rRest; - while( eType ) // != FT_Return (==0) + while( eType ) // != FT_Return (==0) { Read( nOc ); @@ -448,16 +448,16 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, { case FT_Return: if( bWK3 || bWK123 ) - nBytesLeft = 0; // wird ab WK3 nicht benutzt + nBytesLeft = 0; // wird ab WK3 nicht benutzt rRest = nBytesLeft; break; case FT_NotImpl: - case FT_FuncFix0: DoFunc( eOc, 0, pExtName ); break; - case FT_FuncFix1: DoFunc( eOc, 1, pExtName ); break; - case FT_FuncFix2: DoFunc( eOc, 2, pExtName ); break; - case FT_FuncFix3: DoFunc( eOc, 3, pExtName ); break; - case FT_FuncFix4: DoFunc( eOc, 4, pExtName ); break; + case FT_FuncFix0: DoFunc( eOc, 0, pExtName ); break; + case FT_FuncFix1: DoFunc( eOc, 1, pExtName ); break; + case FT_FuncFix2: DoFunc( eOc, 2, pExtName ); break; + case FT_FuncFix3: DoFunc( eOc, 3, pExtName ); break; + case FT_FuncFix4: DoFunc( eOc, 4, pExtName ); break; case FT_FuncVar: Read( nAnz ); DoFunc( eOc, nAnz, pExtName ); @@ -473,14 +473,14 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, break; case FT_ConstFloat: { - double fDouble; + double fDouble; Read( fDouble ); aStack << aPool.Store( fDouble ); } break; case FT_Variable: { - UINT16 nCol, nRow; + UINT16 nCol, nRow; Read( nCol ); Read( nRow ); @@ -504,7 +504,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, break; case FT_Range: { - UINT16 nColS, nRowS, nColE, nRowE; + UINT16 nColS, nRowS, nColE, nRowE; Read( nColS ); Read( nRowS ); Read( nColE ); @@ -536,7 +536,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, break; case FT_ConstInt: { - INT16 nVal; + INT16 nVal; Read( nVal ); aStack << aPool.Store( ( double ) nVal ); } @@ -568,7 +568,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, aStack << aPool.Store( nRngIndex ); else { - String aText( RTL_CONSTASCII_USTRINGPARAM( "NRREF " ) ); + String aText( RTL_CONSTASCII_USTRINGPARAM( "NRREF " ) ); aText += aTmp; aStack << aPool.Store( aText ); } @@ -581,7 +581,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, aStack << aPool.Store( nRngIndex ); else { - String aText( RTL_CONSTASCII_USTRINGPARAM( "ABSNREF " ) ); + String aText( RTL_CONSTASCII_USTRINGPARAM( "ABSNREF " ) ); aText += aTmp; aStack << aPool.Store( aText ); } @@ -609,8 +609,8 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, if( nStrLen ) { -// String t( ReadString( aIn, nStrLen, eSrcChar ) ); - sal_Char* p = new sal_Char[ nStrLen + 1 ]; +// String t( ReadString( aIn, nStrLen, eSrcChar ) ); + sal_Char* p = new sal_Char[ nStrLen + 1 ]; aIn.Read( p, nStrLen ); p[ nStrLen ] = 0x00; @@ -658,7 +658,7 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, DBG_ASSERT( nBytesLeft <= 0, "*LotusToSc::Convert(): wat is mit'm Rest?" ); if( rRest ) - aIn.SeekRel( nBytesLeft ); // eventuellen Rest/Ueberlauf korrigieren + aIn.SeekRel( nBytesLeft ); // eventuellen Rest/Ueberlauf korrigieren rRest = 0; @@ -669,263 +669,263 @@ ConvErr LotusToSc::Convert( const ScTokenArray*& rpErg, INT32& rRest, FUNC_TYPE LotusToSc::IndexToType( BYTE nIndex ) { static const FUNC_TYPE pType[ 256 ] = - { // Code Bezeichnung - FT_ConstFloat, // 0 8-Byte-IEEE-Float - FT_Variable, // 1 Variable - FT_Range, // 2 Bereich - FT_Return, // 3 return - FT_Braces, // 4 Klammer - FT_ConstInt, // 5 2-Byte-Integer - FT_ConstString, // 6 ASCII-String - FT_NOP, // 7 NOP - FT_Neg, // 8 Negation - FT_Op, // 9 Addition - FT_Op, // 10 Subtraktion - FT_Op, // 11 Multiplikation - FT_Op, // 12 Division - FT_Op, // 13 Potenzierung - FT_Op, // 14 Gleichheit - FT_Op, // 15 Ungleich - FT_Op, // 16 Kleiner-gleich - FT_Op, // 17 Groesser-gleich - FT_Op, // 18 Kleiner - FT_Op, // 19 Groesser - FT_Op, // 20 And (logisch) - FT_Op, // 21 Or (logisch) - FT_FuncFix1, // 22 Not (logisch) - FT_NOP, // 23 unaeres Plus - FT_NotImpl, // 24 - FT_NotImpl, // 25 - FT_NotImpl, // 26 - FT_NotImpl, // 27 - FT_NotImpl, // 28 - FT_NotImpl, // 29 - FT_NotImpl, // 30 - FT_FuncFix0, // 31 Not applicable - FT_FuncFix0, // 32 Error - FT_FuncFix1, // 33 Betrag ABS() - FT_FuncFix1, // 34 Ganzzahl INT() - FT_FuncFix1, // 35 Quadratwurzel - FT_FuncFix1, // 36 Zehnerlogarithmus - FT_FuncFix1, // 37 Natuerlicher Logarithmus - FT_FuncFix0, // 38 PI - FT_FuncFix1, // 39 Sinus - FT_FuncFix1, // 40 Cosinus - FT_FuncFix1, // 41 Tangens - FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) <----- richtig? - - FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant) - FT_FuncFix1, // 44 Arcus-Sinus - FT_FuncFix1, // 45 Arcus-Cosinus - FT_FuncFix1, // 46 Exponentialfunktion - FT_FuncFix2, // 47 Modulo - FT_FuncVar, // 48 Auswahl - FT_FuncFix1, // 49 Is not applicable? - FT_FuncFix1, // 50 Is Error? - FT_FuncFix0, // 51 FALSE - FT_FuncFix0, // 52 TRUE - FT_FuncFix0, // 53 Zufallszahl - FT_FuncFix3, // 54 Datum - FT_FuncFix0, // 55 Heute - FT_FuncFix3, // 56 Payment - FT_FuncFix3, // 57 Present Value - FT_FuncFix3, // 58 Future Value - FT_FuncFix3, // 59 If ... then ... else ... - FT_FuncFix1, // 60 Tag des Monats - FT_FuncFix1, // 61 Monat - FT_FuncFix1, // 62 Jahr - FT_FuncFix2, // 63 Runden - FT_FuncFix3, // 64 Zeit - FT_FuncFix1, // 65 Stunde - FT_FuncFix1, // 66 Minute - FT_FuncFix1, // 67 Sekunde - FT_FuncFix1, // 68 Ist Zahl? - FT_FuncFix1, // 69 Ist Text? - FT_FuncFix1, // 70 Len() - FT_FuncFix1, // 71 Val() - FT_FuncFix2, // 72 String() - FT_FuncFix3, // 73 Mid() - FT_FuncFix1, // 74 Char() - FT_FuncFix1, // 75 Ascii() - FT_FuncFix3, // 76 Find() - FT_FuncFix1, // 77 Datevalue - FT_FuncFix1, // 78 Timevalue - FT_FuncFix1, // 79 Cellpointer - FT_FuncVar, // 80 Sum() - FT_FuncVar, // 81 Avg() - FT_FuncVar, // 82 Cnt() - FT_FuncVar, // 83 Min() - FT_FuncVar, // 84 Max() - FT_FuncFix3, // 85 Vlookup() - FT_FuncFix2, // 86 Npv() - FT_FuncVar, // 87 Var() - FT_FuncVar, // 88 Std() - FT_FuncFix2, // 89 Irr() - FT_FuncFix3, // 90 Hlookup() - FT_FuncFix3, // 91 ? - FT_FuncFix3, // 92 ? - FT_FuncFix3, // 93 ? - FT_FuncFix3, // 94 ? - FT_FuncFix3, // 95 ? - FT_FuncFix3, // 96 ? - FT_FuncFix3, // 97 ? - FT_FuncFix3, // 98 Index() <- richtig? - - FT_FuncFix1, // 99 Cols() - FT_FuncFix1, // 100 Rows() - FT_FuncFix2, // 101 Repeat() - FT_FuncFix1, // 102 Upper() - FT_FuncFix1, // 103 Lower() - FT_FuncFix2, // 104 Left() - FT_FuncFix2, // 105 Right() - FT_FuncFix4, // 106 Replace() - FT_FuncFix1, // 107 Proper() - FT_FuncFix2, // 108 Cell() - FT_FuncFix1, // 109 Trim() - FT_FuncFix1, // 110 Clean() - FT_FuncFix1, // 111 F() - FT_FuncFix1, // 112 Wert() (oder W()?) - FT_FuncFix2, // 113 Exact() - FT_NotImpl, // 114 Call() - FT_FuncFix1, // 115 @@() - FT_FuncFix3, // 116 Rate() - FT_FuncFix1, // 117 Term() - FT_FuncFix1, // 118 Cterm() - FT_FuncFix3, // 119 Sln() - FT_FuncFix4, // 120 Syd(), Soy() - FT_FuncFix4, // 121 Ddb() - FT_NotImpl, // 122 - FT_NotImpl, // 123 - FT_NotImpl, // 124 - FT_NotImpl, // 125 - FT_NotImpl, // 126 - FT_NotImpl, // 127 - FT_NotImpl, // 128 - FT_NotImpl, // 129 - FT_NotImpl, // 130 - FT_NotImpl, // 131 - FT_NotImpl, // 132 - FT_NotImpl, // 133 - FT_NotImpl, // 134 - FT_NotImpl, // 135 - FT_NotImpl, // 136 - FT_NotImpl, // 137 - FT_NotImpl, // 138 - FT_NotImpl, // 139 - FT_NotImpl, // 140 - FT_NotImpl, // 141 - FT_NotImpl, // 142 - FT_NotImpl, // 143 - FT_NotImpl, // 144 - FT_NotImpl, // 145 - FT_NotImpl, // 146 - FT_NotImpl, // 147 - FT_NotImpl, // 148 - FT_NotImpl, // 149 - FT_NotImpl, // 150 - FT_NotImpl, // 151 - FT_NotImpl, // 152 - FT_NotImpl, // 153 - FT_NotImpl, // 154 - FT_NotImpl, // 155 - FT_FuncVar, // 156 ? - FT_NotImpl, // 157 - FT_NotImpl, // 158 - FT_NotImpl, // 159 - FT_NotImpl, // 160 - FT_NotImpl, // 161 - FT_NotImpl, // 162 - FT_NotImpl, // 163 - FT_NotImpl, // 164 - FT_NotImpl, // 165 - FT_NotImpl, // 166 - FT_NotImpl, // 167 - FT_NotImpl, // 168 - FT_NotImpl, // 169 - FT_NotImpl, // 170 - FT_NotImpl, // 171 - FT_NotImpl, // 172 - FT_NotImpl, // 173 - FT_NotImpl, // 174 - FT_NotImpl, // 175 - FT_NotImpl, // 176 - FT_NotImpl, // 177 - FT_NotImpl, // 178 - FT_NotImpl, // 179 - FT_NotImpl, // 180 - FT_NotImpl, // 181 - FT_NotImpl, // 182 - FT_NotImpl, // 183 - FT_NotImpl, // 184 - FT_NotImpl, // 185 - FT_NotImpl, // 186 - FT_NotImpl, // 187 - FT_NotImpl, // 188 - FT_NotImpl, // 189 - FT_NotImpl, // 190 - FT_NotImpl, // 191 - FT_NotImpl, // 192 - FT_NotImpl, // 193 - FT_NotImpl, // 194 - FT_NotImpl, // 195 - FT_NotImpl, // 196 - FT_NotImpl, // 197 - FT_NotImpl, // 198 - FT_NotImpl, // 199 - FT_NotImpl, // 200 - FT_NotImpl, // 201 - FT_NotImpl, // 202 - FT_NotImpl, // 203 - FT_NotImpl, // 204 - FT_NotImpl, // 205 - FT_FuncVar, // 206 ? - FT_NotImpl, // 207 - FT_NotImpl, // 208 - FT_NotImpl, // 209 - FT_NotImpl, // 210 - FT_NotImpl, // 211 - FT_NotImpl, // 212 - FT_NotImpl, // 213 - FT_NotImpl, // 214 - FT_NotImpl, // 215 - FT_NotImpl, // 216 - FT_NotImpl, // 217 - FT_NotImpl, // 218 - FT_NotImpl, // 219 - FT_NotImpl, // 220 - FT_NotImpl, // 221 - FT_NotImpl, // 222 - FT_NotImpl, // 223 - FT_NotImpl, // 224 - FT_NotImpl, // 225 - FT_NotImpl, // 226 - FT_NotImpl, // 227 - FT_NotImpl, // 228 - FT_NotImpl, // 229 - FT_NotImpl, // 230 - FT_NotImpl, // 231 - FT_NotImpl, // 232 - FT_NotImpl, // 233 - FT_NotImpl, // 234 - FT_NotImpl, // 235 - FT_NotImpl, // 236 - FT_NotImpl, // 237 - FT_NotImpl, // 238 - FT_NotImpl, // 239 - FT_NotImpl, // 240 - FT_NotImpl, // 241 - FT_NotImpl, // 242 - FT_NotImpl, // 243 - FT_NotImpl, // 244 - FT_NotImpl, // 245 - FT_NotImpl, // 246 - FT_NotImpl, // 247 - FT_NotImpl, // 248 - FT_NotImpl, // 249 - FT_NotImpl, // 250 - FT_NotImpl, // 251 - FT_NotImpl, // 252 - FT_NotImpl, // 253 - FT_NotImpl, // 254 - FT_FuncVar, // 255 ? + { // Code Bezeichnung + FT_ConstFloat, // 0 8-Byte-IEEE-Float + FT_Variable, // 1 Variable + FT_Range, // 2 Bereich + FT_Return, // 3 return + FT_Braces, // 4 Klammer + FT_ConstInt, // 5 2-Byte-Integer + FT_ConstString, // 6 ASCII-String + FT_NOP, // 7 NOP + FT_Neg, // 8 Negation + FT_Op, // 9 Addition + FT_Op, // 10 Subtraktion + FT_Op, // 11 Multiplikation + FT_Op, // 12 Division + FT_Op, // 13 Potenzierung + FT_Op, // 14 Gleichheit + FT_Op, // 15 Ungleich + FT_Op, // 16 Kleiner-gleich + FT_Op, // 17 Groesser-gleich + FT_Op, // 18 Kleiner + FT_Op, // 19 Groesser + FT_Op, // 20 And (logisch) + FT_Op, // 21 Or (logisch) + FT_FuncFix1, // 22 Not (logisch) + FT_NOP, // 23 unaeres Plus + FT_NotImpl, // 24 + FT_NotImpl, // 25 + FT_NotImpl, // 26 + FT_NotImpl, // 27 + FT_NotImpl, // 28 + FT_NotImpl, // 29 + FT_NotImpl, // 30 + FT_FuncFix0, // 31 Not applicable + FT_FuncFix0, // 32 Error + FT_FuncFix1, // 33 Betrag ABS() + FT_FuncFix1, // 34 Ganzzahl INT() + FT_FuncFix1, // 35 Quadratwurzel + FT_FuncFix1, // 36 Zehnerlogarithmus + FT_FuncFix1, // 37 Natuerlicher Logarithmus + FT_FuncFix0, // 38 PI + FT_FuncFix1, // 39 Sinus + FT_FuncFix1, // 40 Cosinus + FT_FuncFix1, // 41 Tangens + FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) <----- richtig? - + FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant) + FT_FuncFix1, // 44 Arcus-Sinus + FT_FuncFix1, // 45 Arcus-Cosinus + FT_FuncFix1, // 46 Exponentialfunktion + FT_FuncFix2, // 47 Modulo + FT_FuncVar, // 48 Auswahl + FT_FuncFix1, // 49 Is not applicable? + FT_FuncFix1, // 50 Is Error? + FT_FuncFix0, // 51 FALSE + FT_FuncFix0, // 52 TRUE + FT_FuncFix0, // 53 Zufallszahl + FT_FuncFix3, // 54 Datum + FT_FuncFix0, // 55 Heute + FT_FuncFix3, // 56 Payment + FT_FuncFix3, // 57 Present Value + FT_FuncFix3, // 58 Future Value + FT_FuncFix3, // 59 If ... then ... else ... + FT_FuncFix1, // 60 Tag des Monats + FT_FuncFix1, // 61 Monat + FT_FuncFix1, // 62 Jahr + FT_FuncFix2, // 63 Runden + FT_FuncFix3, // 64 Zeit + FT_FuncFix1, // 65 Stunde + FT_FuncFix1, // 66 Minute + FT_FuncFix1, // 67 Sekunde + FT_FuncFix1, // 68 Ist Zahl? + FT_FuncFix1, // 69 Ist Text? + FT_FuncFix1, // 70 Len() + FT_FuncFix1, // 71 Val() + FT_FuncFix2, // 72 String() + FT_FuncFix3, // 73 Mid() + FT_FuncFix1, // 74 Char() + FT_FuncFix1, // 75 Ascii() + FT_FuncFix3, // 76 Find() + FT_FuncFix1, // 77 Datevalue + FT_FuncFix1, // 78 Timevalue + FT_FuncFix1, // 79 Cellpointer + FT_FuncVar, // 80 Sum() + FT_FuncVar, // 81 Avg() + FT_FuncVar, // 82 Cnt() + FT_FuncVar, // 83 Min() + FT_FuncVar, // 84 Max() + FT_FuncFix3, // 85 Vlookup() + FT_FuncFix2, // 86 Npv() + FT_FuncVar, // 87 Var() + FT_FuncVar, // 88 Std() + FT_FuncFix2, // 89 Irr() + FT_FuncFix3, // 90 Hlookup() + FT_FuncFix3, // 91 ? + FT_FuncFix3, // 92 ? + FT_FuncFix3, // 93 ? + FT_FuncFix3, // 94 ? + FT_FuncFix3, // 95 ? + FT_FuncFix3, // 96 ? + FT_FuncFix3, // 97 ? + FT_FuncFix3, // 98 Index() <- richtig? - + FT_FuncFix1, // 99 Cols() + FT_FuncFix1, // 100 Rows() + FT_FuncFix2, // 101 Repeat() + FT_FuncFix1, // 102 Upper() + FT_FuncFix1, // 103 Lower() + FT_FuncFix2, // 104 Left() + FT_FuncFix2, // 105 Right() + FT_FuncFix4, // 106 Replace() + FT_FuncFix1, // 107 Proper() + FT_FuncFix2, // 108 Cell() + FT_FuncFix1, // 109 Trim() + FT_FuncFix1, // 110 Clean() + FT_FuncFix1, // 111 F() + FT_FuncFix1, // 112 Wert() (oder W()?) + FT_FuncFix2, // 113 Exact() + FT_NotImpl, // 114 Call() + FT_FuncFix1, // 115 @@() + FT_FuncFix3, // 116 Rate() + FT_FuncFix1, // 117 Term() + FT_FuncFix1, // 118 Cterm() + FT_FuncFix3, // 119 Sln() + FT_FuncFix4, // 120 Syd(), Soy() + FT_FuncFix4, // 121 Ddb() + FT_NotImpl, // 122 + FT_NotImpl, // 123 + FT_NotImpl, // 124 + FT_NotImpl, // 125 + FT_NotImpl, // 126 + FT_NotImpl, // 127 + FT_NotImpl, // 128 + FT_NotImpl, // 129 + FT_NotImpl, // 130 + FT_NotImpl, // 131 + FT_NotImpl, // 132 + FT_NotImpl, // 133 + FT_NotImpl, // 134 + FT_NotImpl, // 135 + FT_NotImpl, // 136 + FT_NotImpl, // 137 + FT_NotImpl, // 138 + FT_NotImpl, // 139 + FT_NotImpl, // 140 + FT_NotImpl, // 141 + FT_NotImpl, // 142 + FT_NotImpl, // 143 + FT_NotImpl, // 144 + FT_NotImpl, // 145 + FT_NotImpl, // 146 + FT_NotImpl, // 147 + FT_NotImpl, // 148 + FT_NotImpl, // 149 + FT_NotImpl, // 150 + FT_NotImpl, // 151 + FT_NotImpl, // 152 + FT_NotImpl, // 153 + FT_NotImpl, // 154 + FT_NotImpl, // 155 + FT_FuncVar, // 156 ? + FT_NotImpl, // 157 + FT_NotImpl, // 158 + FT_NotImpl, // 159 + FT_NotImpl, // 160 + FT_NotImpl, // 161 + FT_NotImpl, // 162 + FT_NotImpl, // 163 + FT_NotImpl, // 164 + FT_NotImpl, // 165 + FT_NotImpl, // 166 + FT_NotImpl, // 167 + FT_NotImpl, // 168 + FT_NotImpl, // 169 + FT_NotImpl, // 170 + FT_NotImpl, // 171 + FT_NotImpl, // 172 + FT_NotImpl, // 173 + FT_NotImpl, // 174 + FT_NotImpl, // 175 + FT_NotImpl, // 176 + FT_NotImpl, // 177 + FT_NotImpl, // 178 + FT_NotImpl, // 179 + FT_NotImpl, // 180 + FT_NotImpl, // 181 + FT_NotImpl, // 182 + FT_NotImpl, // 183 + FT_NotImpl, // 184 + FT_NotImpl, // 185 + FT_NotImpl, // 186 + FT_NotImpl, // 187 + FT_NotImpl, // 188 + FT_NotImpl, // 189 + FT_NotImpl, // 190 + FT_NotImpl, // 191 + FT_NotImpl, // 192 + FT_NotImpl, // 193 + FT_NotImpl, // 194 + FT_NotImpl, // 195 + FT_NotImpl, // 196 + FT_NotImpl, // 197 + FT_NotImpl, // 198 + FT_NotImpl, // 199 + FT_NotImpl, // 200 + FT_NotImpl, // 201 + FT_NotImpl, // 202 + FT_NotImpl, // 203 + FT_NotImpl, // 204 + FT_NotImpl, // 205 + FT_FuncVar, // 206 ? + FT_NotImpl, // 207 + FT_NotImpl, // 208 + FT_NotImpl, // 209 + FT_NotImpl, // 210 + FT_NotImpl, // 211 + FT_NotImpl, // 212 + FT_NotImpl, // 213 + FT_NotImpl, // 214 + FT_NotImpl, // 215 + FT_NotImpl, // 216 + FT_NotImpl, // 217 + FT_NotImpl, // 218 + FT_NotImpl, // 219 + FT_NotImpl, // 220 + FT_NotImpl, // 221 + FT_NotImpl, // 222 + FT_NotImpl, // 223 + FT_NotImpl, // 224 + FT_NotImpl, // 225 + FT_NotImpl, // 226 + FT_NotImpl, // 227 + FT_NotImpl, // 228 + FT_NotImpl, // 229 + FT_NotImpl, // 230 + FT_NotImpl, // 231 + FT_NotImpl, // 232 + FT_NotImpl, // 233 + FT_NotImpl, // 234 + FT_NotImpl, // 235 + FT_NotImpl, // 236 + FT_NotImpl, // 237 + FT_NotImpl, // 238 + FT_NotImpl, // 239 + FT_NotImpl, // 240 + FT_NotImpl, // 241 + FT_NotImpl, // 242 + FT_NotImpl, // 243 + FT_NotImpl, // 244 + FT_NotImpl, // 245 + FT_NotImpl, // 246 + FT_NotImpl, // 247 + FT_NotImpl, // 248 + FT_NotImpl, // 249 + FT_NotImpl, // 250 + FT_NotImpl, // 251 + FT_NotImpl, // 252 + FT_NotImpl, // 253 + FT_NotImpl, // 254 + FT_FuncVar, // 255 ? }; return pType[ nIndex ]; } @@ -934,263 +934,263 @@ FUNC_TYPE LotusToSc::IndexToType( BYTE nIndex ) DefTokenId LotusToSc::IndexToToken( BYTE nIndex ) { static const DefTokenId pToken[ 256 ] = - { // Code Bezeichnung - ocPush, // 0 8-Byte-IEEE-Float - ocPush, // 1 Variable - ocPush, // 2 Bereich - ocPush, // 3 return - ocPush, // 4 Klammer - ocPush, // 5 2-Byte-Integer - ocPush, // 6 ASCII-String - ocPush, // 7 NOP - ocNegSub, // 8 Negation - ocAdd, // 9 Addition - ocSub, // 10 Subtraktion - ocMul, // 11 Multiplikation - ocDiv, // 12 Division - ocPow, // 13 Potenzierung - ocEqual, // 14 Gleichheit - ocNotEqual, // 15 Ungleich - ocLessEqual, // 16 Kleiner-gleich - ocGreaterEqual, // 17 Groesser-gleich - ocLess, // 18 Kleiner - ocGreater, // 19 Groesser - ocAnd, // 20 And (logisch) - ocOr, // 21 Or (logisch) - ocNot, // 22 Not (logisch) - ocPush, // 23 unaeres Plus - ocNoName, // 24 - ocNoName, // 25 - ocNoName, // 26 - ocNoName, // 27 - ocNoName, // 28 - ocNoName, // 29 - ocNoName, // 30 - ocNotAvail, // 31 Not available - ocNoName, // 32 Error - ocAbs, // 33 Betrag ABS() - ocInt, // 34 Ganzzahl INT() - ocSqrt, // 35 Quadratwurzel - ocLog10, // 36 Zehnerlogarithmus - ocLn, // 37 Natuerlicher Logarithmus - ocPi, // 38 PI - ocSin, // 39 Sinus - ocCos, // 40 Cosinus - ocTan, // 41 Tangens - ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant) - ocArcTan, // 43 Arcus-Tangens (2.Quadrant) - ocArcSin, // 44 Arcus-Sinus - ocArcCos, // 45 Arcus-Cosinus - ocExp, // 46 Exponentialfunktion - ocMod, // 47 Modulo - ocChose, // 48 Auswahl - ocIsNA, // 49 Is not available? - ocIsError, // 50 Is Error? - ocFalse, // 51 FALSE - ocTrue, // 52 TRUE - ocRandom, // 53 Zufallszahl - ocGetDate, // 54 Datum - ocGetActDate, // 55 Heute - ocRMZ, // 56 Payment - ocBW, // 57 Present Value - ocZW, // 58 Future Value - ocIf, // 59 If ... then ... else ... - ocGetDay, // 60 Tag des Monats - ocGetMonth, // 61 Monat - ocGetYear, // 62 Jahr - ocRound, // 63 Runden - ocGetTime, // 64 Zeit - ocGetHour, // 65 Stunde - ocGetMin, // 66 Minute - ocGetSec, // 67 Sekunde - ocIsValue, // 68 Ist Zahl? - ocIsString, // 69 Ist Text? - ocLen, // 70 Len() - ocValue, // 71 Val() - ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall - ocMid, // 73 Mid() - ocChar, // 74 Char() - ocCode, // 75 Ascii() - ocFind, // 76 Find() - ocGetDateValue, // 77 Datevalue - ocGetTimeValue, // 78 Timevalue - ocNoName, // 79 Cellpointer - ocSum, // 80 Sum() - ocAverage, // 81 Avg() - ocCount, // 82 Cnt() - ocMin, // 83 Min() - ocMax, // 84 Max() - ocVLookup, // 85 Vlookup() - ocNPV, // 86 Npv() - ocVar, // 87 Var() - ocNormDist, // 88 Std() - ocIRR, // 89 Irr() - ocHLookup, // 90 Hlookup() - ocDBSum, // 91 XlfDsum - ocDBAverage, // 92 XlfDaverage - ocDBCount, // 93 XlfDcount - ocDBMin, // 94 XlfDmin - ocDBMax, // 95 XlfDmax - ocDBVar, // 96 XlfDvar - ocDBStdDev, // 97 XlfDstdev - ocIndex, // 98 Index() - ocColumns, // 99 Cols() - ocRows, // 100 Rows() - ocRept, // 101 Repeat() - ocUpper, // 102 Upper() - ocLower, // 103 Lower() - ocLeft, // 104 Left() - ocRight, // 105 Right() - ocReplace, // 106 Replace() - ocPropper, // 107 Proper() - ocNoName, // 108 Cell() - ocTrim, // 109 Trim() - ocClean, // 110 Clean() - ocFalse, // 111 F() - ocTrue, // 112 W() - ocExact, // 113 Exact() - ocNoName, // 114 Call() - ocIndirect, // 115 @@() - ocZins, // 116 Rate() - ocNoName, // 117 Term() - ocNoName, // 118 Cterm() - ocLIA, // 119 Sln() - ocDIA, // 120 Syd(), Soy() - ocGDA, // 121 Ddb() - ocNoName, // 122 - ocNoName, // 123 - ocNoName, // 124 - ocNoName, // 125 - ocNoName, // 126 - ocNoName, // 127 - ocNoName, // 128 - ocNoName, // 129 - ocNoName, // 130 - ocNoName, // 131 - ocNoName, // 132 - ocNoName, // 133 - ocNoName, // 134 - ocNoName, // 135 - ocNoName, // 136 - ocNoName, // 137 - ocNoName, // 138 - ocNoName, // 139 - ocNoName, // 140 - ocNoName, // 141 - ocNoName, // 142 - ocNoName, // 143 - ocNoName, // 144 - ocNoName, // 145 - ocNoName, // 146 - ocNoName, // 147 - ocNoName, // 148 - ocNoName, // 149 - ocNoName, // 150 - ocNoName, // 151 - ocNoName, // 152 - ocNoName, // 153 - ocNoName, // 154 - ocNoName, // 155 - ocNoName, // 156 ? - ocNoName, // 157 - ocNoName, // 158 - ocNoName, // 159 - ocNoName, // 160 - ocNoName, // 161 - ocNoName, // 162 - ocNoName, // 163 - ocNoName, // 164 - ocNoName, // 165 - ocNoName, // 166 - ocNoName, // 167 - ocNoName, // 168 - ocNoName, // 169 - ocNoName, // 170 - ocNoName, // 171 - ocNoName, // 172 - ocNoName, // 173 - ocNoName, // 174 - ocNoName, // 175 - ocNoName, // 176 - ocNoName, // 177 - ocNoName, // 178 - ocNoName, // 179 - ocNoName, // 180 - ocNoName, // 181 - ocNoName, // 182 - ocNoName, // 183 - ocNoName, // 184 - ocNoName, // 185 - ocNoName, // 186 - ocNoName, // 187 - ocNoName, // 188 - ocNoName, // 189 - ocNoName, // 190 - ocNoName, // 191 - ocNoName, // 192 - ocNoName, // 193 - ocNoName, // 194 - ocNoName, // 195 - ocNoName, // 196 - ocNoName, // 197 - ocNoName, // 198 - ocNoName, // 199 - ocNoName, // 200 - ocNoName, // 201 - ocNoName, // 202 - ocNoName, // 203 - ocNoName, // 204 - ocNoName, // 205 - ocNoName, // 206 ? - ocNoName, // 207 - ocNoName, // 208 - ocNoName, // 209 - ocNoName, // 210 - ocNoName, // 211 - ocNoName, // 212 - ocNoName, // 213 - ocNoName, // 214 - ocNoName, // 215 - ocNoName, // 216 - ocNoName, // 217 - ocNoName, // 218 - ocNoName, // 219 - ocNoName, // 220 - ocNoName, // 221 - ocNoName, // 222 - ocNoName, // 223 - ocNoName, // 224 - ocNoName, // 225 - ocNoName, // 226 - ocNoName, // 227 - ocNoName, // 228 - ocNoName, // 229 - ocNoName, // 230 - ocNoName, // 231 - ocNoName, // 232 - ocNoName, // 233 - ocNoName, // 234 - ocNoName, // 235 - ocNoName, // 236 - ocNoName, // 237 - ocNoName, // 238 - ocNoName, // 239 - ocNoName, // 240 - ocNoName, // 241 - ocNoName, // 242 - ocNoName, // 243 - ocNoName, // 244 - ocNoName, // 245 - ocNoName, // 246 - ocNoName, // 247 - ocNoName, // 248 - ocNoName, // 249 - ocNoName, // 250 - ocNoName, // 251 - ocNoName, // 252 - ocNoName, // 253 - ocNoName, // 254 - ocNoName // 255 ? + { // Code Bezeichnung + ocPush, // 0 8-Byte-IEEE-Float + ocPush, // 1 Variable + ocPush, // 2 Bereich + ocPush, // 3 return + ocPush, // 4 Klammer + ocPush, // 5 2-Byte-Integer + ocPush, // 6 ASCII-String + ocPush, // 7 NOP + ocNegSub, // 8 Negation + ocAdd, // 9 Addition + ocSub, // 10 Subtraktion + ocMul, // 11 Multiplikation + ocDiv, // 12 Division + ocPow, // 13 Potenzierung + ocEqual, // 14 Gleichheit + ocNotEqual, // 15 Ungleich + ocLessEqual, // 16 Kleiner-gleich + ocGreaterEqual, // 17 Groesser-gleich + ocLess, // 18 Kleiner + ocGreater, // 19 Groesser + ocAnd, // 20 And (logisch) + ocOr, // 21 Or (logisch) + ocNot, // 22 Not (logisch) + ocPush, // 23 unaeres Plus + ocNoName, // 24 + ocNoName, // 25 + ocNoName, // 26 + ocNoName, // 27 + ocNoName, // 28 + ocNoName, // 29 + ocNoName, // 30 + ocNotAvail, // 31 Not available + ocNoName, // 32 Error + ocAbs, // 33 Betrag ABS() + ocInt, // 34 Ganzzahl INT() + ocSqrt, // 35 Quadratwurzel + ocLog10, // 36 Zehnerlogarithmus + ocLn, // 37 Natuerlicher Logarithmus + ocPi, // 38 PI + ocSin, // 39 Sinus + ocCos, // 40 Cosinus + ocTan, // 41 Tangens + ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant) + ocArcTan, // 43 Arcus-Tangens (2.Quadrant) + ocArcSin, // 44 Arcus-Sinus + ocArcCos, // 45 Arcus-Cosinus + ocExp, // 46 Exponentialfunktion + ocMod, // 47 Modulo + ocChose, // 48 Auswahl + ocIsNA, // 49 Is not available? + ocIsError, // 50 Is Error? + ocFalse, // 51 FALSE + ocTrue, // 52 TRUE + ocRandom, // 53 Zufallszahl + ocGetDate, // 54 Datum + ocGetActDate, // 55 Heute + ocRMZ, // 56 Payment + ocBW, // 57 Present Value + ocZW, // 58 Future Value + ocIf, // 59 If ... then ... else ... + ocGetDay, // 60 Tag des Monats + ocGetMonth, // 61 Monat + ocGetYear, // 62 Jahr + ocRound, // 63 Runden + ocGetTime, // 64 Zeit + ocGetHour, // 65 Stunde + ocGetMin, // 66 Minute + ocGetSec, // 67 Sekunde + ocIsValue, // 68 Ist Zahl? + ocIsString, // 69 Ist Text? + ocLen, // 70 Len() + ocValue, // 71 Val() + ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall + ocMid, // 73 Mid() + ocChar, // 74 Char() + ocCode, // 75 Ascii() + ocFind, // 76 Find() + ocGetDateValue, // 77 Datevalue + ocGetTimeValue, // 78 Timevalue + ocNoName, // 79 Cellpointer + ocSum, // 80 Sum() + ocAverage, // 81 Avg() + ocCount, // 82 Cnt() + ocMin, // 83 Min() + ocMax, // 84 Max() + ocVLookup, // 85 Vlookup() + ocNPV, // 86 Npv() + ocVar, // 87 Var() + ocNormDist, // 88 Std() + ocIRR, // 89 Irr() + ocHLookup, // 90 Hlookup() + ocDBSum, // 91 XlfDsum + ocDBAverage, // 92 XlfDaverage + ocDBCount, // 93 XlfDcount + ocDBMin, // 94 XlfDmin + ocDBMax, // 95 XlfDmax + ocDBVar, // 96 XlfDvar + ocDBStdDev, // 97 XlfDstdev + ocIndex, // 98 Index() + ocColumns, // 99 Cols() + ocRows, // 100 Rows() + ocRept, // 101 Repeat() + ocUpper, // 102 Upper() + ocLower, // 103 Lower() + ocLeft, // 104 Left() + ocRight, // 105 Right() + ocReplace, // 106 Replace() + ocPropper, // 107 Proper() + ocNoName, // 108 Cell() + ocTrim, // 109 Trim() + ocClean, // 110 Clean() + ocFalse, // 111 F() + ocTrue, // 112 W() + ocExact, // 113 Exact() + ocNoName, // 114 Call() + ocIndirect, // 115 @@() + ocZins, // 116 Rate() + ocNoName, // 117 Term() + ocNoName, // 118 Cterm() + ocLIA, // 119 Sln() + ocDIA, // 120 Syd(), Soy() + ocGDA, // 121 Ddb() + ocNoName, // 122 + ocNoName, // 123 + ocNoName, // 124 + ocNoName, // 125 + ocNoName, // 126 + ocNoName, // 127 + ocNoName, // 128 + ocNoName, // 129 + ocNoName, // 130 + ocNoName, // 131 + ocNoName, // 132 + ocNoName, // 133 + ocNoName, // 134 + ocNoName, // 135 + ocNoName, // 136 + ocNoName, // 137 + ocNoName, // 138 + ocNoName, // 139 + ocNoName, // 140 + ocNoName, // 141 + ocNoName, // 142 + ocNoName, // 143 + ocNoName, // 144 + ocNoName, // 145 + ocNoName, // 146 + ocNoName, // 147 + ocNoName, // 148 + ocNoName, // 149 + ocNoName, // 150 + ocNoName, // 151 + ocNoName, // 152 + ocNoName, // 153 + ocNoName, // 154 + ocNoName, // 155 + ocNoName, // 156 ? + ocNoName, // 157 + ocNoName, // 158 + ocNoName, // 159 + ocNoName, // 160 + ocNoName, // 161 + ocNoName, // 162 + ocNoName, // 163 + ocNoName, // 164 + ocNoName, // 165 + ocNoName, // 166 + ocNoName, // 167 + ocNoName, // 168 + ocNoName, // 169 + ocNoName, // 170 + ocNoName, // 171 + ocNoName, // 172 + ocNoName, // 173 + ocNoName, // 174 + ocNoName, // 175 + ocNoName, // 176 + ocNoName, // 177 + ocNoName, // 178 + ocNoName, // 179 + ocNoName, // 180 + ocNoName, // 181 + ocNoName, // 182 + ocNoName, // 183 + ocNoName, // 184 + ocNoName, // 185 + ocNoName, // 186 + ocNoName, // 187 + ocNoName, // 188 + ocNoName, // 189 + ocNoName, // 190 + ocNoName, // 191 + ocNoName, // 192 + ocNoName, // 193 + ocNoName, // 194 + ocNoName, // 195 + ocNoName, // 196 + ocNoName, // 197 + ocNoName, // 198 + ocNoName, // 199 + ocNoName, // 200 + ocNoName, // 201 + ocNoName, // 202 + ocNoName, // 203 + ocNoName, // 204 + ocNoName, // 205 + ocNoName, // 206 ? + ocNoName, // 207 + ocNoName, // 208 + ocNoName, // 209 + ocNoName, // 210 + ocNoName, // 211 + ocNoName, // 212 + ocNoName, // 213 + ocNoName, // 214 + ocNoName, // 215 + ocNoName, // 216 + ocNoName, // 217 + ocNoName, // 218 + ocNoName, // 219 + ocNoName, // 220 + ocNoName, // 221 + ocNoName, // 222 + ocNoName, // 223 + ocNoName, // 224 + ocNoName, // 225 + ocNoName, // 226 + ocNoName, // 227 + ocNoName, // 228 + ocNoName, // 229 + ocNoName, // 230 + ocNoName, // 231 + ocNoName, // 232 + ocNoName, // 233 + ocNoName, // 234 + ocNoName, // 235 + ocNoName, // 236 + ocNoName, // 237 + ocNoName, // 238 + ocNoName, // 239 + ocNoName, // 240 + ocNoName, // 241 + ocNoName, // 242 + ocNoName, // 243 + ocNoName, // 244 + ocNoName, // 245 + ocNoName, // 246 + ocNoName, // 247 + ocNoName, // 248 + ocNoName, // 249 + ocNoName, // 250 + ocNoName, // 251 + ocNoName, // 252 + ocNoName, // 253 + ocNoName, // 254 + ocNoName // 255 ? }; return pToken[ nIndex ]; @@ -1200,263 +1200,263 @@ DefTokenId LotusToSc::IndexToToken( BYTE nIndex ) FUNC_TYPE LotusToSc::IndexToTypeWK123( BYTE nIndex ) { static const FUNC_TYPE pType[ 256 ] = - { // Code Bezeichnung - FT_Const10Float, // 0 8-Byte-IEEE-Long-Number - FT_Cref, // 1 Cell Reference - FT_Rref, // 2 Area Reference - FT_Return, // 3 return - FT_Braces, // 4 Klammer - FT_Snum, // 5 Short-Number - FT_ConstString, // 6 ASCII-String - FT_Nrref, // 7 Named range reference - FT_Absnref, // 8 Absolut named range - FT_Erref, // 9 Err range reference - FT_Ecref, // 10 Err cell reference - FT_Econstant, // 11 Err constant - FT_NotImpl, // 12 - FT_NotImpl, // 13 - FT_Neg, // 14 Negation - FT_Op, // 15 Addition - FT_Op, // 16 Subtraktion - FT_Op, // 17 Multiplikation - FT_Op, // 18 Division - FT_Op, // 19 Potenzierung - FT_Op, // 20 Gleichheit - FT_Op, // 21 Ungleich - FT_Op, // 22 Kleiner-gleich - FT_Op, // 23 Groesser-gleich - FT_Op, // 24 Kleiner - FT_Op, // 25 Groesser - FT_Op, // 26 And (logisch) - FT_Op, // 27 Or (logisch) - FT_FuncFix1, // 28 Not (logisch) - FT_NOP, // 29 unaeres Plus - FT_Op, // 30 Concatenation - FT_FuncFix0, // 31 Not applicable - FT_FuncFix0, // 32 Error - FT_FuncFix1, // 33 Betrag ABS() - FT_FuncFix1, // 34 Ganzzahl INT() - FT_FuncFix1, // 35 Quadratwurzel - FT_FuncFix1, // 36 Zehnerlogarithmus - FT_FuncFix1, // 37 Natuerlicher Logarithmus - FT_FuncFix0, // 38 PI - FT_FuncFix1, // 39 Sinus - FT_FuncFix1, // 40 Cosinus - FT_FuncFix1, // 41 Tangens - FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) - FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant) - FT_FuncFix1, // 44 Arcus-Sinus - FT_FuncFix1, // 45 Arcus-Cosinus - FT_FuncFix1, // 46 Exponentialfunktion - FT_FuncFix2, // 47 Modulo - FT_FuncVar, // 48 Auswahl - FT_FuncFix1, // 49 Is not applicable? - FT_FuncFix1, // 50 Is Error? - FT_FuncFix0, // 51 FALSE - FT_FuncFix0, // 52 TRUE - FT_FuncFix0, // 53 Zufallszahl - FT_FuncFix3, // 54 Datum - FT_FuncFix0, // 55 Heute - FT_FuncFix3, // 56 Payment - FT_FuncFix3, // 57 Present Value - FT_FuncFix3, // 58 Future Value - FT_FuncFix3, // 59 If ... then ... else ... - FT_FuncFix1, // 60 Tag des Monats - FT_FuncFix1, // 61 Monat - FT_FuncFix1, // 62 Jahr - FT_FuncFix2, // 63 Runden - FT_FuncFix3, // 64 Zeit - FT_FuncFix1, // 65 Stunde - FT_FuncFix1, // 66 Minute - FT_FuncFix1, // 67 Sekunde - FT_FuncFix1, // 68 Ist Zahl? - FT_FuncFix1, // 69 Ist Text? - FT_FuncFix1, // 70 Len() - FT_FuncFix1, // 71 Val() - FT_FuncFix2, // 72 String() - FT_FuncFix3, // 73 Mid() - FT_FuncFix1, // 74 Char() - FT_FuncFix1, // 75 Ascii() - FT_FuncFix3, // 76 Find() - FT_FuncFix1, // 77 Datevalue - FT_FuncFix1, // 78 Timevalue - FT_FuncFix1, // 79 Cellpointer - FT_FuncVar, // 80 Sum() - FT_FuncVar, // 81 Avg() - FT_FuncVar, // 82 Cnt() - FT_FuncVar, // 83 Min() - FT_FuncVar, // 84 Max() - FT_FuncFix3, // 85 Vlookup() - FT_FuncFix2, // 86 Npv() - FT_FuncVar, // 87 Var() - FT_FuncVar, // 88 Std() - FT_FuncFix2, // 89 Irr() - FT_FuncFix3, // 90 Hlookup() - FT_FuncVar, // 91 Dsum <-------- neu! - - FT_FuncVar, // 92 Davg <-------- neu! - - FT_FuncVar, // 93 Dcnt <-------- neu! - - FT_FuncVar, // 94 Dmin <-------- neu! - - FT_FuncVar, // 95 Dmax <-------- neu! - - FT_FuncVar, // 96 Dvar <-------- neu! - - FT_FuncVar, // 97 Dstd <-------- neu! - - FT_FuncVar, // 98 Index() <-------- change! - - FT_FuncFix1, // 99 Cols() <-------- neu! - - FT_FuncFix1, // 100 Rows() <-------- neu! - - FT_FuncFix2, // 101 Repeat() <-------- neu! - - FT_FuncFix1, // 102 Upper() <-------- neu! - - FT_FuncFix1, // 103 Lower() <-------- neu! - - FT_FuncFix2, // 104 Left() <-------- neu! - - FT_FuncFix2, // 105 Right() <-------- neu! - - FT_FuncFix4, // 106 Replace() <-------- neu! - - FT_FuncFix1, // 107 Proper() <-------- neu! - - FT_FuncFix2, // 108 Cell() <-------- neu! - - FT_FuncFix1, // 109 Trim() <-------- neu! - - FT_FuncFix1, // 110 Clean() <-------- neu! - - FT_FuncFix1, // 111 S() <--------- change in Bez. - - FT_FuncFix1, // 112 N() <--------- change in Bez. - - FT_FuncFix2, // 113 Exact() <-------- neu! - - FT_NotImpl, // 114 App <--------- change in Bez. - - FT_FuncFix1, // 115 @@() <-------- neu! - - FT_FuncFix3, // 116 Rate() <-------- neu! - - FT_FuncFix3, // 117 Term() <--------- change in Anz. - FT_FuncFix3, // 118 Cterm() <--------- change in Anz. - FT_FuncFix3, // 119 Sln() <-------- neu! - - FT_FuncFix4, // 120 Syd() <-------- neu! - - FT_FuncFix4, // 121 Ddb() <-------- neu! - - FT_Splfunc, // 122 Splfunc <-------- neu! - - FT_FuncFix1, // 123 Sheets <-------- neu! - - FT_FuncFix1, // 124 Info <-------- neu! - - FT_FuncVar, // 125 Sumproduct <-------- neu! - - FT_FuncFix1, // 126 Isrange <-------- neu! - - FT_FuncVar, // 127 Dget <-------- neu! - - FT_FuncVar, // 128 Dquery <-------- neu! - - FT_FuncFix4, // 129 Coord <-------- neu! - - FT_NOP, // 130 Reserved (internal) <-------- neu! - - FT_FuncFix0, // 131 Today <-------- neu! - - FT_FuncVar, // 132 Vdb <-------- neu! - - FT_FuncVar, // 133 Dvars <-------- neu! - - FT_FuncVar, // 134 Dstds <-------- neu! - - FT_FuncVar, // 135 Vars <-------- neu! - - FT_FuncVar, // 136 Stds <-------- neu! - - FT_FuncFix2, // 137 D360 <-------- neu! - - FT_NOP, // 138 Reserved (internal) <-------- neu! - - FT_FuncFix0, // 139 Isapp <-------- neu! - Anzahl ? - - FT_FuncVar, // 140 Isaaf <-------- neu! - Anzahl ? - - FT_FuncFix1, // 141 Weekday <-------- neu! - - FT_FuncFix3, // 142 Datedif <-------- neu! - - FT_FuncVar, // 143 Rank <-------- neu! - - FT_FuncFix2, // 144 Numberstring <-------- neu! - - FT_FuncFix1, // 145 Datestring <-------- neu! - - FT_FuncFix1, // 146 Decimal <-------- neu! - - FT_FuncFix1, // 147 Hex <-------- neu! - - FT_FuncFix4, // 148 Db <-------- neu! - - FT_FuncFix4, // 149 Pmti <-------- neu! - - FT_FuncFix4, // 150 Spi <-------- neu! - - FT_FuncFix1, // 151 Fullp <-------- neu! - - FT_FuncFix1, // 152 Halfp <-------- neu! - - FT_FuncVar, // 153 Pureavg <-------- neu! - - FT_FuncVar, // 154 Purecount <-------- neu! - - FT_FuncVar, // 155 Puremax <-------- neu! - - FT_FuncVar, // 156 Puremin <-------- neu! - - FT_FuncVar, // 157 Purestd <-------- neu! - - FT_FuncVar, // 158 Purevar <-------- neu! - - FT_FuncVar, // 159 Purestds <-------- neu! - - FT_FuncVar, // 160 Purevars <-------- neu! - - FT_FuncFix3, // 161 Pmt2 <-------- neu! - - FT_FuncFix3, // 162 Pv2 <-------- neu! - - FT_FuncFix3, // 163 Fv2 <-------- neu! - - FT_FuncFix3, // 164 Term2 <-------- neu! - - FT_NotImpl, // 165 --- <-------- neu! - Anzahl ? - - FT_FuncFix2, // 166 D360 (US-Version) - FT_NotImpl, // 167 - FT_NotImpl, // 168 - FT_NotImpl, // 169 - FT_NotImpl, // 170 - FT_NotImpl, // 171 - FT_NotImpl, // 172 - FT_NotImpl, // 173 - FT_NotImpl, // 174 - FT_NotImpl, // 175 - FT_NotImpl, // 176 - FT_NotImpl, // 177 - FT_NotImpl, // 178 - FT_NotImpl, // 179 - FT_NotImpl, // 180 - FT_NotImpl, // 181 - FT_NotImpl, // 182 - FT_NotImpl, // 183 - FT_NotImpl, // 184 - FT_NotImpl, // 185 - FT_FuncVar, // 186 Solver <-------- neu! - - FT_NotImpl, // 187 - FT_NotImpl, // 188 - FT_NotImpl, // 189 - FT_NotImpl, // 190 - FT_NotImpl, // 191 - FT_NotImpl, // 192 - FT_NotImpl, // 193 - FT_NotImpl, // 194 - FT_NotImpl, // 195 - FT_NotImpl, // 196 - FT_NotImpl, // 197 - FT_NotImpl, // 198 - FT_NotImpl, // 199 - FT_NotImpl, // 200 - FT_NotImpl, // 201 - FT_NotImpl, // 202 - FT_NotImpl, // 203 - FT_NotImpl, // 204 - FT_NotImpl, // 205 - FT_NotImpl, // 206 - FT_NotImpl, // 207 - FT_NotImpl, // 208 - FT_NotImpl, // 209 - FT_NotImpl, // 210 - FT_NotImpl, // 211 - FT_NotImpl, // 212 - FT_NotImpl, // 213 - FT_NotImpl, // 214 - FT_NotImpl, // 215 - FT_NotImpl, // 216 - FT_NotImpl, // 217 - FT_NotImpl, // 218 - FT_NotImpl, // 219 - FT_NotImpl, // 220 - FT_NotImpl, // 221 - FT_NotImpl, // 222 - FT_NotImpl, // 223 - FT_NotImpl, // 224 - FT_NotImpl, // 225 - FT_NotImpl, // 226 - FT_NotImpl, // 227 - FT_NotImpl, // 228 - FT_NotImpl, // 229 - FT_NotImpl, // 230 - FT_NotImpl, // 231 - FT_NotImpl, // 232 - FT_NotImpl, // 233 - FT_NotImpl, // 234 - FT_NotImpl, // 235 - FT_NotImpl, // 236 - FT_NotImpl, // 237 - FT_NotImpl, // 238 - FT_NotImpl, // 239 - FT_NotImpl, // 240 - FT_NotImpl, // 241 - FT_NotImpl, // 242 - FT_NotImpl, // 243 - FT_NotImpl, // 244 - FT_NotImpl, // 245 - FT_NotImpl, // 246 - FT_NotImpl, // 247 - FT_NotImpl, // 248 - FT_NotImpl, // 249 - FT_NotImpl, // 250 - FT_NotImpl, // 251 - FT_NotImpl, // 252 - FT_NotImpl, // 253 - FT_NotImpl, // 254 - FT_NotImpl, // 255 + { // Code Bezeichnung + FT_Const10Float, // 0 8-Byte-IEEE-Long-Number + FT_Cref, // 1 Cell Reference + FT_Rref, // 2 Area Reference + FT_Return, // 3 return + FT_Braces, // 4 Klammer + FT_Snum, // 5 Short-Number + FT_ConstString, // 6 ASCII-String + FT_Nrref, // 7 Named range reference + FT_Absnref, // 8 Absolut named range + FT_Erref, // 9 Err range reference + FT_Ecref, // 10 Err cell reference + FT_Econstant, // 11 Err constant + FT_NotImpl, // 12 + FT_NotImpl, // 13 + FT_Neg, // 14 Negation + FT_Op, // 15 Addition + FT_Op, // 16 Subtraktion + FT_Op, // 17 Multiplikation + FT_Op, // 18 Division + FT_Op, // 19 Potenzierung + FT_Op, // 20 Gleichheit + FT_Op, // 21 Ungleich + FT_Op, // 22 Kleiner-gleich + FT_Op, // 23 Groesser-gleich + FT_Op, // 24 Kleiner + FT_Op, // 25 Groesser + FT_Op, // 26 And (logisch) + FT_Op, // 27 Or (logisch) + FT_FuncFix1, // 28 Not (logisch) + FT_NOP, // 29 unaeres Plus + FT_Op, // 30 Concatenation + FT_FuncFix0, // 31 Not applicable + FT_FuncFix0, // 32 Error + FT_FuncFix1, // 33 Betrag ABS() + FT_FuncFix1, // 34 Ganzzahl INT() + FT_FuncFix1, // 35 Quadratwurzel + FT_FuncFix1, // 36 Zehnerlogarithmus + FT_FuncFix1, // 37 Natuerlicher Logarithmus + FT_FuncFix0, // 38 PI + FT_FuncFix1, // 39 Sinus + FT_FuncFix1, // 40 Cosinus + FT_FuncFix1, // 41 Tangens + FT_FuncFix2, // 42 Arcus-Tangens 2 (4.Quadrant) + FT_FuncFix1, // 43 Arcus-Tangens (2.Quadrant) + FT_FuncFix1, // 44 Arcus-Sinus + FT_FuncFix1, // 45 Arcus-Cosinus + FT_FuncFix1, // 46 Exponentialfunktion + FT_FuncFix2, // 47 Modulo + FT_FuncVar, // 48 Auswahl + FT_FuncFix1, // 49 Is not applicable? + FT_FuncFix1, // 50 Is Error? + FT_FuncFix0, // 51 FALSE + FT_FuncFix0, // 52 TRUE + FT_FuncFix0, // 53 Zufallszahl + FT_FuncFix3, // 54 Datum + FT_FuncFix0, // 55 Heute + FT_FuncFix3, // 56 Payment + FT_FuncFix3, // 57 Present Value + FT_FuncFix3, // 58 Future Value + FT_FuncFix3, // 59 If ... then ... else ... + FT_FuncFix1, // 60 Tag des Monats + FT_FuncFix1, // 61 Monat + FT_FuncFix1, // 62 Jahr + FT_FuncFix2, // 63 Runden + FT_FuncFix3, // 64 Zeit + FT_FuncFix1, // 65 Stunde + FT_FuncFix1, // 66 Minute + FT_FuncFix1, // 67 Sekunde + FT_FuncFix1, // 68 Ist Zahl? + FT_FuncFix1, // 69 Ist Text? + FT_FuncFix1, // 70 Len() + FT_FuncFix1, // 71 Val() + FT_FuncFix2, // 72 String() + FT_FuncFix3, // 73 Mid() + FT_FuncFix1, // 74 Char() + FT_FuncFix1, // 75 Ascii() + FT_FuncFix3, // 76 Find() + FT_FuncFix1, // 77 Datevalue + FT_FuncFix1, // 78 Timevalue + FT_FuncFix1, // 79 Cellpointer + FT_FuncVar, // 80 Sum() + FT_FuncVar, // 81 Avg() + FT_FuncVar, // 82 Cnt() + FT_FuncVar, // 83 Min() + FT_FuncVar, // 84 Max() + FT_FuncFix3, // 85 Vlookup() + FT_FuncFix2, // 86 Npv() + FT_FuncVar, // 87 Var() + FT_FuncVar, // 88 Std() + FT_FuncFix2, // 89 Irr() + FT_FuncFix3, // 90 Hlookup() + FT_FuncVar, // 91 Dsum <-------- neu! - + FT_FuncVar, // 92 Davg <-------- neu! - + FT_FuncVar, // 93 Dcnt <-------- neu! - + FT_FuncVar, // 94 Dmin <-------- neu! - + FT_FuncVar, // 95 Dmax <-------- neu! - + FT_FuncVar, // 96 Dvar <-------- neu! - + FT_FuncVar, // 97 Dstd <-------- neu! - + FT_FuncVar, // 98 Index() <-------- change! - + FT_FuncFix1, // 99 Cols() <-------- neu! - + FT_FuncFix1, // 100 Rows() <-------- neu! - + FT_FuncFix2, // 101 Repeat() <-------- neu! - + FT_FuncFix1, // 102 Upper() <-------- neu! - + FT_FuncFix1, // 103 Lower() <-------- neu! - + FT_FuncFix2, // 104 Left() <-------- neu! - + FT_FuncFix2, // 105 Right() <-------- neu! - + FT_FuncFix4, // 106 Replace() <-------- neu! - + FT_FuncFix1, // 107 Proper() <-------- neu! - + FT_FuncFix2, // 108 Cell() <-------- neu! - + FT_FuncFix1, // 109 Trim() <-------- neu! - + FT_FuncFix1, // 110 Clean() <-------- neu! - + FT_FuncFix1, // 111 S() <--------- change in Bez. - + FT_FuncFix1, // 112 N() <--------- change in Bez. - + FT_FuncFix2, // 113 Exact() <-------- neu! - + FT_NotImpl, // 114 App <--------- change in Bez. - + FT_FuncFix1, // 115 @@() <-------- neu! - + FT_FuncFix3, // 116 Rate() <-------- neu! - + FT_FuncFix3, // 117 Term() <--------- change in Anz. + FT_FuncFix3, // 118 Cterm() <--------- change in Anz. + FT_FuncFix3, // 119 Sln() <-------- neu! - + FT_FuncFix4, // 120 Syd() <-------- neu! - + FT_FuncFix4, // 121 Ddb() <-------- neu! - + FT_Splfunc, // 122 Splfunc <-------- neu! - + FT_FuncFix1, // 123 Sheets <-------- neu! - + FT_FuncFix1, // 124 Info <-------- neu! - + FT_FuncVar, // 125 Sumproduct <-------- neu! - + FT_FuncFix1, // 126 Isrange <-------- neu! - + FT_FuncVar, // 127 Dget <-------- neu! - + FT_FuncVar, // 128 Dquery <-------- neu! - + FT_FuncFix4, // 129 Coord <-------- neu! - + FT_NOP, // 130 Reserved (internal) <-------- neu! - + FT_FuncFix0, // 131 Today <-------- neu! - + FT_FuncVar, // 132 Vdb <-------- neu! - + FT_FuncVar, // 133 Dvars <-------- neu! - + FT_FuncVar, // 134 Dstds <-------- neu! - + FT_FuncVar, // 135 Vars <-------- neu! - + FT_FuncVar, // 136 Stds <-------- neu! - + FT_FuncFix2, // 137 D360 <-------- neu! - + FT_NOP, // 138 Reserved (internal) <-------- neu! - + FT_FuncFix0, // 139 Isapp <-------- neu! - Anzahl ? - + FT_FuncVar, // 140 Isaaf <-------- neu! - Anzahl ? - + FT_FuncFix1, // 141 Weekday <-------- neu! - + FT_FuncFix3, // 142 Datedif <-------- neu! - + FT_FuncVar, // 143 Rank <-------- neu! - + FT_FuncFix2, // 144 Numberstring <-------- neu! - + FT_FuncFix1, // 145 Datestring <-------- neu! - + FT_FuncFix1, // 146 Decimal <-------- neu! - + FT_FuncFix1, // 147 Hex <-------- neu! - + FT_FuncFix4, // 148 Db <-------- neu! - + FT_FuncFix4, // 149 Pmti <-------- neu! - + FT_FuncFix4, // 150 Spi <-------- neu! - + FT_FuncFix1, // 151 Fullp <-------- neu! - + FT_FuncFix1, // 152 Halfp <-------- neu! - + FT_FuncVar, // 153 Pureavg <-------- neu! - + FT_FuncVar, // 154 Purecount <-------- neu! - + FT_FuncVar, // 155 Puremax <-------- neu! - + FT_FuncVar, // 156 Puremin <-------- neu! - + FT_FuncVar, // 157 Purestd <-------- neu! - + FT_FuncVar, // 158 Purevar <-------- neu! - + FT_FuncVar, // 159 Purestds <-------- neu! - + FT_FuncVar, // 160 Purevars <-------- neu! - + FT_FuncFix3, // 161 Pmt2 <-------- neu! - + FT_FuncFix3, // 162 Pv2 <-------- neu! - + FT_FuncFix3, // 163 Fv2 <-------- neu! - + FT_FuncFix3, // 164 Term2 <-------- neu! - + FT_NotImpl, // 165 --- <-------- neu! - Anzahl ? - + FT_FuncFix2, // 166 D360 (US-Version) + FT_NotImpl, // 167 + FT_NotImpl, // 168 + FT_NotImpl, // 169 + FT_NotImpl, // 170 + FT_NotImpl, // 171 + FT_NotImpl, // 172 + FT_NotImpl, // 173 + FT_NotImpl, // 174 + FT_NotImpl, // 175 + FT_NotImpl, // 176 + FT_NotImpl, // 177 + FT_NotImpl, // 178 + FT_NotImpl, // 179 + FT_NotImpl, // 180 + FT_NotImpl, // 181 + FT_NotImpl, // 182 + FT_NotImpl, // 183 + FT_NotImpl, // 184 + FT_NotImpl, // 185 + FT_FuncVar, // 186 Solver <-------- neu! - + FT_NotImpl, // 187 + FT_NotImpl, // 188 + FT_NotImpl, // 189 + FT_NotImpl, // 190 + FT_NotImpl, // 191 + FT_NotImpl, // 192 + FT_NotImpl, // 193 + FT_NotImpl, // 194 + FT_NotImpl, // 195 + FT_NotImpl, // 196 + FT_NotImpl, // 197 + FT_NotImpl, // 198 + FT_NotImpl, // 199 + FT_NotImpl, // 200 + FT_NotImpl, // 201 + FT_NotImpl, // 202 + FT_NotImpl, // 203 + FT_NotImpl, // 204 + FT_NotImpl, // 205 + FT_NotImpl, // 206 + FT_NotImpl, // 207 + FT_NotImpl, // 208 + FT_NotImpl, // 209 + FT_NotImpl, // 210 + FT_NotImpl, // 211 + FT_NotImpl, // 212 + FT_NotImpl, // 213 + FT_NotImpl, // 214 + FT_NotImpl, // 215 + FT_NotImpl, // 216 + FT_NotImpl, // 217 + FT_NotImpl, // 218 + FT_NotImpl, // 219 + FT_NotImpl, // 220 + FT_NotImpl, // 221 + FT_NotImpl, // 222 + FT_NotImpl, // 223 + FT_NotImpl, // 224 + FT_NotImpl, // 225 + FT_NotImpl, // 226 + FT_NotImpl, // 227 + FT_NotImpl, // 228 + FT_NotImpl, // 229 + FT_NotImpl, // 230 + FT_NotImpl, // 231 + FT_NotImpl, // 232 + FT_NotImpl, // 233 + FT_NotImpl, // 234 + FT_NotImpl, // 235 + FT_NotImpl, // 236 + FT_NotImpl, // 237 + FT_NotImpl, // 238 + FT_NotImpl, // 239 + FT_NotImpl, // 240 + FT_NotImpl, // 241 + FT_NotImpl, // 242 + FT_NotImpl, // 243 + FT_NotImpl, // 244 + FT_NotImpl, // 245 + FT_NotImpl, // 246 + FT_NotImpl, // 247 + FT_NotImpl, // 248 + FT_NotImpl, // 249 + FT_NotImpl, // 250 + FT_NotImpl, // 251 + FT_NotImpl, // 252 + FT_NotImpl, // 253 + FT_NotImpl, // 254 + FT_NotImpl, // 255 }; return pType[ nIndex ]; } @@ -1465,263 +1465,263 @@ FUNC_TYPE LotusToSc::IndexToTypeWK123( BYTE nIndex ) DefTokenId LotusToSc::IndexToTokenWK123( BYTE nIndex ) { static const DefTokenId pToken[ 256 ] = - { // Code Bezeichnung - ocPush, // 0 8-Byte-IEEE-Long-Numbers - ocPush, // 1 Variable - ocPush, // 2 Bereich - ocPush, // 3 return - ocPush, // 4 Klammer - ocPush, // 5 Numbers - ocPush, // 6 ASCII-String - ocPush, // 7 Named range reference - ocPush, // 8 Absolut named range - ocPush, // 9 Err range reference - ocPush, // 10 Err cell reference - ocPush, // 11 Err constant - ocPush, // 12 - ocPush, // 13 - ocNegSub, // 14 Negation - ocAdd, // 15 Addition - ocSub, // 16 Subtraktion - ocMul, // 17 Multiplikation - ocDiv, // 18 Division - ocPow, // 19 Potenzierung - ocEqual, // 20 Gleichheit - ocNotEqual, // 21 Ungleich - ocLessEqual, // 22 Kleiner-gleich - ocGreaterEqual, // 23 Groesser-gleich - ocLess, // 24 Kleiner - ocGreater, // 25 Groesser - ocAnd, // 26 And (logisch) - ocOr, // 27 Or (logisch) - ocNot, // 28 Not (logisch) - ocPush, // 29 unaeres Plus - ocAmpersand, // 30 Concatenation - ocNotAvail, // 31 Not available - ocNoName, // 32 Error - ocAbs, // 33 Betrag ABS() - ocInt, // 34 Ganzzahl INT() - ocSqrt, // 35 Quadratwurzel - ocLog10, // 36 Zehnerlogarithmus - ocLn, // 37 Natuerlicher Logarithmus - ocPi, // 38 PI - ocSin, // 39 Sinus - ocCos, // 40 Cosinus - ocTan, // 41 Tangens - ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant) - ocArcTan, // 43 Arcus-Tangens (2.Quadrant) - ocArcSin, // 44 Arcus-Sinus - ocArcCos, // 45 Arcus-Cosinus - ocExp, // 46 Exponentialfunktion - ocMod, // 47 Modulo - ocChose, // 48 Auswahl - ocIsNA, // 49 Is not available? - ocIsError, // 50 Is Error? - ocFalse, // 51 FALSE - ocTrue, // 52 TRUE - ocRandom, // 53 Zufallszahl - ocGetDate, // 54 Datum - ocGetActDate, // 55 Heute - ocRMZ, // 56 Payment - ocBW, // 57 Present Value - ocZW, // 58 Future Value - ocIf, // 59 If ... then ... else ... - ocGetDay, // 60 Tag des Monats - ocGetMonth, // 61 Monat - ocGetYear, // 62 Jahr - ocRound, // 63 Runden - ocGetTime, // 64 Zeit - ocGetHour, // 65 Stunde - ocGetMin, // 66 Minute - ocGetSec, // 67 Sekunde - ocIsValue, // 68 Ist Zahl? - ocIsString, // 69 Ist Text? - ocLen, // 70 Len() - ocValue, // 71 Val() - ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall - ocMid, // 73 Mid() - ocChar, // 74 Char() - ocCode, // 75 Ascii() - ocFind, // 76 Find() - ocGetDateValue, // 77 Datevalue - ocGetTimeValue, // 78 Timevalue - ocNoName, // 79 Cellpointer - ocSum, // 80 Sum() - ocAverage, // 81 Avg() - ocCount, // 82 Cnt() - ocMin, // 83 Min() - ocMax, // 84 Max() - ocVLookup, // 85 Vlookup() - ocNPV, // 86 Npv() - ocVar, // 87 Var() - ocStDev, // 88 Std() - ocIRR, // 89 Irr() - ocHLookup, // 90 Hlookup() - ocDBSum, // 91 XlfDsum - ocDBAverage, // 92 XlfDaverage - ocDBCount, // 93 XlfDcount - ocDBMin, // 94 XlfDmin - ocDBMax, // 95 XlfDmax - ocDBVar, // 96 XlfDvar - ocDBStdDev, // 97 XlfDstdev - ocIndex, // 98 Index() - ocColumns, // 99 Cols() - ocRows, // 100 Rows() - ocRept, // 101 Repeat() - ocUpper, // 102 Upper() - ocLower, // 103 Lower() - ocLeft, // 104 Left() - ocRight, // 105 Right() - ocReplace, // 106 Replace() - ocPropper, // 107 Proper() - ocNoName, // 108 Cell() - ocTrim, // 109 Trim() - ocClean, // 110 Clean() - ocNoName, // 111 F() (Excel: T()?) - ocNoName, // 112 W() - ocExact, // 113 Exact() - ocNoName, // 114 Call() - ocIndirect, // 115 @@() - ocZins, // 116 Rate() - ocNoName, // 117 Term() - ocNoName, // 118 Cterm() - ocLIA, // 119 Sln() - ocDIA, // 120 Syd(), Soy() - ocGDA, // 121 Ddb() - ocNoName, // 122 Splfunc - ocNoName, // 123 Sheets - ocNoName, // 124 Info - ocSumProduct, // 125 Sumproduct - ocNoName, // 126 Isrange - ocDBGet, // 127 Dget - ocNoName, // 128 Dquery - ocNoName, // 129 Coord - ocNoName, // 130 Reserved (internal) - ocGetActDate, // 131 Today - ocNoName, // 132 Vdb - ocDBVarP, // 133 Dvars - ocDBStdDevP, // 134 Dstds - ocVarP, // 135 Vars - ocStDevP, // 136 Stds - ocGetDiffDate360, // 137 D360 - ocNoName, // 138 Reserved (internal) - ocNoName, // 139 Isapp - ocNoName, // 140 Isaaf - ocGetDayOfWeek, // 141 Weekday - ocGetDiffDate, // 142 Datedif - ocRank, // 143 Rank - ocNoName, // 144 Numberstring - ocNoName, // 145 Datestring - ocNoName, // 146 Decimal - ocNoName, // 147 Hex - ocNoName, // 148 Db - ocNoName, // 149 Pmti - ocNoName, // 150 Spi - ocNoName, // 151 Fullp - ocNoName, // 152 Halfp - ocNoName, // 153 Pureavg - ocCount2, // 154 Purecount - ocNoName, // 155 Puremax - ocNoName, // 156 Puremin - ocNoName, // 157 Purestd - ocNoName, // 158 Purevar - ocNoName, // 159 Purestds - ocNoName, // 160 Purevars - ocNoName, // 161 Pmt2 - ocNoName, // 162 Pv2 - ocNoName, // 163 Fv2 - ocNoName, // 164 Term2 - ocNoName, // 165 --- <-------- neu! - Anzahl ? - - ocGetDiffDate360, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion) - ocNoName, // 167 - ocNoName, // 168 - ocNoName, // 169 - ocNoName, // 170 - ocNoName, // 171 - ocNoName, // 172 - ocNoName, // 173 - ocNoName, // 174 - ocNoName, // 175 - ocNoName, // 176 - ocNoName, // 177 - ocNoName, // 178 - ocNoName, // 179 - ocNoName, // 180 - ocNoName, // 181 - ocNoName, // 182 - ocNoName, // 183 - ocNoName, // 184 - ocNoName, // 185 - ocNoName, // 186 - ocNoName, // 187 - ocNoName, // 188 - ocNoName, // 189 - ocNoName, // 190 - ocNoName, // 191 - ocNoName, // 192 - ocNoName, // 193 - ocNoName, // 194 - ocNoName, // 195 - ocNoName, // 196 - ocNoName, // 197 - ocNoName, // 198 - ocNoName, // 199 - ocNoName, // 200 - ocNoName, // 201 - ocNoName, // 202 - ocNoName, // 203 - ocNoName, // 204 - ocNoName, // 205 - ocNoName, // 206 ? - ocNoName, // 207 - ocNoName, // 208 - ocNoName, // 209 - ocNoName, // 210 - ocNoName, // 211 - ocNoName, // 212 - ocNoName, // 213 - ocNoName, // 214 - ocNoName, // 215 - ocNoName, // 216 - ocNoName, // 217 - ocNoName, // 218 - ocNoName, // 219 - ocNoName, // 220 - ocNoName, // 221 - ocNoName, // 222 - ocNoName, // 223 - ocNoName, // 224 - ocNoName, // 225 - ocNoName, // 226 - ocNoName, // 227 - ocNoName, // 228 - ocNoName, // 229 - ocNoName, // 230 - ocNoName, // 231 - ocNoName, // 232 - ocNoName, // 233 - ocNoName, // 234 - ocNoName, // 235 - ocNoName, // 236 - ocNoName, // 237 - ocNoName, // 238 - ocNoName, // 239 - ocNoName, // 240 - ocNoName, // 241 - ocNoName, // 242 - ocNoName, // 243 - ocNoName, // 244 - ocNoName, // 245 - ocNoName, // 246 - ocNoName, // 247 - ocNoName, // 248 - ocNoName, // 249 - ocNoName, // 250 - ocNoName, // 251 - ocNoName, // 252 - ocNoName, // 253 - ocNoName, // 254 - ocNoName // 255 ? + { // Code Bezeichnung + ocPush, // 0 8-Byte-IEEE-Long-Numbers + ocPush, // 1 Variable + ocPush, // 2 Bereich + ocPush, // 3 return + ocPush, // 4 Klammer + ocPush, // 5 Numbers + ocPush, // 6 ASCII-String + ocPush, // 7 Named range reference + ocPush, // 8 Absolut named range + ocPush, // 9 Err range reference + ocPush, // 10 Err cell reference + ocPush, // 11 Err constant + ocPush, // 12 + ocPush, // 13 + ocNegSub, // 14 Negation + ocAdd, // 15 Addition + ocSub, // 16 Subtraktion + ocMul, // 17 Multiplikation + ocDiv, // 18 Division + ocPow, // 19 Potenzierung + ocEqual, // 20 Gleichheit + ocNotEqual, // 21 Ungleich + ocLessEqual, // 22 Kleiner-gleich + ocGreaterEqual, // 23 Groesser-gleich + ocLess, // 24 Kleiner + ocGreater, // 25 Groesser + ocAnd, // 26 And (logisch) + ocOr, // 27 Or (logisch) + ocNot, // 28 Not (logisch) + ocPush, // 29 unaeres Plus + ocAmpersand, // 30 Concatenation + ocNotAvail, // 31 Not available + ocNoName, // 32 Error + ocAbs, // 33 Betrag ABS() + ocInt, // 34 Ganzzahl INT() + ocSqrt, // 35 Quadratwurzel + ocLog10, // 36 Zehnerlogarithmus + ocLn, // 37 Natuerlicher Logarithmus + ocPi, // 38 PI + ocSin, // 39 Sinus + ocCos, // 40 Cosinus + ocTan, // 41 Tangens + ocArcTan2, // 42 Arcus-Tangens 2 (4.Quadrant) + ocArcTan, // 43 Arcus-Tangens (2.Quadrant) + ocArcSin, // 44 Arcus-Sinus + ocArcCos, // 45 Arcus-Cosinus + ocExp, // 46 Exponentialfunktion + ocMod, // 47 Modulo + ocChose, // 48 Auswahl + ocIsNA, // 49 Is not available? + ocIsError, // 50 Is Error? + ocFalse, // 51 FALSE + ocTrue, // 52 TRUE + ocRandom, // 53 Zufallszahl + ocGetDate, // 54 Datum + ocGetActDate, // 55 Heute + ocRMZ, // 56 Payment + ocBW, // 57 Present Value + ocZW, // 58 Future Value + ocIf, // 59 If ... then ... else ... + ocGetDay, // 60 Tag des Monats + ocGetMonth, // 61 Monat + ocGetYear, // 62 Jahr + ocRound, // 63 Runden + ocGetTime, // 64 Zeit + ocGetHour, // 65 Stunde + ocGetMin, // 66 Minute + ocGetSec, // 67 Sekunde + ocIsValue, // 68 Ist Zahl? + ocIsString, // 69 Ist Text? + ocLen, // 70 Len() + ocValue, // 71 Val() + ocFixed, // 72 String() ocFixed ersatzweise + Spezialfall + ocMid, // 73 Mid() + ocChar, // 74 Char() + ocCode, // 75 Ascii() + ocFind, // 76 Find() + ocGetDateValue, // 77 Datevalue + ocGetTimeValue, // 78 Timevalue + ocNoName, // 79 Cellpointer + ocSum, // 80 Sum() + ocAverage, // 81 Avg() + ocCount, // 82 Cnt() + ocMin, // 83 Min() + ocMax, // 84 Max() + ocVLookup, // 85 Vlookup() + ocNPV, // 86 Npv() + ocVar, // 87 Var() + ocStDev, // 88 Std() + ocIRR, // 89 Irr() + ocHLookup, // 90 Hlookup() + ocDBSum, // 91 XlfDsum + ocDBAverage, // 92 XlfDaverage + ocDBCount, // 93 XlfDcount + ocDBMin, // 94 XlfDmin + ocDBMax, // 95 XlfDmax + ocDBVar, // 96 XlfDvar + ocDBStdDev, // 97 XlfDstdev + ocIndex, // 98 Index() + ocColumns, // 99 Cols() + ocRows, // 100 Rows() + ocRept, // 101 Repeat() + ocUpper, // 102 Upper() + ocLower, // 103 Lower() + ocLeft, // 104 Left() + ocRight, // 105 Right() + ocReplace, // 106 Replace() + ocPropper, // 107 Proper() + ocNoName, // 108 Cell() + ocTrim, // 109 Trim() + ocClean, // 110 Clean() + ocNoName, // 111 F() (Excel: T()?) + ocNoName, // 112 W() + ocExact, // 113 Exact() + ocNoName, // 114 Call() + ocIndirect, // 115 @@() + ocZins, // 116 Rate() + ocNoName, // 117 Term() + ocNoName, // 118 Cterm() + ocLIA, // 119 Sln() + ocDIA, // 120 Syd(), Soy() + ocGDA, // 121 Ddb() + ocNoName, // 122 Splfunc + ocNoName, // 123 Sheets + ocNoName, // 124 Info + ocSumProduct, // 125 Sumproduct + ocNoName, // 126 Isrange + ocDBGet, // 127 Dget + ocNoName, // 128 Dquery + ocNoName, // 129 Coord + ocNoName, // 130 Reserved (internal) + ocGetActDate, // 131 Today + ocNoName, // 132 Vdb + ocDBVarP, // 133 Dvars + ocDBStdDevP, // 134 Dstds + ocVarP, // 135 Vars + ocStDevP, // 136 Stds + ocGetDiffDate360, // 137 D360 + ocNoName, // 138 Reserved (internal) + ocNoName, // 139 Isapp + ocNoName, // 140 Isaaf + ocGetDayOfWeek, // 141 Weekday + ocGetDiffDate, // 142 Datedif + ocRank, // 143 Rank + ocNoName, // 144 Numberstring + ocNoName, // 145 Datestring + ocNoName, // 146 Decimal + ocNoName, // 147 Hex + ocNoName, // 148 Db + ocNoName, // 149 Pmti + ocNoName, // 150 Spi + ocNoName, // 151 Fullp + ocNoName, // 152 Halfp + ocNoName, // 153 Pureavg + ocCount2, // 154 Purecount + ocNoName, // 155 Puremax + ocNoName, // 156 Puremin + ocNoName, // 157 Purestd + ocNoName, // 158 Purevar + ocNoName, // 159 Purestds + ocNoName, // 160 Purevars + ocNoName, // 161 Pmt2 + ocNoName, // 162 Pv2 + ocNoName, // 163 Fv2 + ocNoName, // 164 Term2 + ocNoName, // 165 --- <-------- neu! - Anzahl ? - + ocGetDiffDate360, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion) + ocNoName, // 167 + ocNoName, // 168 + ocNoName, // 169 + ocNoName, // 170 + ocNoName, // 171 + ocNoName, // 172 + ocNoName, // 173 + ocNoName, // 174 + ocNoName, // 175 + ocNoName, // 176 + ocNoName, // 177 + ocNoName, // 178 + ocNoName, // 179 + ocNoName, // 180 + ocNoName, // 181 + ocNoName, // 182 + ocNoName, // 183 + ocNoName, // 184 + ocNoName, // 185 + ocNoName, // 186 + ocNoName, // 187 + ocNoName, // 188 + ocNoName, // 189 + ocNoName, // 190 + ocNoName, // 191 + ocNoName, // 192 + ocNoName, // 193 + ocNoName, // 194 + ocNoName, // 195 + ocNoName, // 196 + ocNoName, // 197 + ocNoName, // 198 + ocNoName, // 199 + ocNoName, // 200 + ocNoName, // 201 + ocNoName, // 202 + ocNoName, // 203 + ocNoName, // 204 + ocNoName, // 205 + ocNoName, // 206 ? + ocNoName, // 207 + ocNoName, // 208 + ocNoName, // 209 + ocNoName, // 210 + ocNoName, // 211 + ocNoName, // 212 + ocNoName, // 213 + ocNoName, // 214 + ocNoName, // 215 + ocNoName, // 216 + ocNoName, // 217 + ocNoName, // 218 + ocNoName, // 219 + ocNoName, // 220 + ocNoName, // 221 + ocNoName, // 222 + ocNoName, // 223 + ocNoName, // 224 + ocNoName, // 225 + ocNoName, // 226 + ocNoName, // 227 + ocNoName, // 228 + ocNoName, // 229 + ocNoName, // 230 + ocNoName, // 231 + ocNoName, // 232 + ocNoName, // 233 + ocNoName, // 234 + ocNoName, // 235 + ocNoName, // 236 + ocNoName, // 237 + ocNoName, // 238 + ocNoName, // 239 + ocNoName, // 240 + ocNoName, // 241 + ocNoName, // 242 + ocNoName, // 243 + ocNoName, // 244 + ocNoName, // 245 + ocNoName, // 246 + ocNoName, // 247 + ocNoName, // 248 + ocNoName, // 249 + ocNoName, // 250 + ocNoName, // 251 + ocNoName, // 252 + ocNoName, // 253 + ocNoName, // 254 + ocNoName // 255 ? }; return pToken[ nIndex ]; @@ -1732,264 +1732,264 @@ DefTokenId LotusToSc::IndexToTokenWK123( BYTE nIndex ) const sal_Char* GetAddInName( const UINT8 n ) { - static const sal_Char* pNames[ 256 ] = + static const sal_Char* pNames[ 256 ] = { - NULL, // 0 8-Byte-IEEE-Float - NULL, // 1 Variable - NULL, // 2 Bereich - NULL, // 3 return - NULL, // 4 Klammer - NULL, // 5 2-Byte-Integer - NULL, // 6 ASCII-String - NULL, // 7 Named range reference - NULL, // 8 Absolut named range - NULL, // 9 Err range reference - NULL, // 10 Err cell reference - NULL, // 11 Err constant - NULL, // 12 - NULL, // 13 - NULL, // 14 Negation - NULL, // 15 Addition - NULL, // 16 Subtraktion - NULL, // 17 Multiplikation - NULL, // 18 Division - NULL, // 19 Potenzierung - NULL, // 20 Gleichheit - NULL, // 21 Ungleich - NULL, // 22 Kleiner-gleich - NULL, // 23 Groesser-gleich - NULL, // 24 Kleiner - NULL, // 25 Groesser - NULL, // 26 And (logisch) - NULL, // 27 Or (logisch) - NULL, // 28 Not (logisch) - NULL, // 29 unaeres Plus - NULL, // 30 Concatenation - NULL, // 31 Not applicable - NULL, // 32 Error - NULL, // 33 Betrag ABS() - NULL, // 34 Ganzzahl INT() - NULL, // 35 Quadratwurzel - NULL, // 36 Zehnerlogarithmus - NULL, // 37 Natuerlicher Logarithmus - NULL, // 38 PI - NULL, // 39 Sinus - NULL, // 40 Cosinus - NULL, // 41 Tangens - NULL, // 42 Arcus-Tangens 2 (4.Quadrant) - NULL, // 43 Arcus-Tangens (2.Quadrant) - NULL, // 44 Arcus-Sinus - NULL, // 45 Arcus-Cosinus - NULL, // 46 Exponentialfunktion - NULL, // 47 Modulo - NULL, // 48 Auswahl - NULL, // 49 Is not applicable? - NULL, // 50 Is Error? - NULL, // 51 FALSE - NULL, // 52 TRUE - NULL, // 53 Zufallszahl - NULL, // 54 Datum - NULL, // 55 Heute - NULL, // 56 Payment - NULL, // 57 Present Value - NULL, // 58 Future Value - NULL, // 59 If ... then ... else ... - NULL, // 60 Tag des Monats - NULL, // 61 Monat - NULL, // 62 Jahr - NULL, // 63 Runden - NULL, // 64 Zeit - NULL, // 65 Stunde - NULL, // 66 Minute - NULL, // 67 Sekunde - NULL, // 68 Ist Zahl? - NULL, // 69 Ist Text? - NULL, // 70 Len() - NULL, // 71 Val() - NULL, // 72 String() ocFixed ersatzweise + Spezialfall - NULL, // 73 Mid() - NULL, // 74 Char() - NULL, // 75 Ascii() - NULL, // 76 Find() - NULL, // 77 Datevalue - NULL, // 78 Timevalue - "ZELLZEIGER", // 79 Cellpointer - NULL, // 80 Sum() - NULL, // 81 Avg() - NULL, // 82 Cnt() - NULL, // 83 Min() - NULL, // 84 Max() - NULL, // 85 Vlookup() - NULL, // 86 Npv() - NULL, // 87 Var() - NULL, // 88 Std() - NULL, // 89 Irr() - NULL, // 90 Hlookup() - NULL, // 91 XlfDsum - NULL, // 92 XlfDaverage - NULL, // 93 XlfDcount - NULL, // 94 XlfDmin - NULL, // 95 XlfDmax - NULL, // 96 XlfDvar - NULL, // 97 XlfDstdev - NULL, // 98 Index() - NULL, // 99 Cols() - NULL, // 100 Rows() - NULL, // 101 Repeat() - NULL, // 102 Upper() - NULL, // 103 Lower() - NULL, // 104 Left() - NULL, // 105 Right() - NULL, // 106 Replace() - NULL, // 107 Proper() - "ZELLE", // 108 Cell() - NULL, // 109 Trim() - NULL, // 110 Clean() - "F", // 111 F() (Excel: T()?) - "W", // 112 W() - NULL, // 113 Exact() - NULL, // 114 Call() - NULL, // 115 @@() - NULL, // 116 Rate() - "ANN", // 117 Term() - NULL, // 118 Cterm() - NULL, // 119 Sln() - NULL, // 120 Syd(), Soy() - NULL, // 121 Ddb() - "SplFunc", // 122 Splfunc - "BLAETTER", // 123 Sheets - "INFO", // 124 Info - NULL, // 125 Sumproduct - "ISTBEREICH", // 126 Isrange - NULL, // 127 Dget - "DABFRAGE", // 128 Dquery - "KOORD", // 129 Coord - NULL, // 130 Reserved (internal) - NULL, // 131 Today - NULL, // 132 Vdb - NULL, // 133 Dvars - NULL, // 134 Dstds - NULL, // 135 Vars - NULL, // 136 Stds - NULL, // 137 D360 - NULL, // 138 Reserved (internal) - NULL, // 139 Isapp - "ISTDEFZUS", // 140 Isaaf - NULL, // 141 Weekday - NULL, // 142 Datedif - NULL, // 143 Rank - NULL, // 144 Numberstring - "DATUMFOLGE", // 145 Datestring - "DEZIMAL", // 146 Decimal - "HEX", // 147 Hex - NULL, // 148 Db - NULL, // 149 Pmti - NULL, // 150 Spi - NULL, // 151 Fullp - NULL, // 152 Halfp - "PURMITTELWERT", // 153 Pureavg - "PURANZAHL", // 154 Purecount - "PURMAX", // 155 Puremax - "PURMIN", // 156 Puremin - "PURSTDABW", // 157 Purestd - "PURVAR", // 158 Purevar - "PURSTDABWP", // 159 Purestds - "PURVARP", // 160 Purevars - NULL, // 161 Pmt2 - NULL, // 162 Pv2 - NULL, // 163 Fv2 - NULL, // 164 Term2 - NULL, // 165 --- <-------- neu! - Anzahl ? - - NULL, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion) - NULL, // 167 - NULL, // 168 - NULL, // 169 - NULL, // 170 - NULL, // 171 - NULL, // 172 - NULL, // 173 - NULL, // 174 - NULL, // 175 - NULL, // 176 - NULL, // 177 - NULL, // 178 - NULL, // 179 - NULL, // 180 - NULL, // 181 - NULL, // 182 - NULL, // 183 - NULL, // 184 - NULL, // 185 - NULL, // 186 - NULL, // 187 - NULL, // 188 - NULL, // 189 - NULL, // 190 - NULL, // 191 - NULL, // 192 - NULL, // 193 - NULL, // 194 - NULL, // 195 - NULL, // 196 - NULL, // 197 - NULL, // 198 - NULL, // 199 - NULL, // 200 - NULL, // 201 - NULL, // 202 - NULL, // 203 - NULL, // 204 - NULL, // 205 - NULL, // 206 ? - NULL, // 207 - NULL, // 208 - NULL, // 209 - NULL, // 210 - NULL, // 211 - NULL, // 212 - NULL, // 213 - NULL, // 214 - NULL, // 215 - NULL, // 216 - NULL, // 217 - NULL, // 218 - NULL, // 219 - NULL, // 220 - NULL, // 221 - NULL, // 222 - NULL, // 223 - NULL, // 224 - NULL, // 225 - NULL, // 226 - NULL, // 227 - NULL, // 228 - NULL, // 229 - NULL, // 230 - NULL, // 231 - NULL, // 232 - NULL, // 233 - NULL, // 234 - NULL, // 235 - NULL, // 236 - NULL, // 237 - NULL, // 238 - NULL, // 239 - NULL, // 240 - NULL, // 241 - NULL, // 242 - NULL, // 243 - NULL, // 244 - NULL, // 245 - NULL, // 246 - NULL, // 247 - NULL, // 248 - NULL, // 249 - NULL, // 250 - NULL, // 251 - NULL, // 252 - NULL, // 253 - NULL, // 254 - NULL // 255 ? + NULL, // 0 8-Byte-IEEE-Float + NULL, // 1 Variable + NULL, // 2 Bereich + NULL, // 3 return + NULL, // 4 Klammer + NULL, // 5 2-Byte-Integer + NULL, // 6 ASCII-String + NULL, // 7 Named range reference + NULL, // 8 Absolut named range + NULL, // 9 Err range reference + NULL, // 10 Err cell reference + NULL, // 11 Err constant + NULL, // 12 + NULL, // 13 + NULL, // 14 Negation + NULL, // 15 Addition + NULL, // 16 Subtraktion + NULL, // 17 Multiplikation + NULL, // 18 Division + NULL, // 19 Potenzierung + NULL, // 20 Gleichheit + NULL, // 21 Ungleich + NULL, // 22 Kleiner-gleich + NULL, // 23 Groesser-gleich + NULL, // 24 Kleiner + NULL, // 25 Groesser + NULL, // 26 And (logisch) + NULL, // 27 Or (logisch) + NULL, // 28 Not (logisch) + NULL, // 29 unaeres Plus + NULL, // 30 Concatenation + NULL, // 31 Not applicable + NULL, // 32 Error + NULL, // 33 Betrag ABS() + NULL, // 34 Ganzzahl INT() + NULL, // 35 Quadratwurzel + NULL, // 36 Zehnerlogarithmus + NULL, // 37 Natuerlicher Logarithmus + NULL, // 38 PI + NULL, // 39 Sinus + NULL, // 40 Cosinus + NULL, // 41 Tangens + NULL, // 42 Arcus-Tangens 2 (4.Quadrant) + NULL, // 43 Arcus-Tangens (2.Quadrant) + NULL, // 44 Arcus-Sinus + NULL, // 45 Arcus-Cosinus + NULL, // 46 Exponentialfunktion + NULL, // 47 Modulo + NULL, // 48 Auswahl + NULL, // 49 Is not applicable? + NULL, // 50 Is Error? + NULL, // 51 FALSE + NULL, // 52 TRUE + NULL, // 53 Zufallszahl + NULL, // 54 Datum + NULL, // 55 Heute + NULL, // 56 Payment + NULL, // 57 Present Value + NULL, // 58 Future Value + NULL, // 59 If ... then ... else ... + NULL, // 60 Tag des Monats + NULL, // 61 Monat + NULL, // 62 Jahr + NULL, // 63 Runden + NULL, // 64 Zeit + NULL, // 65 Stunde + NULL, // 66 Minute + NULL, // 67 Sekunde + NULL, // 68 Ist Zahl? + NULL, // 69 Ist Text? + NULL, // 70 Len() + NULL, // 71 Val() + NULL, // 72 String() ocFixed ersatzweise + Spezialfall + NULL, // 73 Mid() + NULL, // 74 Char() + NULL, // 75 Ascii() + NULL, // 76 Find() + NULL, // 77 Datevalue + NULL, // 78 Timevalue + "ZELLZEIGER", // 79 Cellpointer + NULL, // 80 Sum() + NULL, // 81 Avg() + NULL, // 82 Cnt() + NULL, // 83 Min() + NULL, // 84 Max() + NULL, // 85 Vlookup() + NULL, // 86 Npv() + NULL, // 87 Var() + NULL, // 88 Std() + NULL, // 89 Irr() + NULL, // 90 Hlookup() + NULL, // 91 XlfDsum + NULL, // 92 XlfDaverage + NULL, // 93 XlfDcount + NULL, // 94 XlfDmin + NULL, // 95 XlfDmax + NULL, // 96 XlfDvar + NULL, // 97 XlfDstdev + NULL, // 98 Index() + NULL, // 99 Cols() + NULL, // 100 Rows() + NULL, // 101 Repeat() + NULL, // 102 Upper() + NULL, // 103 Lower() + NULL, // 104 Left() + NULL, // 105 Right() + NULL, // 106 Replace() + NULL, // 107 Proper() + "ZELLE", // 108 Cell() + NULL, // 109 Trim() + NULL, // 110 Clean() + "F", // 111 F() (Excel: T()?) + "W", // 112 W() + NULL, // 113 Exact() + NULL, // 114 Call() + NULL, // 115 @@() + NULL, // 116 Rate() + "ANN", // 117 Term() + NULL, // 118 Cterm() + NULL, // 119 Sln() + NULL, // 120 Syd(), Soy() + NULL, // 121 Ddb() + "SplFunc", // 122 Splfunc + "BLAETTER", // 123 Sheets + "INFO", // 124 Info + NULL, // 125 Sumproduct + "ISTBEREICH", // 126 Isrange + NULL, // 127 Dget + "DABFRAGE", // 128 Dquery + "KOORD", // 129 Coord + NULL, // 130 Reserved (internal) + NULL, // 131 Today + NULL, // 132 Vdb + NULL, // 133 Dvars + NULL, // 134 Dstds + NULL, // 135 Vars + NULL, // 136 Stds + NULL, // 137 D360 + NULL, // 138 Reserved (internal) + NULL, // 139 Isapp + "ISTDEFZUS", // 140 Isaaf + NULL, // 141 Weekday + NULL, // 142 Datedif + NULL, // 143 Rank + NULL, // 144 Numberstring + "DATUMFOLGE", // 145 Datestring + "DEZIMAL", // 146 Decimal + "HEX", // 147 Hex + NULL, // 148 Db + NULL, // 149 Pmti + NULL, // 150 Spi + NULL, // 151 Fullp + NULL, // 152 Halfp + "PURMITTELWERT", // 153 Pureavg + "PURANZAHL", // 154 Purecount + "PURMAX", // 155 Puremax + "PURMIN", // 156 Puremin + "PURSTDABW", // 157 Purestd + "PURVAR", // 158 Purevar + "PURSTDABWP", // 159 Purestds + "PURVARP", // 160 Purevars + NULL, // 161 Pmt2 + NULL, // 162 Pv2 + NULL, // 163 Fv2 + NULL, // 164 Term2 + NULL, // 165 --- <-------- neu! - Anzahl ? - + NULL, // 166 D360 (US-Version, ersatzweise wie ander D360-Funktion) + NULL, // 167 + NULL, // 168 + NULL, // 169 + NULL, // 170 + NULL, // 171 + NULL, // 172 + NULL, // 173 + NULL, // 174 + NULL, // 175 + NULL, // 176 + NULL, // 177 + NULL, // 178 + NULL, // 179 + NULL, // 180 + NULL, // 181 + NULL, // 182 + NULL, // 183 + NULL, // 184 + NULL, // 185 + NULL, // 186 + NULL, // 187 + NULL, // 188 + NULL, // 189 + NULL, // 190 + NULL, // 191 + NULL, // 192 + NULL, // 193 + NULL, // 194 + NULL, // 195 + NULL, // 196 + NULL, // 197 + NULL, // 198 + NULL, // 199 + NULL, // 200 + NULL, // 201 + NULL, // 202 + NULL, // 203 + NULL, // 204 + NULL, // 205 + NULL, // 206 ? + NULL, // 207 + NULL, // 208 + NULL, // 209 + NULL, // 210 + NULL, // 211 + NULL, // 212 + NULL, // 213 + NULL, // 214 + NULL, // 215 + NULL, // 216 + NULL, // 217 + NULL, // 218 + NULL, // 219 + NULL, // 220 + NULL, // 221 + NULL, // 222 + NULL, // 223 + NULL, // 224 + NULL, // 225 + NULL, // 226 + NULL, // 227 + NULL, // 228 + NULL, // 229 + NULL, // 230 + NULL, // 231 + NULL, // 232 + NULL, // 233 + NULL, // 234 + NULL, // 235 + NULL, // 236 + NULL, // 237 + NULL, // 238 + NULL, // 239 + NULL, // 240 + NULL, // 241 + NULL, // 242 + NULL, // 243 + NULL, // 244 + NULL, // 245 + NULL, // 246 + NULL, // 247 + NULL, // 248 + NULL, // 249 + NULL, // 250 + NULL, // 251 + NULL, // 252 + NULL, // 253 + NULL, // 254 + NULL // 255 ? }; return pNames[ n ]; @@ -1998,7 +1998,7 @@ const sal_Char* GetAddInName( const UINT8 n ) DefTokenId lcl_KnownAddIn( const ByteString& sTest ) { - DefTokenId eId = ocNoName; + DefTokenId eId = ocNoName; if( sTest == "FACT" ) eId = ocFact; diff --git a/sc/source/filter/lotus/lotimpop.cxx b/sc/source/filter/lotus/lotimpop.cxx index d5aad61a6054..1ab94fc96a69 100644 --- a/sc/source/filter/lotus/lotimpop.cxx +++ b/sc/source/filter/lotus/lotimpop.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 @@ -92,8 +92,8 @@ ImportLotus::~ImportLotus() void ImportLotus::Bof( void ) { - UINT16 nFileCode, nFileSub, nSaveCnt; - BYTE nMajorId, nMinorId, nFlags; + UINT16 nFileCode, nFileSub, nSaveCnt; + BYTE nMajorId, nMinorId, nFlags; Read( nFileCode ); Read( nFileSub ); @@ -120,7 +120,7 @@ void ImportLotus::Bof( void ) BOOL ImportLotus::BofFm3( void ) { - UINT16 nFileCode, nFileSub; + UINT16 nFileCode, nFileSub; Read( nFileCode ); Read( nFileSub ); @@ -134,7 +134,7 @@ void ImportLotus::Columnwidth( UINT16 nRecLen ) DBG_ASSERT( nRecLen >= 4, "*ImportLotus::Columnwidth(): Record zu kurz!" ); BYTE nLTab, nWindow2; - UINT16 nCnt = ( nRecLen - 4 ) / 2; + UINT16 nCnt = ( nRecLen - 4 ) / 2; Read( nLTab ); Read( nWindow2 ); @@ -146,7 +146,7 @@ void ImportLotus::Columnwidth( UINT16 nRecLen ) { Skip( 2 ); - BYTE nCol, nSpaces; + BYTE nCol, nSpaces; while( nCnt ) { @@ -166,7 +166,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen ) DBG_ASSERT( nRecLen >= 4, "*ImportLotus::Hiddencolumn(): Record zu kurz!" ); BYTE nLTab, nWindow2; - UINT16 nCnt = ( nRecLen - 4 ) / 2; + UINT16 nCnt = ( nRecLen - 4 ) / 2; Read( nLTab ); Read( nWindow2 ); @@ -175,7 +175,7 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen ) { Skip( 2 ); - BYTE nCol; + BYTE nCol; while( nCnt ) { @@ -190,15 +190,15 @@ void ImportLotus::Hiddencolumn( UINT16 nRecLen ) void ImportLotus::Userrange( void ) { - UINT16 nRangeType; - ScRange aScRange; - sal_Char* pBuffer = new sal_Char[ 32 ]; + UINT16 nRangeType; + ScRange aScRange; + sal_Char* pBuffer = new sal_Char[ 32 ]; Read( nRangeType ); pIn->Read( pBuffer, 16 ); - pBuffer[ 16 ] = ( sal_Char ) 0x00; // zur Sicherheit... - String aName( pBuffer, eQuellChar ); + pBuffer[ 16 ] = ( sal_Char ) 0x00; // zur Sicherheit... + String aName( pBuffer, eQuellChar ); Read( aScRange ); @@ -209,7 +209,7 @@ void ImportLotus::Userrange( void ) void ImportLotus::Errcell( void ) { - ScAddress aA; + ScAddress aA; Read( aA ); @@ -219,7 +219,7 @@ void ImportLotus::Errcell( void ) void ImportLotus::Nacell( void ) { - ScAddress aA; + ScAddress aA; Read( aA ); @@ -229,15 +229,15 @@ void ImportLotus::Nacell( void ) void ImportLotus::Labelcell( void ) { - ScAddress aA; - String aLabel; - sal_Char cAlign; + ScAddress aA; + String aLabel; + sal_Char cAlign; Read( aA ); Read( cAlign ); Read( aLabel ); -// aLabel.Convert( pLotusRoot->eCharsetQ ); +// aLabel.Convert( pLotusRoot->eCharsetQ ); pD->PutCell( aA.Col(), aA.Row(), aA.Tab(), new ScStringCell( aLabel ), (BOOL)TRUE ); } @@ -245,8 +245,8 @@ void ImportLotus::Labelcell( void ) void ImportLotus::Numbercell( void ) { - ScAddress aAddr; - double fVal; + ScAddress aAddr; + double fVal; Read( aAddr ); Read( fVal ); @@ -258,8 +258,8 @@ void ImportLotus::Numbercell( void ) void ImportLotus::Smallnumcell( void ) { - ScAddress aAddr; - INT16 nVal; + ScAddress aAddr; + INT16 nVal; Read( aAddr ); Read( nVal ); @@ -273,21 +273,21 @@ ScFormulaCell *ImportLotus::Formulacell( UINT16 n ) { DBG_ASSERT( pIn, "-ImportLotus::Formulacell(): Null-Stream -> Rums!" ); - ScAddress aAddr; + ScAddress aAddr; Read( aAddr ); Skip( 10 ); n -= 14; - const ScTokenArray* pErg; - INT32 nRest = n; + const ScTokenArray* pErg; + INT32 nRest = n; aConv.Reset( aAddr ); aConv.SetWK3(); aConv.Convert( pErg, nRest ); - ScFormulaCell* pZelle = new ScFormulaCell( pD, aAddr, pErg ); + ScFormulaCell* pZelle = new ScFormulaCell( pD, aAddr, pErg ); pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE ); @@ -308,8 +308,8 @@ void ImportLotus::RowPresentation( UINT16 nRecLen ) DBG_ASSERT( nRecLen > 4, "*ImportLotus::RowPresentation(): Record zu kurz!" ); BYTE nLTab, nFlags; - UINT16 nRow, nHeight; - UINT16 nCnt = ( nRecLen - 4 ) / 8; + UINT16 nRow, nHeight; + UINT16 nCnt = ( nRecLen - 4 ) / 8; Read( nLTab ); Skip( 1 ); @@ -322,11 +322,11 @@ void ImportLotus::RowPresentation( UINT16 nRecLen ) Read( nFlags ); Skip( 1 ); - if( nFlags & 0x02 ) // Fixed / Strech to fit fonts - { // fixed + if( nFlags & 0x02 ) // Fixed / Strech to fit fonts + { // fixed // Height in Lotus in 1/32 Points - nHeight *= 20; // -> 32 * TWIPS - nHeight /= 32; // -> TWIPS + nHeight *= 20; // -> 32 * TWIPS + nHeight /= 32; // -> TWIPS pD->SetRowFlags( static_cast<SCROW> (nRow), static_cast<SCTAB> (nLTab), pD->GetRowFlags( static_cast<SCROW> (nRow), static_cast<SCTAB> (nLTab) ) | CR_MANUALSIZE ); @@ -341,7 +341,7 @@ void ImportLotus::RowPresentation( UINT16 nRecLen ) void ImportLotus::NamedSheet( void ) { UINT16 nLTab; - String aName; + String aName; Read( nLTab ); Read( aName ); @@ -355,8 +355,8 @@ void ImportLotus::NamedSheet( void ) void ImportLotus::Font_Face( void ) { - BYTE nNum; - String aName; + BYTE nNum; + String aName; Read( nNum ); @@ -374,8 +374,8 @@ void ImportLotus::Font_Face( void ) void ImportLotus::Font_Type( void ) { static const UINT16 nAnz = 8; - UINT16 nCnt; - UINT16 nType; + UINT16 nCnt; + UINT16 nType; for( nCnt = 0 ; nCnt < nAnz ; nCnt++ ) { @@ -387,9 +387,9 @@ void ImportLotus::Font_Type( void ) void ImportLotus::Font_Ysize( void ) { - static const UINT16 nAnz = 8; - UINT16 nCnt; - UINT16 nSize; + static const UINT16 nAnz = 8; + UINT16 nCnt; + UINT16 nSize; for( nCnt = 0 ; nCnt < nAnz ; nCnt++ ) { @@ -403,14 +403,14 @@ void ImportLotus::_Row( const UINT16 nRecLen ) { DBG_ASSERT( nExtTab >= 0, "*ImportLotus::_Row(): Kann hier nicht sein!" ); - UINT16 nRow; - UINT16 nHeight; - UINT16 nCntDwn = ( nRecLen - 4 ) / 5; - SCCOL nColCnt = 0; - UINT8 nRepeats; - LotAttrWK3 aAttr; + UINT16 nRow; + UINT16 nHeight; + UINT16 nCntDwn = ( nRecLen - 4 ) / 5; + SCCOL nColCnt = 0; + UINT8 nRepeats; + LotAttrWK3 aAttr; - BOOL bCenter = FALSE; + BOOL bCenter = FALSE; SCCOL nCenterStart = 0, nCenterEnd = 0; Read( nRow ); diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx index ebd9f968686f..ee54bfef1f29 100644 --- a/sc/source/filter/lotus/lotread.cxx +++ b/sc/source/filter/lotus/lotread.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,22 +49,22 @@ FltError ImportLotus::Read() { enum STATE { - S_START, // analyse first BOF - S_WK1, // in WK1-Stream - S_WK3, // in WK3-Section - S_WK4, // ... - S_FM3, // ... - S_END // Import finished + S_START, // analyse first BOF + S_WK1, // in WK1-Stream + S_WK3, // in WK3-Section + S_WK4, // ... + S_FM3, // ... + S_END // Import finished }; - UINT16 nOp; - UINT16 nSubType; - UINT16 nRecLen; - UINT32 nNextRec = 0UL; - FltError eRet = eERR_OK; -// ScFormulaCell *pLastFormCell; + UINT16 nOp; + UINT16 nSubType; + UINT16 nRecLen; + UINT32 nNextRec = 0UL; + FltError eRet = eERR_OK; +// ScFormulaCell *pLastFormCell; - STATE eAkt = S_START; + STATE eAkt = S_START; nTab = 0; nExtTab = -2; @@ -86,7 +86,7 @@ FltError ImportLotus::Read() switch( eAkt ) { // ----------------------------------------------------------- - case S_START: // S_START + case S_START: // S_START if( nOp ) { eRet = SCERR_IMPORT_UNKNOWN_WK; @@ -99,9 +99,9 @@ FltError ImportLotus::Read() Bof(); switch( pLotusRoot->eFirstType ) { - case Lotus_WK1: eAkt = S_WK1; break; - case Lotus_WK3: eAkt = S_WK3; break; - case Lotus_WK4: eAkt = S_WK4; break; + case Lotus_WK1: eAkt = S_WK1; break; + case Lotus_WK3: eAkt = S_WK3; break; + case Lotus_WK4: eAkt = S_WK4; break; case Lotus_FM3: eAkt = S_FM3; break; default: eRet = SCERR_IMPORT_UNKNOWN_WK; @@ -110,78 +110,78 @@ FltError ImportLotus::Read() } else { - eAkt = S_END; // hier kommt wat fuer <= WK1 hinne! + eAkt = S_END; // hier kommt wat fuer <= WK1 hinne! eRet = 0xFFFFFFFF; } } break; // ----------------------------------------------------------- - case S_WK1: // S_WK1 + case S_WK1: // S_WK1 break; // ----------------------------------------------------------- - case S_WK3: // S_WK3 - case S_WK4: // S_WK4 + case S_WK3: // S_WK3 + case S_WK4: // S_WK4 switch( nOp ) { - case 0x0001: // EOF + case 0x0001: // EOF eAkt = S_FM3; nTab++; break; - case 0x0002: // PASSWORD + case 0x0002: // PASSWORD eRet = eERR_FILEPASSWD; eAkt = S_END; break; - case 0x0007: // COLUMNWIDTH + case 0x0007: // COLUMNWIDTH Columnwidth( nRecLen ); break; - case 0x0008: // HIDDENCOLUMN + case 0x0008: // HIDDENCOLUMN Hiddencolumn( nRecLen ); break; - case 0x0009: // USERRANGE + case 0x0009: // USERRANGE Userrange(); break; - case 0x0013: // FORMAT + case 0x0013: // FORMAT break; - case 0x0014: // ERRCELL + case 0x0014: // ERRCELL Errcell(); break; - case 0x0015: // NACELL + case 0x0015: // NACELL Nacell(); break; - case 0x0016: // LABELCELL + case 0x0016: // LABELCELL Labelcell(); break; - case 0x0017: // NUMBERCELL + case 0x0017: // NUMBERCELL Numbercell(); break; - case 0x0018: // SMALLNUMCELL + case 0x0018: // SMALLNUMCELL Smallnumcell(); break; - case 0x0019: // FORMULACELL + case 0x0019: // FORMULACELL Formulacell( nRecLen ); break; - case 0x001b: // extended attributes + case 0x001b: // extended attributes Read( nSubType ); nRecLen -= 2; switch( nSubType ) { - case 2007: // ROW PRESENTATION + case 2007: // ROW PRESENTATION RowPresentation( nRecLen ); break; - case 14000: // NAMED SHEET + case 14000: // NAMED SHEET NamedSheet(); break; } @@ -189,10 +189,10 @@ FltError ImportLotus::Read() break; // ----------------------------------------------------------- - case S_FM3: // S_FM3 + case S_FM3: // S_FM3 break; // ----------------------------------------------------------- - case S_END: // S_END + case S_END: // S_END break; // ----------------------------------------------------------- #ifdef DBG_UTIL @@ -210,11 +210,11 @@ FltError ImportLotus::Read() } // duemmliche Namen eliminieren - SCTAB nTabs = pD->GetTableCount(); - SCTAB nCnt; - String aTabName; - String aBaseName; - String aRef( RTL_CONSTASCII_USTRINGPARAM( "temp" ) ); + SCTAB nTabs = pD->GetTableCount(); + SCTAB nCnt; + String aTabName; + String aBaseName; + String aRef( RTL_CONSTASCII_USTRINGPARAM( "temp" ) ); if( nTabs != 0 ) { if( nTabs > 1 ) @@ -246,11 +246,11 @@ FltError ImportLotus::Read( SvStream& rIn ) { pIn = &rIn; - BOOL bRead = TRUE; - UINT16 nOp; - UINT16 nRecLen; - UINT32 nNextRec = 0UL; - FltError eRet = eERR_OK; + BOOL bRead = TRUE; + UINT16 nOp; + UINT16 nRecLen; + UINT32 nNextRec = 0UL; + FltError eRet = eERR_OK; nTab = 0; nExtTab = -1; @@ -272,7 +272,7 @@ FltError ImportLotus::Read( SvStream& rIn ) switch( nOp ) { - case 0x0000: // BOF + case 0x0000: // BOF if( nRecLen != 26 || !BofFm3() ) { bRead = FALSE; @@ -280,22 +280,22 @@ FltError ImportLotus::Read( SvStream& rIn ) } break; - case 0x0001: // EOF + case 0x0001: // EOF bRead = FALSE; DBG_ASSERT( nTab == 0, "-ImportLotus::Read( SvStream& ): Zweimal EOF nicht erlaubt" ); nTab++; break; - case 174: // FONT_FACE + case 174: // FONT_FACE Font_Face(); break; - case 176: // FONT_TYPE + case 176: // FONT_TYPE Font_Type(); break; - case 177: // FONT_YSIZE + case 177: // FONT_YSIZE Font_Ysize(); break; diff --git a/sc/source/filter/lotus/lotus.cxx b/sc/source/filter/lotus/lotus.cxx index 8a9623057788..d53905e7e622 100644 --- a/sc/source/filter/lotus/lotus.cxx +++ b/sc/source/filter/lotus/lotus.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,23 +48,23 @@ FltError ScFormatFilterPluginImpl::ScImportLotus123( SfxMedium& rMedium, ScDocum ScFilterOptions aFilterOpt; BOOL bWithWK3 = aFilterOpt.GetWK3Flag(); - SvStream* pStream = rMedium.GetInStream(); + SvStream* pStream = rMedium.GetInStream(); if( !pStream ) return eERR_OPEN; - FltError eRet; + FltError eRet; pStream->Seek( 0UL ); pStream->SetBufferSize( 32768 ); - ImportLotus aLotusImport( *pStream, pDocument, eSrc ); + ImportLotus aLotusImport( *pStream, pDocument, eSrc ); if( bWithWK3 ) eRet = aLotusImport.Read(); else - eRet = 0xFFFFFFFF; // WK1 /WKS erzwingen + eRet = 0xFFFFFFFF; // WK1 /WKS erzwingen // ACHTUNG: QUICK-HACK fuer WK1 / WKS <-> WK3 / WK4 if( eRet == 0xFFFFFFFF ) diff --git a/sc/source/filter/lotus/memory.cxx b/sc/source/filter/lotus/memory.cxx index 68b26befa1aa..cb18e7650e19 100644 --- a/sc/source/filter/lotus/memory.cxx +++ b/sc/source/filter/lotus/memory.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,41 +43,41 @@ #include "decl.h" #include "tool.h" -extern const long nStackSize; -extern const int nAnzNRange; +extern const long nStackSize; +extern const int nAnzNRange; -extern ScDocument* pDoc; +extern ScDocument* pDoc; -const long nStackSize = 8L * 1024; // -> form_xxx.cpp -const int nAnzNRange = 2048; // -> tool_xxx.cpp, max. 2048 Named Ranges +const long nStackSize = 8L * 1024; // -> form_xxx.cpp +const int nAnzNRange = 2048; // -> tool_xxx.cpp, max. 2048 Named Ranges -sal_Char* pPuffer; // -> flt_xxx.cxx -sal_Char* pDummy1; // -> flt_xxx.cxx, ScanVersion() -sal_Char* pDummy2; // -> tool.cxx, CreateTable() +sal_Char* pPuffer; // -> flt_xxx.cxx +sal_Char* pDummy1; // -> flt_xxx.cxx, ScanVersion() +sal_Char* pDummy2; // -> tool.cxx, CreateTable() -extern BYTE* pFormelBuffer; // -> tool.cxx, fuer OP_Formula() -BYTE* pFormelBuffer; +extern BYTE* pFormelBuffer; // -> tool.cxx, fuer OP_Formula() +BYTE* pFormelBuffer; -extern FormCache* pValueFormCache; // -> tool.cxx +extern FormCache* pValueFormCache; // -> tool.cxx -sal_Char* pStack; // -> formel.cxx -sal_Char* pPuffer0; // -> formel.cxx -sal_Char* pPuffer1; // -> formel.cxx -extern const int nMaxPar; -const int nMaxPar = 128; // max. 128 Parameter werden unterstuetzt -sal_Char** pPar; // -> formel.cxx, Pn() +sal_Char* pStack; // -> formel.cxx +sal_Char* pPuffer0; // -> formel.cxx +sal_Char* pPuffer1; // -> formel.cxx +extern const int nMaxPar; +const int nMaxPar = 128; // max. 128 Parameter werden unterstuetzt +sal_Char** pPar; // -> formel.cxx, Pn() -#ifndef _DOS // -> op.cxx -sal_Char* pAnsi; +#ifndef _DOS // -> op.cxx +sal_Char* pAnsi; #endif -sal_Char* pErgebnis; // -> op.cxx +sal_Char* pErgebnis; // -> op.cxx -extern BOOL bFormInit; // -> tool.cxx, fuer GetFormHandle() -BOOL bFormInit; +extern BOOL bFormInit; // -> tool.cxx, fuer GetFormHandle() +BOOL bFormInit; -extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, - *pAttrRepeat, *pAttrStandard; // -> tool.cxx, fuer GetFormAttr() -extern ScProtectionAttr* pAttrUnprot; // -> tool.cxx, fuer PutFormString() +extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, + *pAttrRepeat, *pAttrStandard; // -> tool.cxx, fuer GetFormAttr() +extern ScProtectionAttr* pAttrUnprot; // -> tool.cxx, fuer PutFormString() diff --git a/sc/source/filter/lotus/op.cxx b/sc/source/filter/lotus/op.cxx index 5d38852c2170..e0a0182aa7cc 100644 --- a/sc/source/filter/lotus/op.cxx +++ b/sc/source/filter/lotus/op.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 @@ -78,18 +78,18 @@ #include <stdlib.h> #endif -extern sal_Char* pAnsi; // -> memory.cxx, Puffer zum Umwandeln von OEM->ANSI -extern sal_Char* pErgebnis; // -> memory.cxx, Ergebnispuffer -extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp -extern BOOL bEOF; // -> filter.cxx, zeigt Dateiende an -extern sal_Char* pPuffer0; // -> memory.cxx -extern sal_Char* pPuffer1; -extern BYTE nDefaultFormat; // -> tool.cxx, Default-Zellenformat -extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff -extern BYTE* pFormelBuffer; // -> memory.cxx, fuer -extern CharSet eCharVon; // -> filter.cxx, character set specified +extern sal_Char* pAnsi; // -> memory.cxx, Puffer zum Umwandeln von OEM->ANSI +extern sal_Char* pErgebnis; // -> memory.cxx, Ergebnispuffer +extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp +extern BOOL bEOF; // -> filter.cxx, zeigt Dateiende an +extern sal_Char* pPuffer0; // -> memory.cxx +extern sal_Char* pPuffer1; +extern BYTE nDefaultFormat; // -> tool.cxx, Default-Zellenformat +extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff +extern BYTE* pFormelBuffer; // -> memory.cxx, fuer +extern CharSet eCharVon; // -> filter.cxx, character set specified -static UINT16 nDefWidth = ( UINT16 ) ( TWIPS_PER_CHAR * 10 ); +static UINT16 nDefWidth = ( UINT16 ) ( TWIPS_PER_CHAR * 10 ); extern std::map<UINT16, ScPatternAttr> aLotusPatternPool; @@ -113,14 +113,14 @@ void OP_EOF( SvStream& /*r*/, UINT16 /*n*/ ) void OP_Integer( SvStream& r, UINT16 /*n*/ ) { - BYTE nFormat; - UINT16 nCol, nRow; - SCTAB nTab = 0; - INT16 nValue; + BYTE nFormat; + UINT16 nCol, nRow; + SCTAB nTab = 0; + INT16 nValue; r >> nFormat >> nCol >> nRow >> nValue; - ScValueCell* pZelle = new ScValueCell( ( double ) nValue ); + ScValueCell* pZelle = new ScValueCell( ( double ) nValue ); pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( BOOL ) TRUE ); // 0 Stellen nach'm Komma! @@ -130,15 +130,15 @@ void OP_Integer( SvStream& r, UINT16 /*n*/ ) void OP_Number( SvStream& r, UINT16 /*n*/ ) { - BYTE nFormat; - UINT16 nCol, nRow; - SCTAB nTab = 0; - double fValue; + BYTE nFormat; + UINT16 nCol, nRow; + SCTAB nTab = 0; + double fValue; r >> nFormat >> nCol >> nRow >> fValue; fValue = ::rtl::math::round( fValue, 15 ); - ScValueCell* pZelle = new ScValueCell( fValue ); + ScValueCell* pZelle = new ScValueCell( fValue ); pDoc->PutCell( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, pZelle, ( BOOL ) TRUE ); SetFormat( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab, nFormat, nDezFloat ); @@ -147,9 +147,9 @@ void OP_Number( SvStream& r, UINT16 /*n*/ ) void OP_Label( SvStream& r, UINT16 n ) { - BYTE nFormat; - UINT16 nCol, nRow; - SCTAB nTab = 0; + BYTE nFormat; + UINT16 nCol, nRow; + SCTAB nTab = 0; r >> nFormat >> nCol >> nRow; n -= 5; @@ -170,23 +170,23 @@ void OP_Label( SvStream& r, UINT16 n ) void OP_Formula( SvStream& r, UINT16 /*n*/ ) { - BYTE nFormat; - UINT16 nCol, nRow, nFormulaSize; - SCTAB nTab = 0; + BYTE nFormat; + UINT16 nCol, nRow, nFormulaSize; + SCTAB nTab = 0; r >> nFormat >> nCol >> nRow; r.SeekRel( 8 ); // Ergebnis ueberspringen r >> nFormulaSize; - const ScTokenArray* pErg; - INT32 nBytesLeft = nFormulaSize; - ScAddress aAddress( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab ); + const ScTokenArray* pErg; + INT32 nBytesLeft = nFormulaSize; + ScAddress aAddress( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), nTab ); - LotusToSc aConv( r, pLotusRoot->eCharsetQ, FALSE ); + LotusToSc aConv( r, pLotusRoot->eCharsetQ, FALSE ); aConv.Reset( aAddress ); aConv.Convert( pErg, nBytesLeft ); - ScFormulaCell* pZelle = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg ); + ScFormulaCell* pZelle = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg ); pZelle->AddRecalcMode( RECALCMODE_ONLOAD_ONCE ); @@ -199,9 +199,9 @@ void OP_Formula( SvStream& r, UINT16 /*n*/ ) void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ ) { - UINT16 nCol, nBreite; - BYTE nWidthSpaces; - SCTAB nTab = 0; + UINT16 nCol, nBreite; + BYTE nWidthSpaces; + SCTAB nTab = 0; r >> nCol >> nWidthSpaces; @@ -221,14 +221,14 @@ void OP_ColumnWidth( SvStream& r, UINT16 /*n*/ ) void OP_NamedRange( SvStream& r, UINT16 /*n*/ ) { // POST: waren Koordinaten ungueltig, wird nicht gespeichert - UINT16 nColSt, nRowSt, nColEnd, nRowEnd; - sal_Char cPuffer[ 32 ]; + UINT16 nColSt, nRowSt, nColEnd, nRowEnd; + sal_Char cPuffer[ 32 ]; r.Read( cPuffer, 16 ); r >> nColSt >> nRowSt >> nColEnd >> nRowEnd; - LotusRange* pRange; + LotusRange* pRange; if( nColSt == nColEnd && nRowSt == nRowEnd ) pRange = new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt) ); @@ -236,14 +236,14 @@ void OP_NamedRange( SvStream& r, UINT16 /*n*/ ) pRange = new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt), static_cast<SCCOL> (nColEnd), static_cast<SCROW> (nRowEnd) ); if( isdigit( *cPuffer ) ) - { // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen + { // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen *pAnsi = 'A'; strcpy( pAnsi + 1, cPuffer ); // #100211# - checked } else strcpy( pAnsi, cPuffer ); // #100211# - checked - String aTmp( pAnsi, pLotusRoot->eCharsetQ ); + String aTmp( pAnsi, pLotusRoot->eCharsetQ ); ScfTools::ConvertToScDefinedName( aTmp ); @@ -254,10 +254,10 @@ void OP_NamedRange( SvStream& r, UINT16 /*n*/ ) void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ ) { // POST: waren Koordinaten ungueltig, wird nicht gespeichert - UINT16 nColSt, nRowSt, nColEnd, nRowEnd; - BYTE nType; - sal_Char* pName; - sal_Char cPuffer[ 32 ]; + UINT16 nColSt, nRowSt, nColEnd, nRowEnd; + BYTE nType; + sal_Char* pName; + sal_Char cPuffer[ 32 ]; r.Read( cPuffer, 16 ); cPuffer[ 16 ] = 0; @@ -265,7 +265,7 @@ void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ ) r >> nColSt >> nRowSt >> nColEnd >> nRowEnd >> nType; - LotusRange* pRange; + LotusRange* pRange; if( nType ) pRange = new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt) ); @@ -273,14 +273,14 @@ void OP_SymphNamedRange( SvStream& r, UINT16 /*n*/ ) pRange = new LotusRange( static_cast<SCCOL> (nColSt), static_cast<SCROW> (nRowSt), static_cast<SCCOL> (nColEnd), static_cast<SCROW> (nRowEnd) ); if( isdigit( *cPuffer ) ) - { // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen + { // erstes Zeichen im Namen eine Zahl -> 'A' vor Namen setzen *pAnsi = 'A'; strcpy( pAnsi + 1, cPuffer ); // #100211# - checked } else strcpy( pAnsi, cPuffer ); // #100211# - checked - String aTmp( pAnsi, pLotusRoot->eCharsetQ ); + String aTmp( pAnsi, pLotusRoot->eCharsetQ ); ScfTools::ConvertToScDefinedName( aTmp ); pLotusRoot->pRangeNames->Append( pRange, aTmp ); @@ -307,9 +307,9 @@ void OP_Margins( SvStream& r, UINT16 n ) void OP_HiddenCols( SvStream& r, UINT16 /*n*/ ) { - UINT16 nByte, nBit; - SCCOL nCount; - BYTE nAkt; + UINT16 nByte, nBit; + SCCOL nCount; + BYTE nAkt; nCount = 0; for( nByte = 0 ; nByte < 32 ; nByte++ ) // 32 Bytes mit ... @@ -350,8 +350,8 @@ void OP_Window1( SvStream& r, UINT16 n ) void OP_Blank( SvStream& r, UINT16 /*n*/ ) { - UINT16 nCol, nRow; - BYTE nFormat; + UINT16 nCol, nRow; + BYTE nFormat; r >> nFormat >> nCol >> nRow; SetFormat( static_cast<SCCOL> (nCol), static_cast<SCROW> (nRow), 0, nFormat, nDezFloat ); @@ -405,15 +405,15 @@ void OP_Formula123( SvStream& r, UINT16 n ) r >> nRow >> nTab >> nCol; r.SeekRel( 8 ); // Result- jump over - const ScTokenArray* pErg; - INT32 nBytesLeft = n - 12; - ScAddress aAddress( nCol, nRow, nTab ); + const ScTokenArray* pErg; + INT32 nBytesLeft = n - 12; + ScAddress aAddress( nCol, nRow, nTab ); - LotusToSc aConv( r, pLotusRoot->eCharsetQ, TRUE ); + LotusToSc aConv( r, pLotusRoot->eCharsetQ, TRUE ); aConv.Reset( aAddress ); aConv.Convert( pErg, nBytesLeft ); - ScFormulaCell* pCell = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg ); + ScFormulaCell* pCell = new ScFormulaCell( pLotusRoot->pDoc, aAddress, pErg ); pCell->AddRecalcMode( RECALCMODE_ONLOAD_ONCE ); diff --git a/sc/source/filter/lotus/optab.cxx b/sc/source/filter/lotus/optab.cxx index bf880614d48d..d2113e334274 100644 --- a/sc/source/filter/lotus/optab.cxx +++ b/sc/source/filter/lotus/optab.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 @@ -37,215 +37,215 @@ // Bearbeitungsfunktion sal_Char *X( sal_Char * ) OPCODE_FKT pOpFkt[ FKT_LIMIT ] = -{ // Code - OP_BOF, // 0 - OP_EOF, // 1 - NI, // 2 - NI, // 3 - NI, // 4 - NI, // 5 - NI, // 6 - OP_Window1, // 7 - OP_ColumnWidth, // 8 - NI, // 9 - NI, // 10 - OP_NamedRange, // 11 - OP_Blank, // 12 - OP_Integer, // 13 - OP_Number, // 14 - OP_Label, // 15 - OP_Formula, // 16 - NI, // 17 - NI, // 18 - NI, // 19 - NI, // 20 - NI, // 21 - NI, // 22 - NI, // 23 - NI, // 24 - NI, // 25 - NI, // 26 - NI, // 27 - NI, // 28 - NI, // 29 - NI, // 30 - NI, // 31 - NI, // 32 - NI, // 33 - NI, // 34 - NI, // 35 - NI, // 36 - OP_Footer, // 37 - OP_Header, // 38 - NI, // 39 - OP_Margins, // 40 - NI, // 41 - NI, // 42 - NI, // 43 - NI, // 44 - NI, // 45 - NI, // 46 - NI, // 47 - NI, // 48 - NI, // 49 - NI, // 50 - NI, // 51 - NI, // 52 - NI, // 53 - NI, // 54 - NI, // 55 - NI, // 56 - NI, // 57 - NI, // 58 - NI, // 59 - NI, // 60 - NI, // 61 - NI, // 62 - NI, // 63 - NI, // 64 - NI, // 65 - NI, // 66 - NI, // 67 - NI, // 68 - NI, // 69 - NI, // 70 - OP_SymphNamedRange, // 71 - NI, // 72 - NI, // 73 - NI, // 74 - NI, // 75 - NI, // 76 - NI, // 77 - NI, // 78 - NI, // 79 - NI, // 80 - NI, // 81 - NI, // 82 - NI, // 83 - NI, // 84 - NI, // 85 - NI, // 86 - NI, // 87 - NI, // 88 - NI, // 89 - NI, // 90 - NI, // 91 - NI, // 92 - NI, // 93 - NI, // 94 - NI, // 95 - NI, // 96 - NI, // 97 - NI, // 98 - NI, // 99 - OP_HiddenCols, // 100 +{ // Code + OP_BOF, // 0 + OP_EOF, // 1 + NI, // 2 + NI, // 3 + NI, // 4 + NI, // 5 + NI, // 6 + OP_Window1, // 7 + OP_ColumnWidth, // 8 + NI, // 9 + NI, // 10 + OP_NamedRange, // 11 + OP_Blank, // 12 + OP_Integer, // 13 + OP_Number, // 14 + OP_Label, // 15 + OP_Formula, // 16 + NI, // 17 + NI, // 18 + NI, // 19 + NI, // 20 + NI, // 21 + NI, // 22 + NI, // 23 + NI, // 24 + NI, // 25 + NI, // 26 + NI, // 27 + NI, // 28 + NI, // 29 + NI, // 30 + NI, // 31 + NI, // 32 + NI, // 33 + NI, // 34 + NI, // 35 + NI, // 36 + OP_Footer, // 37 + OP_Header, // 38 + NI, // 39 + OP_Margins, // 40 + NI, // 41 + NI, // 42 + NI, // 43 + NI, // 44 + NI, // 45 + NI, // 46 + NI, // 47 + NI, // 48 + NI, // 49 + NI, // 50 + NI, // 51 + NI, // 52 + NI, // 53 + NI, // 54 + NI, // 55 + NI, // 56 + NI, // 57 + NI, // 58 + NI, // 59 + NI, // 60 + NI, // 61 + NI, // 62 + NI, // 63 + NI, // 64 + NI, // 65 + NI, // 66 + NI, // 67 + NI, // 68 + NI, // 69 + NI, // 70 + OP_SymphNamedRange, // 71 + NI, // 72 + NI, // 73 + NI, // 74 + NI, // 75 + NI, // 76 + NI, // 77 + NI, // 78 + NI, // 79 + NI, // 80 + NI, // 81 + NI, // 82 + NI, // 83 + NI, // 84 + NI, // 85 + NI, // 86 + NI, // 87 + NI, // 88 + NI, // 89 + NI, // 90 + NI, // 91 + NI, // 92 + NI, // 93 + NI, // 94 + NI, // 95 + NI, // 96 + NI, // 97 + NI, // 98 + NI, // 99 + OP_HiddenCols, // 100 }; OPCODE_FKT pOpFkt123[ FKT_LIMIT123 ] = -{ // Code - OP_BOF123, // 0 - OP_EOF123, // 1 - NI, // 2 - NI, // 3 - NI, // 4 - NI, // 5 - NI, // 6 - NI, // 7 - NI, // 8 - NI, // 9 - NI, // 10 - NI, // 11 - NI, // 12 - NI, // 13 - NI, // 14 - NI, // 15 - NI, // 16 - NI, // 17 - NI, // 18 - NI, // 19 - NI, // 20 - NI, // 21 - OP_Label123, // 22 - NI, // 23 - NI, // 24 - NI, // 25 - NI, // 26 - OP_CreatePattern123, // 27 - NI, // 28 - NI, // 29 - NI, // 30 - NI, // 31 - NI, // 32 - NI, // 33 - NI, // 34 +{ // Code + OP_BOF123, // 0 + OP_EOF123, // 1 + NI, // 2 + NI, // 3 + NI, // 4 + NI, // 5 + NI, // 6 + NI, // 7 + NI, // 8 + NI, // 9 + NI, // 10 + NI, // 11 + NI, // 12 + NI, // 13 + NI, // 14 + NI, // 15 + NI, // 16 + NI, // 17 + NI, // 18 + NI, // 19 + NI, // 20 + NI, // 21 + OP_Label123, // 22 + NI, // 23 + NI, // 24 + NI, // 25 + NI, // 26 + OP_CreatePattern123, // 27 + NI, // 28 + NI, // 29 + NI, // 30 + NI, // 31 + NI, // 32 + NI, // 33 + NI, // 34 OP_SheetName123, // 35 - NI, // 36 - OP_Number123, // 37 - OP_Note123, // 38 - OP_IEEENumber123, // 39 - OP_Formula123, // 40 - NI, // 41 - NI, // 42 - NI, // 43 - NI, // 44 - NI, // 45 - NI, // 46 - NI, // 47 - NI, // 48 - NI, // 49 - NI, // 50 - NI, // 51 - NI, // 52 - NI, // 53 - NI, // 54 - NI, // 55 - NI, // 56 - NI, // 57 - NI, // 58 - NI, // 59 - NI, // 60 - NI, // 61 - NI, // 62 - NI, // 63 - NI, // 64 - NI, // 65 - NI, // 66 - NI, // 67 - NI, // 68 - NI, // 69 - NI, // 70 - NI, // 71 - NI, // 72 - NI, // 73 - NI, // 74 - NI, // 75 - NI, // 76 - NI, // 77 - NI, // 78 - NI, // 79 - NI, // 80 - NI, // 81 - NI, // 82 - NI, // 83 - NI, // 84 - NI, // 85 - NI, // 86 - NI, // 87 - NI, // 88 - NI, // 89 - NI, // 90 - NI, // 91 - NI, // 92 - NI, // 93 - NI, // 94 - NI, // 95 - NI, // 96 - NI, // 97 - NI, // 98 - NI, // 99 - NI // 100 + NI, // 36 + OP_Number123, // 37 + OP_Note123, // 38 + OP_IEEENumber123, // 39 + OP_Formula123, // 40 + NI, // 41 + NI, // 42 + NI, // 43 + NI, // 44 + NI, // 45 + NI, // 46 + NI, // 47 + NI, // 48 + NI, // 49 + NI, // 50 + NI, // 51 + NI, // 52 + NI, // 53 + NI, // 54 + NI, // 55 + NI, // 56 + NI, // 57 + NI, // 58 + NI, // 59 + NI, // 60 + NI, // 61 + NI, // 62 + NI, // 63 + NI, // 64 + NI, // 65 + NI, // 66 + NI, // 67 + NI, // 68 + NI, // 69 + NI, // 70 + NI, // 71 + NI, // 72 + NI, // 73 + NI, // 74 + NI, // 75 + NI, // 76 + NI, // 77 + NI, // 78 + NI, // 79 + NI, // 80 + NI, // 81 + NI, // 82 + NI, // 83 + NI, // 84 + NI, // 85 + NI, // 86 + NI, // 87 + NI, // 88 + NI, // 89 + NI, // 90 + NI, // 91 + NI, // 92 + NI, // 93 + NI, // 94 + NI, // 95 + NI, // 96 + NI, // 97 + NI, // 98 + NI, // 99 + NI // 100 }; - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/lotus/tool.cxx b/sc/source/filter/lotus/tool.cxx index 688334f5ec14..970e24763d97 100644 --- a/sc/source/filter/lotus/tool.cxx +++ b/sc/source/filter/lotus/tool.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 @@ -57,29 +57,29 @@ #endif //--------------------------------------------------------- EXTERNE VARIABLEN - -extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp -extern sal_Char* pDummy2; // -> memory.cxx -extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff -extern CharSet eCharNach; // -> filter.cxx, Zeichenkonvertierung von->nach +extern WKTYP eTyp; // -> filter.cxx, aktueller Dateityp +extern sal_Char* pDummy2; // -> memory.cxx +extern ScDocument* pDoc; // -> filter.cxx, Aufhaenger zum Dokumentzugriff +extern CharSet eCharNach; // -> filter.cxx, Zeichenkonvertierung von->nach -extern BOOL bFormInit; // -> memory.cxx, fuer GetFormHandle() +extern BOOL bFormInit; // -> memory.cxx, fuer GetFormHandle() //--------------------------------------------------------- GLOBALE VARIABLEN - -BYTE nDefaultFormat; // -> op.cpp, Standard-Zellenformat +BYTE nDefaultFormat; // -> op.cpp, Standard-Zellenformat -extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard; -extern ScProtectionAttr* pAttrUnprot; -extern SfxUInt32Item** pAttrValForms; +extern SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard; +extern ScProtectionAttr* pAttrUnprot; +extern SfxUInt32Item** pAttrValForms; -SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard; +SvxHorJustifyItem *pAttrRight, *pAttrLeft, *pAttrCenter, *pAttrRepeat, *pAttrStandard; // -> in memory.cxx initialisiert -ScProtectionAttr* pAttrUnprot; // -> " memory.cxx " +ScProtectionAttr* pAttrUnprot; // -> " memory.cxx " -extern FormCache* pValueFormCache; // -> in memory.cxx initialisiert -FormCache* pValueFormCache; +extern FormCache* pValueFormCache; // -> in memory.cxx initialisiert +FormCache* pValueFormCache; -SCCOL LotusRangeList::nEingCol; -SCROW LotusRangeList::nEingRow; +SCCOL LotusRangeList::nEingCol; +SCROW LotusRangeList::nEingRow; @@ -89,8 +89,8 @@ void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString ) // Label-Format-Auswertung DBG_ASSERT( pString != NULL, "PutFormString(): pString == NULL" ); - sal_Char cForm; - SvxHorJustifyItem* pJustify = NULL; + sal_Char cForm; + SvxHorJustifyItem* pJustify = NULL; cForm = *pString; @@ -122,7 +122,7 @@ void PutFormString( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_Char* pString ) if( pString ) { pDoc->ApplyAttr( nCol, nRow, nTab, *pJustify ); - ScStringCell* pZelle = new ScStringCell( String( pString, pLotusRoot->eCharsetQ ) ); + ScStringCell* pZelle = new ScStringCell( String( pString, pLotusRoot->eCharsetQ ) ); pDoc->PutCell( nCol, nRow, nTab, pZelle, ( BOOL ) TRUE ); } } @@ -143,7 +143,7 @@ void SetFormat( SCCOL nCol, SCROW nRow, SCTAB nTab, BYTE nFormat, BYTE nSt ) } void InitPage( void ) -{ // Seitenformat initialisieren, d.h. Default-Werte von SC holen +{ // Seitenformat initialisieren, d.h. Default-Werte von SC holen //scGetPageFormat( 0, &aPage ); } @@ -160,7 +160,7 @@ double SnumToDouble( INT16 nVal ) 0.0625, 0.015625 }; - double fVal; + double fVal; if( nVal & 0x0001 ) { @@ -194,7 +194,7 @@ double Snum32ToDouble( UINT32 nValue ) FormCache::FormCache( ScDocument* pDoc1, BYTE nNewDefaultFormat ) -{ // Default-Format ist 'Default' +{ // Default-Format ist 'Default' nDefaultFormat = nNewDefaultFormat; pFormTable = pDoc1->GetFormatTable(); for( UINT16 nC = 0 ; nC < __nSize ; nC++ ) @@ -213,14 +213,14 @@ FormCache::~FormCache() SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt ) { // neues Format erzeugen - BYTE nL, nH; // Low-/High-Nibble - BYTE nForm = nFormat; - String aFormString; + BYTE nL, nH; // Low-/High-Nibble + BYTE nForm = nFormat; + String aFormString; const sal_Char* pFormString = 0; - INT16 eType = NUMBERFORMAT_ALL; + INT16 eType = NUMBERFORMAT_ALL; UINT32 nIndex1; - UINT32 nHandle; - BOOL bDefault = FALSE; + UINT32 nHandle; + BOOL bDefault = FALSE; //void GenerateFormat( aFormString, eType, COUNTRY_SYSTEM, LANGUAGE_SYSTEM, // BOOL bThousand, BOOL IsRed, UINT16 nPrecision, UINT16 nAnzLeading ); @@ -384,7 +384,7 @@ SfxUInt32Item* FormCache::NewAttr( BYTE nFormat, BYTE nSt ) if( pFormString ) aFormString.AssignAscii( pFormString ); - xub_StrLen nDummy; + xub_StrLen nDummy; pFormTable->PutEntry( aFormString, nDummy, eType, nHandle, eLanguage ); } @@ -442,7 +442,7 @@ LotusRangeList::LotusRangeList( void ) { aComplRef.InitFlags(); - ScSingleRefData* pSingRef; + ScSingleRefData* pSingRef; nIdCnt = 1; pSingRef = &aComplRef.Ref1; @@ -475,7 +475,7 @@ LotusRangeList::~LotusRangeList( void ) LR_ID LotusRangeList::GetIndex( const LotusRange &rRef ) { - LotusRange* pComp = ( LotusRange* ) List::First(); + LotusRange* pComp = ( LotusRange* ) List::First(); while( pComp ) { @@ -493,9 +493,9 @@ void LotusRangeList::Append( LotusRange* pLR, const String& rName ) DBG_ASSERT( pLR, "*LotusRangeList::Append(): das wird nichts!" ); List::Insert( pLR, CONTAINER_APPEND ); - ScTokenArray aTokArray; + ScTokenArray aTokArray; - ScSingleRefData* pSingRef = &aComplRef.Ref1; + ScSingleRefData* pSingRef = &aComplRef.Ref1; pSingRef->nCol = pLR->nColStart; pSingRef->nRow = pLR->nRowStart; @@ -510,7 +510,7 @@ void LotusRangeList::Append( LotusRange* pLR, const String& rName ) aTokArray.AddDoubleReference( aComplRef ); } - ScRangeData* pData = new ScRangeData( + ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, rName, aTokArray ); pLotusRoot->pScRangeName->Insert( pData ); @@ -532,7 +532,7 @@ RangeNameBufferWK3::RangeNameBufferWK3( void ) RangeNameBufferWK3::~RangeNameBufferWK3() { - ENTRY* pDel = ( ENTRY* ) List::First(); + ENTRY* pDel = ( ENTRY* ) List::First(); while( pDel ) { @@ -546,17 +546,17 @@ RangeNameBufferWK3::~RangeNameBufferWK3() void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rCRD ) { - String aScName( rOrgName ); + String aScName( rOrgName ); ScfTools::ConvertToScDefinedName( aScName ); - register ENTRY* pInsert = new ENTRY( rOrgName, aScName, rCRD ); + register ENTRY* pInsert = new ENTRY( rOrgName, aScName, rCRD ); List::Insert( pInsert, CONTAINER_APPEND ); pScTokenArray->Clear(); - register const ScSingleRefData& rRef1 = rCRD.Ref1; - register const ScSingleRefData& rRef2 = rCRD.Ref2; + register const ScSingleRefData& rRef1 = rCRD.Ref1; + register const ScSingleRefData& rRef2 = rCRD.Ref2; if( rRef1.nCol == rRef2.nCol && rRef1.nRow == rRef2.nRow && rRef1.nTab == rRef2.nTab ) { @@ -569,7 +569,7 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rC pInsert->bSingleRef = FALSE; } - ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, aScName, *pScTokenArray ); + ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, aScName, *pScTokenArray ); pInsert->nRelInd = nIntCount; pData->SetIndex( nIntCount ); @@ -581,9 +581,9 @@ void RangeNameBufferWK3::Add( const String& rOrgName, const ScComplexRefData& rC BOOL RangeNameBufferWK3::FindRel( const String& rRef, UINT16& rIndex ) { - StringHashEntry aRef( rRef ); + StringHashEntry aRef( rRef ); - ENTRY* pFind = ( ENTRY* ) List::First(); + ENTRY* pFind = ( ENTRY* ) List::First(); while( pFind ) { @@ -601,10 +601,10 @@ BOOL RangeNameBufferWK3::FindRel( const String& rRef, UINT16& rIndex ) BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex ) { - String aTmp( rRef ); - StringHashEntry aRef( aTmp.Erase( 0, 1 ) ); // ohne '$' suchen! + String aTmp( rRef ); + StringHashEntry aRef( aTmp.Erase( 0, 1 ) ); // ohne '$' suchen! - ENTRY* pFind = ( ENTRY* ) List::First(); + ENTRY* pFind = ( ENTRY* ) List::First(); while( pFind ) { @@ -615,7 +615,7 @@ BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex ) rIndex = pFind->nAbsInd; else { - ScSingleRefData* pRef = &pFind->aScComplexRefDataRel.Ref1; + ScSingleRefData* pRef = &pFind->aScComplexRefDataRel.Ref1; pScTokenArray->Clear(); pRef->SetColRel( FALSE ); @@ -633,7 +633,7 @@ BOOL RangeNameBufferWK3::FindAbs( const String& rRef, UINT16& rIndex ) pScTokenArray->AddDoubleReference( pFind->aScComplexRefDataRel ); } - ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, pFind->aScAbsName, *pScTokenArray ); + ScRangeData* pData = new ScRangeData( pLotusRoot->pDoc, pFind->aScAbsName, *pScTokenArray ); rIndex = pFind->nAbsInd = nIntCount; pData->SetIndex( rIndex ); diff --git a/sc/source/filter/qpro/biff.cxx b/sc/source/filter/qpro/biff.cxx index b5bb830906bd..6a5ce8f2671f 100644 --- a/sc/source/filter/qpro/biff.cxx +++ b/sc/source/filter/qpro/biff.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/qpro/qpro.cxx b/sc/source/filter/qpro/qpro.cxx index 320cf4bd819c..03c40a4052dc 100644 --- a/sc/source/filter/qpro/qpro.cxx +++ b/sc/source/filter/qpro/qpro.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/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx index b579dade9331..2853af3f1d59 100644 --- a/sc/source/filter/qpro/qproform.cxx +++ b/sc/source/filter/qpro/qproform.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 @@ -417,7 +417,7 @@ static const struct { ocAnd, FT_Op }, { ocOr, FT_Op }, { ocNot, FT_FuncFix1 }, - { ocPush, FT_NOP }, // Unary plus + { ocPush, FT_NOP }, // Unary plus { ocAddress, FT_FuncFix4 }, // Address of { ocNoName, FT_NotImpl }, // Halt function { ocNoName, FT_DLL }, // DLL function @@ -538,7 +538,7 @@ static const struct { ocNoName, FT_NotImpl }, { ocGetActDate, FT_FuncFix0 }, { ocNPV, FT_FuncFix2 }, - { ocNoName, FT_NotImpl }, // 0x90 + { ocNoName, FT_NotImpl }, // 0x90 { ocNoName, FT_NotImpl }, { ocNoName, FT_NOP }, { ocNoName, FT_NOP }, // 147 diff --git a/sc/source/filter/qpro/qprostyle.cxx b/sc/source/filter/qpro/qprostyle.cxx index 5333c086c1a7..3096d2a2af50 100644 --- a/sc/source/filter/qpro/qprostyle.cxx +++ b/sc/source/filter/qpro/qprostyle.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/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx index 126ce0ef6865..2526e118f05a 100644 --- a/sc/source/filter/rtf/eeimpars.cxx +++ b/sc/source/filter/rtf/eeimpars.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 @@ -201,7 +201,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu bSimple = FALSE; else if (eState == SFX_ITEM_SET) { - if ( nId == EE_CHAR_ESCAPEMENT ) // Hoch-/Tiefstellen immer ueber EE + if ( nId == EE_CHAR_ESCAPEMENT ) // Hoch-/Tiefstellen immer ueber EE { if ( (SvxEscapement)((const SvxEscapementItem*)pItem)->GetEnumValue() != SVX_ESCAPEMENT_OFF ) @@ -210,7 +210,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu } } if ( bSimple ) - { // Feldbefehle enthalten? + { // Feldbefehle enthalten? SfxItemState eFieldState = aSet.GetItemState( EE_FEATURE_FIELD, FALSE ); if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET ) bSimple = FALSE; @@ -222,7 +222,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu sal_uInt32 nNumForm = 0; LanguageType eNumLang = LANGUAGE_NONE; if ( pE->pNumStr ) - { // SDNUM muss sein wenn SDVAL + { // SDNUM muss sein wenn SDVAL aNumStr = *pE->pNumStr; if ( pE->pValStr ) aValStr = *pE->pValStr; @@ -300,7 +300,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu } } if ( pE->nColOverlap > 1 || pE->nRowOverlap > 1 ) - { // merged cells, mit SfxItemSet Put schneller als mit + { // merged cells, mit SfxItemSet Put schneller als mit // nachtraeglichem ScDocument DoMerge ScMergeAttr aMerge( pE->nColOverlap, pE->nRowOverlap ); rSet.Put( aMerge ); @@ -378,8 +378,8 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu pFormatter->ChangeIntl( LANGUAGE_SYSTEM); } - // #105460#, #i4180# String cells can't contain tabs or linebreaks - // -> replace with spaces + // #105460#, #i4180# String cells can't contain tabs or linebreaks + // -> replace with spaces aStr.SearchAndReplaceAll( (sal_Unicode)'\t', (sal_Unicode)' ' ); aStr.SearchAndReplaceAll( (sal_Unicode)'\n', (sal_Unicode)' ' ); @@ -402,7 +402,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu if ( pE->pImageList ) bHasGraphics |= GraphicSize( nCol, nRow, nTab, pE ); if ( pE->pName ) - { // Anchor Name => RangeName + { // Anchor Name => RangeName USHORT nIndex; if ( !pRangeNames->SearchName( *pE->pName, nIndex ) ) { @@ -430,11 +430,11 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu pProgress->SetState( ++nProgress ); } } - DELETEZ( pProgress ); // SetOptimalHeight hat seinen eigenen ProgressBar + DELETEZ( pProgress ); // SetOptimalHeight hat seinen eigenen ProgressBar // Zeilenhoehen anpassen, Basis 100% Zoom Fraction aZoom( 1, 1 ); double nPPTX = ScGlobal::nScreenPPTX * (double) aZoom - / nOutputFactor; // Faktor ist Drucker zu Bildschirm + / nOutputFactor; // Faktor ist Drucker zu Bildschirm double nPPTY = ScGlobal::nScreenPPTY * (double) aZoom; VirtualDevice aVirtDev; mpDoc->SetOptimalHeight( 0, nEndRow, 0, @@ -451,7 +451,7 @@ void ScEEImport::WriteToDocument( BOOL bSizeColsRows, double nOutputFactor, SvNu } } if ( bHasGraphics ) - { // Grafiken einfuegen + { // Grafiken einfuegen for ( pE = mpParser->First(); pE; pE = mpParser->Next() ) { if ( pE->pImageList ) @@ -507,7 +507,7 @@ BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, nColWidths += (long) pColWidths->Get( nC ); } if ( nWidth > nColWidths ) - { // Differenz nur in der ersten Spalte eintragen + { // Differenz nur in der ersten Spalte eintragen if ( nThisWidth ) pColWidths->Replace( nCol, (void*)(nWidth - nColWidths + nThisWidth) ); else @@ -517,7 +517,7 @@ BOOL ScEEImport::GraphicSize( SCCOL nCol, SCROW nRow, SCTAB /*nTab*/, SCROW nRowSpan = pE->nRowOverlap; nHeight /= nRowSpan; if ( nHeight == 0 ) - nHeight = 1; // fuer eindeutigen Vergleich + nHeight = 1; // fuer eindeutigen Vergleich for ( SCROW nR = nRow; nR < nRow + nRowSpan; nR++ ) { long nRowHeight = (long) mpRowHeights->Get( nR ); @@ -559,13 +559,13 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, for ( ScHTMLImage* pI = pIL->First(); pI; pI = pIL->Next() ) { if ( nDir & nHorizontal ) - { // horizontal + { // horizontal aInsertPos.X() += aLogicSize.Width(); aInsertPos.X() += aSpace.X(); aInsertPos.Y() = aCellInsertPos.Y(); } else - { // vertikal + { // vertikal aInsertPos.X() = aCellInsertPos.X(); aInsertPos.Y() += aLogicSize.Height(); aInsertPos.Y() += aSpace.Y(); @@ -576,7 +576,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, Size aSizePix = pI->aSize; aLogicSize = pDefaultDev->PixelToLogic( aSizePix, MapMode( MAP_100TH_MM ) ); - // Groesse begrenzen + // Groesse begrenzen ::ScLimitSizeOnDrawPage( aLogicSize, aInsertPos, pPage->GetSize() ); if ( pI->pGraphic ) @@ -593,7 +593,7 @@ void ScEEImport::InsertGraphic( SCCOL nCol, SCROW nRow, SCTAB nTab, // See #i37444#. pObj->SetGraphicLink( pI->aURL, pI->aFilterName ); - pObj->SetLogicRect( aRect ); // erst nach InsertObject !!! + pObj->SetLogicRect( aRect ); // erst nach InsertObject !!! } nDir = pI->nDir; } @@ -635,7 +635,7 @@ ScEEParser::~ScEEParser() void ScEEParser::NewActEntry( ScEEParseEntry* pE ) -{ // neuer freifliegender pActEntry +{ // neuer freifliegender pActEntry pActEntry = new ScEEParseEntry( pPool ); pActEntry->aSel.nStartPara = (pE ? pE->aSel.nEndPara + 1 : 0); pActEntry->aSel.nStartPos = 0; diff --git a/sc/source/filter/rtf/expbase.cxx b/sc/source/filter/rtf/expbase.cxx index 4c0aa3a1619c..e59959c3ad27 100644 --- a/sc/source/filter/rtf/expbase.cxx +++ b/sc/source/filter/rtf/expbase.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/rtf/rtfexp.cxx b/sc/source/filter/rtf/rtfexp.cxx index f03a37ecdf5b..6cb5a6855c0d 100644 --- a/sc/source/filter/rtf/rtfexp.cxx +++ b/sc/source/filter/rtf/rtfexp.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 @@ -131,7 +131,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) for ( nCol = aRange.aStart.Col(); nCol <= nEndCol; nCol++ ) { const ScPatternAttr* pAttr = pDoc->GetPattern( nCol, nRow, nTab ); - const ScMergeAttr& rMergeAttr = (const ScMergeAttr&) pAttr->GetItem( ATTR_MERGE ); + const ScMergeAttr& rMergeAttr = (const ScMergeAttr&) pAttr->GetItem( ATTR_MERGE ); const SvxVerJustifyItem& rVerJustifyItem= (const SvxVerJustifyItem&)pAttr->GetItem( ATTR_VER_JUSTIFY ); const sal_Char* pChar; @@ -147,18 +147,18 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) switch( rVerJustifyItem.GetValue() ) { - case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALT; break; - case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALC; break; - case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; - case SVX_VER_JUSTIFY_STANDARD: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; //! Bottom - default: pChar = NULL; break; + case SVX_VER_JUSTIFY_TOP: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALT; break; + case SVX_VER_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALC; break; + case SVX_VER_JUSTIFY_BOTTOM: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; + case SVX_VER_JUSTIFY_STANDARD: pChar = OOO_STRING_SVTOOLS_RTF_CLVERTALB; break; //! Bottom + default: pChar = NULL; break; } if ( pChar ) rStrm << pChar; rStrm << OOO_STRING_SVTOOLS_RTF_CELLX << ByteString::CreateFromInt32( pCellX[nCol+1] ).GetBuffer(); if ( (nCol & 0x0F) == 0x0F ) - rStrm << sNewLine; // Zeilen nicht zu lang werden lassen + rStrm << sNewLine; // Zeilen nicht zu lang werden lassen } rStrm << OOO_STRING_SVTOOLS_RTF_PARD << OOO_STRING_SVTOOLS_RTF_PLAIN << OOO_STRING_SVTOOLS_RTF_INTBL << sNewLine; @@ -167,7 +167,7 @@ void ScRTFExport::WriteRow( SCTAB nTab, SCROW nRow ) { WriteCell( nTab, nRow, nCol ); if ( rStrm.Tell() - nStrmPos > 255 ) - { // Zeilen nicht zu lang werden lassen + { // Zeilen nicht zu lang werden lassen rStrm << sNewLine; nStrmPos = rStrm.Tell(); } @@ -197,7 +197,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ) { case CELLTYPE_NOTE : bValueData = FALSE; - break; // nix + break; // nix case CELLTYPE_EDIT : { bValueData = FALSE; @@ -207,7 +207,7 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ) if ( pObj ) { rEngine.SetText( *pObj ); - aContent = rEngine.GetText( LINEEND_LF ); // LineFeed zwischen Absaetzen! + aContent = rEngine.GetText( LINEEND_LF ); // LineFeed zwischen Absaetzen! } } break; @@ -226,10 +226,10 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ) BOOL bResetPar, bResetAttr; bResetPar = bResetAttr = FALSE; - const SvxHorJustifyItem& rHorJustifyItem = (const SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY ); - const SvxWeightItem& rWeightItem = (const SvxWeightItem&) pAttr->GetItem( ATTR_FONT_WEIGHT ); - const SvxPostureItem& rPostureItem = (const SvxPostureItem&) pAttr->GetItem( ATTR_FONT_POSTURE ); - const SvxUnderlineItem& rUnderlineItem = (const SvxUnderlineItem&) pAttr->GetItem( ATTR_FONT_UNDERLINE ); + const SvxHorJustifyItem& rHorJustifyItem = (const SvxHorJustifyItem&)pAttr->GetItem( ATTR_HOR_JUSTIFY ); + const SvxWeightItem& rWeightItem = (const SvxWeightItem&) pAttr->GetItem( ATTR_FONT_WEIGHT ); + const SvxPostureItem& rPostureItem = (const SvxPostureItem&) pAttr->GetItem( ATTR_FONT_POSTURE ); + const SvxUnderlineItem& rUnderlineItem = (const SvxUnderlineItem&) pAttr->GetItem( ATTR_FONT_UNDERLINE ); const sal_Char* pChar; @@ -238,27 +238,27 @@ void ScRTFExport::WriteCell( SCTAB nTab, SCROW nRow, SCCOL nCol ) case SVX_HOR_JUSTIFY_STANDARD: pChar = (bValueData ? OOO_STRING_SVTOOLS_RTF_QR : OOO_STRING_SVTOOLS_RTF_QL); break; - case SVX_HOR_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_QC; break; - case SVX_HOR_JUSTIFY_BLOCK: pChar = OOO_STRING_SVTOOLS_RTF_QJ; break; - case SVX_HOR_JUSTIFY_RIGHT: pChar = OOO_STRING_SVTOOLS_RTF_QR; break; + case SVX_HOR_JUSTIFY_CENTER: pChar = OOO_STRING_SVTOOLS_RTF_QC; break; + case SVX_HOR_JUSTIFY_BLOCK: pChar = OOO_STRING_SVTOOLS_RTF_QJ; break; + case SVX_HOR_JUSTIFY_RIGHT: pChar = OOO_STRING_SVTOOLS_RTF_QR; break; case SVX_HOR_JUSTIFY_LEFT: case SVX_HOR_JUSTIFY_REPEAT: - default: pChar = OOO_STRING_SVTOOLS_RTF_QL; break; + default: pChar = OOO_STRING_SVTOOLS_RTF_QL; break; } rStrm << pChar; if ( rWeightItem.GetWeight() >= WEIGHT_BOLD ) - { // bold + { // bold bResetAttr = TRUE; rStrm << OOO_STRING_SVTOOLS_RTF_B; } if ( rPostureItem.GetPosture() != ITALIC_NONE ) - { // italic + { // italic bResetAttr = TRUE; rStrm << OOO_STRING_SVTOOLS_RTF_I; } if ( rUnderlineItem.GetLineStyle() != UNDERLINE_NONE ) - { // underline + { // underline bResetAttr = TRUE; rStrm << OOO_STRING_SVTOOLS_RTF_UL; } diff --git a/sc/source/filter/rtf/rtfimp.cxx b/sc/source/filter/rtf/rtfimp.cxx index acf14f5620cc..5244b1788816 100644 --- a/sc/source/filter/rtf/rtfimp.cxx +++ b/sc/source/filter/rtf/rtfimp.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/rtf/rtfparse.cxx b/sc/source/filter/rtf/rtfparse.cxx index b9db5db760f8..bc1113babc3a 100644 --- a/sc/source/filter/rtf/rtfparse.cxx +++ b/sc/source/filter/rtf/rtfparse.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,7 +49,7 @@ #include "document.hxx" #include "docpool.hxx" -#define SC_RTFTWIPTOL 10 // 10 Twips Toleranz bei Spaltenbestimmung +#define SC_RTFTWIPTOL 10 // 10 Twips Toleranz bei Spaltenbestimmung @@ -101,7 +101,7 @@ ULONG ScRTFParser::Read( SvStream& rStream, const String& rBaseURL ) || ( pE->aSel.nStartPara + 1 == pE->aSel.nEndPara && pE->aSel.nStartPos == pEdit->GetTextLen( pE->aSel.nStartPara ) && pE->aSel.nEndPos == 0 )) ) - { // den letzten leeren Absatz nicht uebernehmen + { // den letzten leeren Absatz nicht uebernehmen pList->Remove(); delete pE; } @@ -170,8 +170,8 @@ void ScRTFParser::ColAdjust() { SeekTwips( pE->nTwips, &nCol ); if ( ++nCol <= pE->nCol ) - nCol = pE->nCol + 1; // verschobene Zell-X - pE->nColOverlap = nCol - pE->nCol; // merged cells ohne \clmrg + nCol = pE->nCol + 1; // verschobene Zell-X + pE->nColOverlap = nCol - pE->nCol; // merged cells ohne \clmrg } if ( nCol > nColMax ) nColMax = nCol; @@ -205,7 +205,7 @@ IMPL_LINK( ScRTFParser, RTFImportHdl, ImportInfo*, pInfo ) break; case RTFIMP_END: if ( pInfo->aSelection.nEndPos ) - { // falls noch Text: letzten Absatz erzeugen + { // falls noch Text: letzten Absatz erzeugen pActDefault = NULL; pInfo->nToken = RTF_PAR; // EditEngine hat keinen leeren Paragraph mehr angehaengt @@ -291,7 +291,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) ScEEParseEntry* pE; switch ( pInfo->nToken ) { - case RTF_TROWD: // denotes table row defauls, before RTF_CELLX + case RTF_TROWD: // denotes table row defauls, before RTF_CELLX { if ( (pD = pDefaultList->Last()) != 0 ) nLastWidth = pD->nTwips; @@ -303,28 +303,28 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) nLastToken = pInfo->nToken; } break; - case RTF_CLMGF: // The first cell of cells to be merged + case RTF_CLMGF: // The first cell of cells to be merged { pDefMerge = pInsDefault; nLastToken = pInfo->nToken; } break; - case RTF_CLMRG: // A cell to be merged with the preceding cell + case RTF_CLMRG: // A cell to be merged with the preceding cell { if ( !pDefMerge ) pDefMerge = pDefaultList->Last(); DBG_ASSERT( pDefMerge, "RTF_CLMRG: pDefMerge==0" ); - if ( pDefMerge ) // sonst rottes RTF - pDefMerge->nColOverlap++; // mehrere nacheinander moeglich - pInsDefault->nColOverlap = 0; // Flag: ignoriere diese + if ( pDefMerge ) // sonst rottes RTF + pDefMerge->nColOverlap++; // mehrere nacheinander moeglich + pInsDefault->nColOverlap = 0; // Flag: ignoriere diese nLastToken = pInfo->nToken; } break; - case RTF_CELLX: // closes cell default + case RTF_CELLX: // closes cell default { bNewDef = TRUE; pInsDefault->nCol = nColCnt; - pInsDefault->nTwips = pInfo->nTokenValue; // rechter Zellenrand + pInsDefault->nTwips = pInfo->nTokenValue; // rechter Zellenrand pDefaultList->Insert( pInsDefault, LIST_APPEND ); // neuer freifliegender pInsDefault pInsDefault = new ScRTFCellDefault( pPool ); @@ -333,7 +333,7 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) nLastToken = pInfo->nToken; } break; - case RTF_INTBL: // before the first RTF_CELL + case RTF_INTBL: // before the first RTF_CELL { // einmal ueber NextToken und einmal ueber UnknownAttrToken // oder z.B. \intbl ... \cell \pard \intbl ... \cell @@ -344,16 +344,16 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) } } break; - case RTF_CELL: // denotes the end of a cell. + case RTF_CELL: // denotes the end of a cell. { DBG_ASSERT( pActDefault, "RTF_CELL: pActDefault==0" ); if ( bNewDef || !pActDefault ) - NewCellRow( pInfo ); // davor war kein \intbl, bad behavior + NewCellRow( pInfo ); // davor war kein \intbl, bad behavior // rottes RTF? retten was zu retten ist if ( !pActDefault ) pActDefault = pInsDefault; if ( pActDefault->nColOverlap > 0 ) - { // nicht merged mit vorheriger + { // nicht merged mit vorheriger pActEntry->nCol = pActDefault->nCol; pActEntry->nColOverlap = pActDefault->nColOverlap; pActEntry->nTwips = pActDefault->nTwips; @@ -364,10 +364,10 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) if ( nStartAdjust == (ULONG)~0 ) nStartAdjust = pList->Count(); pList->Insert( pActEntry, LIST_APPEND ); - NewActEntry( pActEntry ); // neuer freifliegender pActEntry + NewActEntry( pActEntry ); // neuer freifliegender pActEntry } else - { // aktuelle Twips der MergeCell zuweisen + { // aktuelle Twips der MergeCell zuweisen if ( (pE = pList->Last()) != 0 ) pE->nTwips = pActDefault->nTwips; // Selection des freifliegenden pActEntry anpassen @@ -378,29 +378,29 @@ void ScRTFParser::ProcToken( ImportInfo* pInfo ) nLastToken = pInfo->nToken; } break; - case RTF_ROW: // means the end of a row + case RTF_ROW: // means the end of a row { NextRow(); nLastToken = pInfo->nToken; } break; - case RTF_PAR: // Paragraph + case RTF_PAR: // Paragraph { if ( !pActDefault ) - { // text not in table - ColAdjust(); // close the processing table + { // text not in table + ColAdjust(); // close the processing table pActEntry->nCol = 0; pActEntry->nRow = nRowCnt; EntryEnd( pActEntry, pInfo->aSelection ); pList->Insert( pActEntry, LIST_APPEND ); - NewActEntry( pActEntry ); // new pActEntry + NewActEntry( pActEntry ); // new pActEntry NextRow(); } nLastToken = pInfo->nToken; } break; default: - { // do not set nLastToken + { // do not set nLastToken switch ( pInfo->nToken & ~(0xff | RTF_TABLEDEF) ) { case RTF_SHADINGDEF: diff --git a/sc/source/filter/starcalc/scflt.cxx b/sc/source/filter/starcalc/scflt.cxx index 4c7a019fd6a8..8d65644f3efa 100644 --- a/sc/source/filter/starcalc/scflt.cxx +++ b/sc/source/filter/starcalc/scflt.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 @@ -86,9 +86,9 @@ using namespace com::sun::star; -#define DEFCHARSET RTL_TEXTENCODING_MS_1252 +#define DEFCHARSET RTL_TEXTENCODING_MS_1252 -#define SC10TOSTRING(p) String(p,DEFCHARSET) +#define SC10TOSTRING(p) String(p,DEFCHARSET) const SCCOL SC10MAXCOL = 255; // #i85906# don't try to load more columns than there are in the file @@ -374,22 +374,22 @@ void lcl_ChangeColor( USHORT nIndex, Color& rColor ) switch( nIndex ) { - case 1: aCol = COL_RED; break; - case 2: aCol = COL_GREEN; break; - case 3: aCol = COL_BROWN; break; - case 4: aCol = COL_BLUE; break; - case 5: aCol = COL_MAGENTA; break; - case 6: aCol = COL_CYAN; break; - case 7: aCol = COL_GRAY; break; - case 8: aCol = COL_LIGHTGRAY; break; - case 9: aCol = COL_LIGHTRED; break; - case 10: aCol = COL_LIGHTGREEN; break; - case 11: aCol = COL_YELLOW; break; - case 12: aCol = COL_LIGHTBLUE; break; - case 13: aCol = COL_LIGHTMAGENTA; break; - case 14: aCol = COL_LIGHTCYAN; break; - case 15: aCol = COL_WHITE; break; - default: aCol = COL_BLACK; + case 1: aCol = COL_RED; break; + case 2: aCol = COL_GREEN; break; + case 3: aCol = COL_BROWN; break; + case 4: aCol = COL_BLUE; break; + case 5: aCol = COL_MAGENTA; break; + case 6: aCol = COL_CYAN; break; + case 7: aCol = COL_GRAY; break; + case 8: aCol = COL_LIGHTGRAY; break; + case 9: aCol = COL_LIGHTRED; break; + case 10: aCol = COL_LIGHTGREEN; break; + case 11: aCol = COL_YELLOW; break; + case 12: aCol = COL_LIGHTBLUE; break; + case 13: aCol = COL_LIGHTMAGENTA; break; + case 14: aCol = COL_LIGHTCYAN; break; + case 15: aCol = COL_WHITE; break; + default: aCol = COL_BLACK; } rColor.SetColor( aCol ); @@ -397,7 +397,7 @@ void lcl_ChangeColor( USHORT nIndex, Color& rColor ) String lcl_MakeOldPageStyleFormatName( USHORT i ) { - String aName = ScGlobal::GetRscString( STR_PAGESTYLE ); + String aName = ScGlobal::GetRscString( STR_PAGESTYLE ); aName.AppendAscii( " " ); aName += String::CreateFromInt32( i + 1 ); @@ -689,7 +689,7 @@ USHORT Sc10PageCollection::InsertFormat( const Sc10PageFormat& rData ) static inline UINT8 GetMixedCol( const UINT8 nB, const UINT8 nF, const UINT16 nFak ) { - INT32 nT = nB - nF; + INT32 nT = nB - nF; nT *= ( INT32 ) nFak; nT /= 0xFFFF; nT += nF; @@ -697,7 +697,7 @@ static inline UINT8 GetMixedCol( const UINT8 nB, const UINT8 nF, const UINT16 nF } static inline Color GetMixedColor( const Color& rFore, const Color& rBack, UINT16 nFact ) { - return Color( GetMixedCol( rBack.GetRed(), rFore.GetRed(), nFact ), + return Color( GetMixedCol( rBack.GetRed(), rFore.GetRed(), nFact ), GetMixedCol( rBack.GetGreen(), rFore.GetGreen(), nFact ), GetMixedCol( rBack.GetBlue(), rFore.GetBlue(), nFact ) ); } @@ -740,15 +740,15 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) FontFamily eFam = FAMILY_DONTKNOW; switch (pPage->HeadLine.LogFont.lfPitchAndFamily & 0xF0) { - case ffDontCare: eFam = FAMILY_DONTKNOW; break; - case ffRoman: eFam = FAMILY_ROMAN; break; - case ffSwiss: eFam = FAMILY_SWISS; break; - case ffModern: eFam = FAMILY_MODERN; break; - case ffScript: eFam = FAMILY_SCRIPT; break; - case ffDecorative: eFam = FAMILY_DECORATIVE; break; - default: eFam = FAMILY_DONTKNOW; break; + case ffDontCare: eFam = FAMILY_DONTKNOW; break; + case ffRoman: eFam = FAMILY_ROMAN; break; + case ffSwiss: eFam = FAMILY_SWISS; break; + case ffModern: eFam = FAMILY_MODERN; break; + case ffScript: eFam = FAMILY_SCRIPT; break; + case ffDecorative: eFam = FAMILY_DECORATIVE; break; + default: eFam = FAMILY_DONTKNOW; break; } - aEditAttribs.Put( SvxFontItem( + aEditAttribs.Put( SvxFontItem( eFam, SC10TOSTRING( pHeadFootLine->LogFont.lfFaceName ), EMPTY_STRING, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, EE_CHAR_FONTINFO ), @@ -808,15 +808,15 @@ void Sc10PageCollection::PutToDoc( ScDocument* pDoc ) Color aRColor( nColor.Red, nColor.Green, nColor.Blue ); UINT16 nFact; - BOOL bSwapCol = FALSE; + BOOL bSwapCol = FALSE; switch (pHeadFootLine->Raster) { - case raNone: nFact = 0xffff; bSwapCol = TRUE; break; - case raGray12: nFact = (0xffff / 100) * 12; break; - case raGray25: nFact = (0xffff / 100) * 25; break; - case raGray50: nFact = (0xffff / 100) * 50; break; - case raGray75: nFact = (0xffff / 100) * 75; break; - default: nFact = 0xffff; + case raNone: nFact = 0xffff; bSwapCol = TRUE; break; + case raGray12: nFact = (0xffff / 100) * 12; break; + case raGray25: nFact = (0xffff / 100) * 25; break; + case raGray50: nFact = (0xffff / 100) * 50; break; + case raGray75: nFact = (0xffff / 100) * 75; break; + default: nFact = 0xffff; } if( bSwapCol ) aSetItemItemSet.Put( SvxBrushItem( GetMixedColor( aBColor, aRColor, nFact ), ATTR_BACKGROUND ) ); @@ -975,7 +975,7 @@ Sc10Import::Sc10Import(SvStream& rStr, ScDocument* pDocument ) : pPatternCollection (NULL), pDataBaseCollection (NULL), nError (0), - nShowTab (0) + nShowTab (0) { pPrgrsBar = NULL; } @@ -1002,7 +1002,7 @@ ULONG Sc10Import::Import() ScDocOptions aOpt = pDoc->GetDocOptions(); aOpt.SetDate( 1, 1, 1900 ); - aOpt.SetYear2000( 18 + 1901 ); // ab SO51 src513e vierstellig + aOpt.SetYear2000( 18 + 1901 ); // ab SO51 src513e vierstellig pDoc->SetDocOptions( aOpt ); pDoc->GetFormatTable()->ChangeNullDate( 1, 1, 1900 ); @@ -1142,12 +1142,12 @@ void Sc10Import::LoadNameCollection() void Sc10Import::ImportNameCollection() { - ScRangeName* pRN = pDoc->GetRangeName(); + ScRangeName* pRN = pDoc->GetRangeName(); for (USHORT i = 0; i < pNameCollection->GetCount(); i++) { - Sc10NameData* pName = pNameCollection->At( i ); - pRN->Insert( new ScRangeData( pDoc, + Sc10NameData* pName = pNameCollection->At( i ); + pRN->Insert( new ScRangeData( pDoc, SC10TOSTRING( pName->Name ), SC10TOSTRING( pName->Reference ) ) ); } @@ -1182,13 +1182,13 @@ void Sc10Import::LoadPatternCollection() FontFamily eFam = FAMILY_DONTKNOW; switch( pPattern->LogFont.lfPitchAndFamily & 0xF0 ) { - case ffDontCare : eFam = FAMILY_DONTKNOW; break; - case ffRoman : eFam = FAMILY_ROMAN; break; - case ffSwiss : eFam = FAMILY_SWISS; break; - case ffModern : eFam = FAMILY_MODERN; break; - case ffScript : eFam = FAMILY_SCRIPT; break; - case ffDecorative : eFam = FAMILY_DECORATIVE; break; - default: eFam = FAMILY_DONTKNOW; break; + case ffDontCare : eFam = FAMILY_DONTKNOW; break; + case ffRoman : eFam = FAMILY_ROMAN; break; + case ffSwiss : eFam = FAMILY_SWISS; break; + case ffModern : eFam = FAMILY_MODERN; break; + case ffScript : eFam = FAMILY_SCRIPT; break; + case ffDecorative : eFam = FAMILY_DECORATIVE; break; + default: eFam = FAMILY_DONTKNOW; break; } rItemSet.Put( SvxFontItem( eFam, SC10TOSTRING( pPattern->LogFont.lfFaceName ), EMPTY_STRING, PITCH_DONTKNOW, RTL_TEXTENCODING_DONTKNOW, ATTR_FONT ) ); @@ -1248,8 +1248,8 @@ void Sc10Import::LoadPatternCollection() rItemSet.Put( SfxInt32Item( ATTR_ROTATE_VALUE, 27000 ) ); INT16 Margin = Max( ( USHORT ) 20, ( USHORT ) ( EJustify * 20 ) ); -// if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) || -// ( ( OJustify & ojBottomTop ) == ojBottomTop ) ) +// if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) || +// ( ( OJustify & ojBottomTop ) == ojBottomTop ) ) // vielleicht so? if( ( ( OJustify & ojBottomTop ) == ojBottomTop ) ) rItemSet.Put( SvxMarginItem( 20, Margin, 20, Margin, ATTR_MARGIN ) ); @@ -1262,14 +1262,14 @@ void Sc10Import::LoadPatternCollection() { if( pPattern->Frame != 0 ) { - USHORT nLeft = 0; - USHORT nTop = 0; - USHORT nRight = 0; - USHORT nBottom = 0; - USHORT fLeft = ( pPattern->Frame & 0x000F ); - USHORT fTop = ( pPattern->Frame & 0x00F0 ) / 0x0010; - USHORT fRight = ( pPattern->Frame & 0x0F00 ) / 0x0100; - USHORT fBottom = ( pPattern->Frame & 0xF000 ) / 0x1000; + USHORT nLeft = 0; + USHORT nTop = 0; + USHORT nRight = 0; + USHORT nBottom = 0; + USHORT fLeft = ( pPattern->Frame & 0x000F ); + USHORT fTop = ( pPattern->Frame & 0x00F0 ) / 0x0010; + USHORT fRight = ( pPattern->Frame & 0x0F00 ) / 0x0100; + USHORT fBottom = ( pPattern->Frame & 0xF000 ) / 0x1000; if( fLeft > 1 ) nLeft = 50; @@ -1291,22 +1291,22 @@ void Sc10Import::LoadPatternCollection() else if( fBottom > 0 ) nBottom = 20; - Color ColorLeft( COL_BLACK ); - Color ColorTop( COL_BLACK ); - Color ColorRight( COL_BLACK ); - Color ColorBottom( COL_BLACK ); + Color ColorLeft( COL_BLACK ); + Color ColorTop( COL_BLACK ); + Color ColorRight( COL_BLACK ); + Color ColorBottom( COL_BLACK ); - USHORT cLeft = ( pPattern->FrameColor & 0x000F ); - USHORT cTop = ( pPattern->FrameColor & 0x00F0 ) >> 4; - USHORT cRight = ( pPattern->FrameColor & 0x0F00 ) >> 8; - USHORT cBottom = ( pPattern->FrameColor & 0xF000 ) >> 12; + USHORT cLeft = ( pPattern->FrameColor & 0x000F ); + USHORT cTop = ( pPattern->FrameColor & 0x00F0 ) >> 4; + USHORT cRight = ( pPattern->FrameColor & 0x0F00 ) >> 8; + USHORT cBottom = ( pPattern->FrameColor & 0xF000 ) >> 12; lcl_ChangeColor( cLeft, ColorLeft ); lcl_ChangeColor( cTop, ColorTop ); lcl_ChangeColor( cRight, ColorRight ); lcl_ChangeColor( cBottom, ColorBottom ); - SvxBorderLine aLine; + SvxBorderLine aLine; SvxBoxItem aBox( ATTR_BORDER ); aLine.SetOutWidth( nLeft ); @@ -1343,16 +1343,16 @@ void Sc10Import::LoadPatternCollection() Color aRColor( COL_BLACK ); lcl_ChangeColor( nRColor, aRColor ); UINT16 nFact; - BOOL bSwapCol = FALSE; - BOOL bSetItem = TRUE; + BOOL bSwapCol = FALSE; + BOOL bSetItem = TRUE; switch (pPattern->Raster) { - case raNone: nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break; - case raGray12: nFact = (0xffff / 100) * 12; break; - case raGray25: nFact = (0xffff / 100) * 25; break; - case raGray50: nFact = (0xffff / 100) * 50; break; - case raGray75: nFact = (0xffff / 100) * 75; break; - default: nFact = 0xffff; bSetItem = (nRColor < 15); + case raNone: nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break; + case raGray12: nFact = (0xffff / 100) * 12; break; + case raGray25: nFact = (0xffff / 100) * 25; break; + case raGray50: nFact = (0xffff / 100) * 50; break; + case raGray75: nFact = (0xffff / 100) * 75; break; + default: nFact = 0xffff; bSetItem = (nRColor < 15); } if ( bSetItem ) { @@ -1428,7 +1428,7 @@ void Sc10Import::LoadTables() USHORT DataValue; USHORT Count; USHORT i; - String aStr; // Universal-Konvertierungs-String + String aStr; // Universal-Konvertierungs-String //rStream.Read(&PageFormat, sizeof(PageFormat)); @@ -1461,33 +1461,33 @@ void Sc10Import::LoadTables() if ( Tab == (INT16)nShowTab ) { - ScVObjMode eObjMode = VOBJ_MODE_SHOW; - - aSc30ViewOpt.SetOption( VOPT_FORMULAS, IS_SET(dfFormula,Display) ); - aSc30ViewOpt.SetOption( VOPT_NULLVALS, IS_SET(dfZerro,Display) ); - aSc30ViewOpt.SetOption( VOPT_SYNTAX, IS_SET(dfSyntax,Display) ); - aSc30ViewOpt.SetOption( VOPT_NOTES, IS_SET(dfNoteMark,Display) ); - aSc30ViewOpt.SetOption( VOPT_VSCROLL, TRUE ); - aSc30ViewOpt.SetOption( VOPT_HSCROLL, TRUE ); + ScVObjMode eObjMode = VOBJ_MODE_SHOW; + + aSc30ViewOpt.SetOption( VOPT_FORMULAS, IS_SET(dfFormula,Display) ); + aSc30ViewOpt.SetOption( VOPT_NULLVALS, IS_SET(dfZerro,Display) ); + aSc30ViewOpt.SetOption( VOPT_SYNTAX, IS_SET(dfSyntax,Display) ); + aSc30ViewOpt.SetOption( VOPT_NOTES, IS_SET(dfNoteMark,Display) ); + aSc30ViewOpt.SetOption( VOPT_VSCROLL, TRUE ); + aSc30ViewOpt.SetOption( VOPT_HSCROLL, TRUE ); aSc30ViewOpt.SetOption( VOPT_TABCONTROLS, TRUE ); - aSc30ViewOpt.SetOption( VOPT_OUTLINER, TRUE ); - aSc30ViewOpt.SetOption( VOPT_GRID, IS_SET(dfGrid,Display) ); + aSc30ViewOpt.SetOption( VOPT_OUTLINER, TRUE ); + aSc30ViewOpt.SetOption( VOPT_GRID, IS_SET(dfGrid,Display) ); // VOPT_HEADER wird in LoadViewColRowBar() gesetzt - if ( IS_SET(dfObjectAll,Display) ) // Objekte anzeigen + if ( IS_SET(dfObjectAll,Display) ) // Objekte anzeigen eObjMode = VOBJ_MODE_SHOW; - else if ( IS_SET(dfObjectFrame,Display) ) // Objekte als Platzhalter + else if ( IS_SET(dfObjectFrame,Display) ) // Objekte als Platzhalter eObjMode = VOBJ_MODE_SHOW; - else if ( IS_SET(dfObjectNone,Display) ) // Objekte nicht anzeigen + else if ( IS_SET(dfObjectNone,Display) ) // Objekte nicht anzeigen eObjMode = VOBJ_MODE_HIDE; - aSc30ViewOpt.SetObjMode( VOBJ_TYPE_OLE, eObjMode ); + aSc30ViewOpt.SetObjMode( VOBJ_TYPE_OLE, eObjMode ); aSc30ViewOpt.SetObjMode( VOBJ_TYPE_CHART, eObjMode ); aSc30ViewOpt.SetObjMode( VOBJ_TYPE_DRAW, eObjMode ); } - /* wofuer wird das benoetigt? Da in SC 1.0 die Anzeigeflags pro Tabelle gelten und nicht pro View + /* wofuer wird das benoetigt? Da in SC 1.0 die Anzeigeflags pro Tabelle gelten und nicht pro View Dieses Flag in die ViewOptions eintragen bei Gelegenheit, Sollte der Stephan Olk machen USHORT nDisplayMask = 0xFFFF; USHORT nDisplayValue = 0; @@ -1553,7 +1553,7 @@ void Sc10Import::LoadTables() bool bPageBreak = ((DataValue & crfSoftBreak) == crfSoftBreak); bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak); bool bHidden = ((DataValue & crfHidden) == crfHidden); - for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) + for (SCCOL k = static_cast<SCCOL>(DataStart); k <= static_cast<SCCOL>(DataEnd); k++) { pDoc->SetColHidden(k, k, static_cast<SCTAB>(TabNo), bHidden); pDoc->SetColBreak(k, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak); @@ -1603,8 +1603,8 @@ void Sc10Import::LoadTables() bool bPageBreak = ((DataValue & crfSoftBreak) == crfSoftBreak); bool bManualBreak = ((DataValue & crfHardBreak) == crfHardBreak); bool bHidden = ((DataValue & crfHidden) == crfHidden); - for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) - { + for (SCROW l = static_cast<SCROW>(DataStart); l <= static_cast<SCROW>(DataEnd); l++) + { pDoc->SetRowHidden(l, l, static_cast<SCTAB> (TabNo), bHidden); pDoc->SetRowBreak(l, static_cast<SCTAB> (TabNo), bPageBreak, bManualBreak); } @@ -1771,13 +1771,13 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) Sc10FontData* pFont = pFontCollection->At(pColData->Value); switch (pFont->PitchAndFamily & 0xF0) { - case ffDontCare : eFam = FAMILY_DONTKNOW; break; - case ffRoman : eFam = FAMILY_ROMAN; break; - case ffSwiss : eFam = FAMILY_SWISS; break; - case ffModern : eFam = FAMILY_MODERN; break; - case ffScript : eFam = FAMILY_SCRIPT; break; - case ffDecorative : eFam = FAMILY_DECORATIVE; break; - default: eFam = FAMILY_DONTKNOW; break; + case ffDontCare : eFam = FAMILY_DONTKNOW; break; + case ffRoman : eFam = FAMILY_ROMAN; break; + case ffSwiss : eFam = FAMILY_SWISS; break; + case ffModern : eFam = FAMILY_MODERN; break; + case ffScript : eFam = FAMILY_SCRIPT; break; + case ffDecorative : eFam = FAMILY_DECORATIVE; break; + default: eFam = FAMILY_DONTKNOW; break; } ScPatternAttr aScPattern(pDoc->GetPool()); aScPattern.GetItemSet().Put(SvxFontItem(eFam, SC10TOSTRING( pFont->FaceName ), EMPTY_STRING, @@ -1894,15 +1894,15 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) nStart = nEnd + 1; } // Umrandung - BOOL bEnd = FALSE; - USHORT nColorIndex = 0; - USHORT nFrameIndex = 0; + BOOL bEnd = FALSE; + USHORT nColorIndex = 0; + USHORT nFrameIndex = 0; // Special Fix... - const UINT32 nHelpMeStart = 100; - UINT32 nHelpMe = nHelpMeStart; - USHORT nColorIndexOld = nColorIndex; - USHORT nFrameIndexOld = nColorIndex; + const UINT32 nHelpMeStart = 100; + UINT32 nHelpMe = nHelpMeStart; + USHORT nColorIndexOld = nColorIndex; + USHORT nFrameIndexOld = nColorIndex; nEnd = 0; nStart = 0; @@ -1910,15 +1910,15 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) { pColData = &aFrame.pData[ nFrameIndex ]; - USHORT nValue = pColData->Value; - USHORT nLeft = 0; - USHORT nTop = 0; - USHORT nRight = 0; - USHORT nBottom = 0; - USHORT fLeft = ( nValue & 0x000F ); - USHORT fTop = ( nValue & 0x00F0 ) >> 4; - USHORT fRight = ( nValue & 0x0F00 ) >> 8; - USHORT fBottom = ( nValue & 0xF000 ) >> 12; + USHORT nValue = pColData->Value; + USHORT nLeft = 0; + USHORT nTop = 0; + USHORT nRight = 0; + USHORT nBottom = 0; + USHORT fLeft = ( nValue & 0x000F ); + USHORT fTop = ( nValue & 0x00F0 ) >> 4; + USHORT fRight = ( nValue & 0x0F00 ) >> 8; + USHORT fBottom = ( nValue & 0xF000 ) >> 12; if( fLeft > 1 ) nLeft = 50; @@ -1940,16 +1940,16 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) else if( fBottom > 0 ) nBottom = 20; - Color ColorLeft( COL_BLACK ); - Color ColorTop( COL_BLACK ); - Color ColorRight( COL_BLACK ); - Color ColorBottom( COL_BLACK ); - USHORT nFrmColVal = aFrameColor.pData[ nColorIndex ].Value; - SCROW nFrmColRow = static_cast<SCROW>(aFrameColor.pData[ nColorIndex ].Row); - USHORT cLeft = ( nFrmColVal & 0x000F ); - USHORT cTop = ( nFrmColVal & 0x00F0 ) >> 4; - USHORT cRight = ( nFrmColVal & 0x0F00 ) >> 8; - USHORT cBottom = ( nFrmColVal & 0xF000 ) >> 12; + Color ColorLeft( COL_BLACK ); + Color ColorTop( COL_BLACK ); + Color ColorRight( COL_BLACK ); + Color ColorBottom( COL_BLACK ); + USHORT nFrmColVal = aFrameColor.pData[ nColorIndex ].Value; + SCROW nFrmColRow = static_cast<SCROW>(aFrameColor.pData[ nColorIndex ].Row); + USHORT cLeft = ( nFrmColVal & 0x000F ); + USHORT cTop = ( nFrmColVal & 0x00F0 ) >> 4; + USHORT cRight = ( nFrmColVal & 0x0F00 ) >> 8; + USHORT cBottom = ( nFrmColVal & 0xF000 ) >> 12; lcl_ChangeColor( cLeft, ColorLeft ); lcl_ChangeColor( cTop, ColorTop ); @@ -1979,7 +1979,7 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) if( ( nStart <= nEnd ) && ( nValue != 0 ) ) { ScPatternAttr aScPattern(pDoc->GetPool()); - SvxBorderLine aLine; + SvxBorderLine aLine; SvxBoxItem aBox( ATTR_BORDER ); aLine.SetOutWidth( nLeft ); @@ -2020,21 +2020,21 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) // ACHTUNG: Code bis hier ueberarbeitet ... jetzt hab' ich keinen Bock mehr! (GT) // Hintergrund (Farbe, Raster) - USHORT nRasterIndex = 0; - bEnd = FALSE; - nColorIndex = 0; - nEnd = 0; - nStart = 0; + USHORT nRasterIndex = 0; + bEnd = FALSE; + nColorIndex = 0; + nEnd = 0; + nStart = 0; // Special Fix... - nHelpMe = nHelpMeStart; - USHORT nRasterIndexOld = nRasterIndex; + nHelpMe = nHelpMeStart; + USHORT nRasterIndexOld = nRasterIndex; while( !bEnd && nHelpMe ) { - USHORT nBColor = ( aColor.pData[ nColorIndex ].Value & 0x00F0 ) >> 4; - USHORT nRColor = ( aColor.pData[ nColorIndex ].Value & 0x0F00 ) >> 8; - Color aBColor( COL_BLACK ); + USHORT nBColor = ( aColor.pData[ nColorIndex ].Value & 0x00F0 ) >> 4; + USHORT nRColor = ( aColor.pData[ nColorIndex ].Value & 0x0F00 ) >> 8; + Color aBColor( COL_BLACK ); lcl_ChangeColor( nBColor, aBColor ); @@ -2043,23 +2043,23 @@ void Sc10Import::LoadColAttr(SCCOL Col, SCTAB Tab) else if( nBColor == 15 ) aBColor.SetColor( COL_BLACK ); - Color aRColor( COL_BLACK ); + Color aRColor( COL_BLACK ); lcl_ChangeColor( nRColor, aRColor ); ScPatternAttr aScPattern( pDoc->GetPool() ); UINT16 nFact; - BOOL bSwapCol = FALSE; - BOOL bSetItem = TRUE; + BOOL bSwapCol = FALSE; + BOOL bSetItem = TRUE; switch ( aRaster.pData[ nRasterIndex ].Value ) { - case raNone: nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break; - case raGray12: nFact = (0xffff / 100) * 12; break; - case raGray25: nFact = (0xffff / 100) * 25; break; - case raGray50: nFact = (0xffff / 100) * 50; break; - case raGray75: nFact = (0xffff / 100) * 75; break; - default: nFact = 0xffff; bSetItem = (nRColor < 15); + case raNone: nFact = 0xffff; bSwapCol = TRUE; bSetItem = (nBColor > 0); break; + case raGray12: nFact = (0xffff / 100) * 12; break; + case raGray25: nFact = (0xffff / 100) * 25; break; + case raGray50: nFact = (0xffff / 100) * 50; break; + case raGray75: nFact = (0xffff / 100) * 75; break; + default: nFact = 0xffff; bSetItem = (nRColor < 15); } if ( bSetItem ) { @@ -2464,7 +2464,7 @@ void Sc10Import::LoadObjects() //rStream.Read(&ChartHeader, sizeof(ChartHeader)); lcl_ReadChartHeader(rStream, ChartHeader); - //! altes Metafile verwenden ?? + //! altes Metafile verwenden ?? rStream.SeekRel(ChartHeader.Size); //rStream.Read(&ChartSheetData, sizeof(ChartSheetData)); @@ -2505,7 +2505,7 @@ void Sc10Import::LoadObjects() FltError ScFormatFilterPluginImpl::ScImportStarCalc10( SvStream& rStream, ScDocument* pDocument ) { rStream.Seek( 0UL ); - Sc10Import aImport( rStream, pDocument ); + Sc10Import aImport( rStream, pDocument ); return ( FltError ) aImport.Import(); } diff --git a/sc/source/filter/starcalc/scfobj.cxx b/sc/source/filter/starcalc/scfobj.cxx index 536f0fd5b816..e4732f90daf5 100644 --- a/sc/source/filter/starcalc/scfobj.cxx +++ b/sc/source/filter/starcalc/scfobj.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 @@ -62,7 +62,7 @@ using namespace com::sun::star; void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rectangle& rRect, SCTAB nSrcTab, USHORT nX1, USHORT nY1, USHORT nX2, USHORT nY2 ) { - // wenn Chart nicht installiert ist, darf nicht auf SCH_MOD zugegriffen werden! + // wenn Chart nicht installiert ist, darf nicht auf SCH_MOD zugegriffen werden! if ( !SvtModuleOptions().IsChart() ) return; @@ -85,7 +85,7 @@ void Sc10InsertObject::InsertChart( ScDocument* pDoc, SCTAB nDestTab, const Rect DBG_ASSERT(pPage,"Page ?"); pPage->InsertObject(pSdrOle2Obj); - pSdrOle2Obj->SetLogicRect(rRect); // erst nach InsertObject !!! + pSdrOle2Obj->SetLogicRect(rRect); // erst nach InsertObject !!! awt::Size aSz; aSz.Width = rRect.GetSize().Width(); aSz.Height = rRect.GetSize().Height(); diff --git a/sc/source/filter/xcl97/XclExpChangeTrack.cxx b/sc/source/filter/xcl97/XclExpChangeTrack.cxx index daab6245d730..60f792a8a3fa 100644 --- a/sc/source/filter/xcl97/XclExpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclExpChangeTrack.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,12 +73,12 @@ static OString lcl_DateTimeToOString( const DateTime& rDateTime ) void lcl_WriteDateTime( XclExpStream& rStrm, const DateTime& rDateTime ) { rStrm.SetSliceSize( 7 ); - rStrm << (sal_uInt16) rDateTime.GetYear() - << (sal_uInt8) rDateTime.GetMonth() - << (sal_uInt8) rDateTime.GetDay() - << (sal_uInt8) rDateTime.GetHour() - << (sal_uInt8) rDateTime.GetMin() - << (sal_uInt8) rDateTime.GetSec(); + rStrm << (sal_uInt16) rDateTime.GetYear() + << (sal_uInt8) rDateTime.GetMonth() + << (sal_uInt8) rDateTime.GetDay() + << (sal_uInt8) rDateTime.GetHour() + << (sal_uInt8) rDateTime.GetMin() + << (sal_uInt8) rDateTime.GetSec(); rStrm.SetSliceSize( 0 ); } @@ -118,17 +118,17 @@ XclExpUserBView::XclExpUserBView( const String& rUsername, const sal_uInt8* pGUI void XclExpUserBView::SaveCont( XclExpStream& rStrm ) { - rStrm << (sal_uInt32) 0xFF078014 - << (sal_uInt32) 0x00000001; + rStrm << (sal_uInt32) 0xFF078014 + << (sal_uInt32) 0x00000001; lcl_WriteGUID( rStrm, aGUID ); rStrm.WriteZeroBytes( 8 ); rStrm << (sal_uInt32) 1200 - << (sal_uInt32) 1000 - << (sal_uInt16) 1000 - << (sal_uInt16) 0x0CF7 - << (sal_uInt16) 0x0000 - << (sal_uInt16) 0x0001 - << (sal_uInt16) 0x0000; + << (sal_uInt32) 1000 + << (sal_uInt16) 1000 + << (sal_uInt16) 0x0CF7 + << (sal_uInt16) 0x0000 + << (sal_uInt16) 0x0001 + << (sal_uInt16) 0x0000; if( sUsername.Len() > 0 ) rStrm << sUsername; } @@ -182,19 +182,19 @@ XclExpUsersViewBegin::XclExpUsersViewBegin( const sal_uInt8* pGUID, sal_uInt32 n void XclExpUsersViewBegin::SaveCont( XclExpStream& rStrm ) { lcl_WriteGUID( rStrm, aGUID ); - rStrm << nCurrTab - << (sal_uInt32) 100 - << (sal_uInt32) 64 - << (sal_uInt32) 3 - << (sal_uInt32) 0x0000003C - << (sal_uInt16) 0 - << (sal_uInt16) 3 - << (sal_uInt16) 0 - << (sal_uInt16) 3 - << (double) 0 - << (double) 0 - << (sal_Int16) -1 - << (sal_Int16) -1; + rStrm << nCurrTab + << (sal_uInt32) 100 + << (sal_uInt32) 64 + << (sal_uInt32) 3 + << (sal_uInt32) 0x0000003C + << (sal_uInt16) 0 + << (sal_uInt16) 3 + << (sal_uInt16) 0 + << (sal_uInt16) 3 + << (double) 0 + << (double) 0 + << (sal_Int16) -1 + << (sal_Int16) -1; } UINT16 XclExpUsersViewBegin::GetNum() const @@ -245,7 +245,7 @@ sal_Size XclExpChTr0x0191::GetLen() const void XclExpChTr0x0198::SaveCont( XclExpStream& rStrm ) { - rStrm << (sal_uInt16) 0x0006 + rStrm << (sal_uInt16) 0x0006 << (sal_uInt16) 0x0000; } @@ -363,12 +363,12 @@ XclExpChTrHeader::~XclExpChTrHeader() void XclExpChTrHeader::SaveCont( XclExpStream& rStrm ) { - rStrm << (sal_uInt16) 0x0006 + rStrm << (sal_uInt16) 0x0006 << (sal_uInt16) 0x0000 << (sal_uInt16) 0x000D; lcl_WriteGUID( rStrm, aGUID ); lcl_WriteGUID( rStrm, aGUID ); - rStrm << nCount + rStrm << nCount << (sal_uInt16) 0x0001 << (sal_uInt32) 0x00000000 << (sal_uInt16) 0x001E; @@ -412,16 +412,16 @@ XclExpChTrInfo::~XclExpChTrInfo() void XclExpChTrInfo::SaveCont( XclExpStream& rStrm ) { - rStrm << (sal_uInt32) 0xFFFFFFFF - << (sal_uInt32) 0x00000000 - << (sal_uInt32) 0x00000020 - << (sal_uInt16) 0xFFFF; + rStrm << (sal_uInt32) 0xFFFFFFFF + << (sal_uInt32) 0x00000000 + << (sal_uInt32) 0x00000020 + << (sal_uInt16) 0xFFFF; lcl_WriteGUID( rStrm, aGUID ); - rStrm << (sal_uInt16) 0x04B0; + rStrm << (sal_uInt16) 0x04B0; lcl_WriteFixedString( rStrm, sUsername, 113 ); lcl_WriteDateTime( rStrm, aDateTime ); - rStrm << (sal_uInt8) 0x0000 - << (sal_uInt16) 0x0002; + rStrm << (sal_uInt8) 0x0000 + << (sal_uInt16) 0x0002; } UINT16 XclExpChTrInfo::GetNum() const @@ -681,7 +681,7 @@ void XclExpChTrAction::SetIndex( sal_uInt32& rIndex ) void XclExpChTrAction::SaveCont( XclExpStream& rStrm ) { DBG_ASSERT( nOpCode != EXC_CHTR_OP_UNKNOWN, "XclExpChTrAction::SaveCont - unknown action" ); - rStrm << nLength + rStrm << nLength << nIndex << nOpCode << (sal_uInt16)(bAccepted ? EXC_CHTR_ACCEPT : EXC_CHTR_NOTHING); @@ -919,10 +919,10 @@ void XclExpChTrCellContent::GetCellData( void XclExpChTrCellContent::SaveActionData( XclExpStream& rStrm ) const { WriteTabId( rStrm, aPosition.Tab() ); - rStrm << (sal_uInt16)((pOldData ? (pOldData->nType << 3) : 0x0000) | (pNewData ? pNewData->nType : 0x0000)) + rStrm << (sal_uInt16)((pOldData ? (pOldData->nType << 3) : 0x0000) | (pNewData ? pNewData->nType : 0x0000)) << (sal_uInt16) 0x0000; Write2DAddress( rStrm, aPosition ); - rStrm << nOldLength + rStrm << nOldLength << (sal_uInt32) 0x00000000; if( pOldData ) pOldData->Write( rStrm, rIdBuffer ); @@ -1057,10 +1057,10 @@ XclExpChTrInsert::XclExpChTrInsert( nLength = 0x00000030; switch( rAction.GetType() ) { - case SC_CAT_INSERT_COLS: nOpCode = EXC_CHTR_OP_INSCOL; break; - case SC_CAT_INSERT_ROWS: nOpCode = EXC_CHTR_OP_INSROW; break; - case SC_CAT_DELETE_COLS: nOpCode = EXC_CHTR_OP_DELCOL; break; - case SC_CAT_DELETE_ROWS: nOpCode = EXC_CHTR_OP_DELROW; break; + case SC_CAT_INSERT_COLS: nOpCode = EXC_CHTR_OP_INSCOL; break; + case SC_CAT_INSERT_ROWS: nOpCode = EXC_CHTR_OP_INSROW; break; + case SC_CAT_DELETE_COLS: nOpCode = EXC_CHTR_OP_DELCOL; break; + case SC_CAT_DELETE_ROWS: nOpCode = EXC_CHTR_OP_DELROW; break; default: DBG_ERROR( "XclExpChTrInsert::XclExpChTrInsert - unknown action" ); } @@ -1090,9 +1090,9 @@ XclExpChTrInsert::~XclExpChTrInsert() void XclExpChTrInsert::SaveActionData( XclExpStream& rStrm ) const { WriteTabId( rStrm, aRange.aStart.Tab() ); - rStrm << (sal_uInt16) 0x0000; + rStrm << (sal_uInt16) 0x0000; Write2DRange( rStrm, aRange ); - rStrm << (sal_uInt32) 0x00000000; + rStrm << (sal_uInt32) 0x00000000; } void XclExpChTrInsert::PrepareSaveAction( XclExpStream& rStrm ) const @@ -1297,7 +1297,7 @@ XclExpChTr0x014A::~XclExpChTr0x014A() void XclExpChTr0x014A::SaveActionData( XclExpStream& rStrm ) const { WriteTabId( rStrm, aRange.aStart.Tab() ); - rStrm << (sal_uInt16) 0x0003 + rStrm << (sal_uInt16) 0x0003 << (sal_uInt16) 0x0001; Write2DRange( rStrm, aRange ); } @@ -1516,7 +1516,7 @@ XclExpChangeTrack::XclExpChangeTrack( const XclExpRoot& rRoot ) : sal_Int32 nLogNumber = 1; while( XclExpChTrAction* pAction = aActionStack.Pop() ) { - if( (nIndex == 1) || pAction->ForceInfoRecord() || + if( (nIndex == 1) || pAction->ForceInfoRecord() || (pAction->GetUsername() != sLastUsername) || (pAction->GetDateTime() != aLastDateTime) ) { diff --git a/sc/source/filter/xcl97/XclImpChangeTrack.cxx b/sc/source/filter/xcl97/XclImpChangeTrack.cxx index c20fba217513..c47b8ebcda33 100644 --- a/sc/source/filter/xcl97/XclImpChangeTrack.cxx +++ b/sc/source/filter/xcl97/XclImpChangeTrack.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 @@ -208,7 +208,7 @@ void XclImpChangeTrack::ReadFormula( ScTokenArray*& rpTokenArray, const ScAddres // read the formula, 3D tab refs from extended data const ScTokenArray* pArray = NULL; aFmlConv.Reset( rPosition ); - BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK); // JEG : Check This + BOOL bOK = (aFmlConv.Convert( pArray, aFmlaStrm, nFmlSize, false, FT_CellFormula) == ConvOK); // JEG : Check This rpTokenArray = (bOK && pArray) ? new ScTokenArray( *pArray ) : NULL; pStrm->Ignore( 1 ); } @@ -348,10 +348,10 @@ void XclImpChangeTrack::ReadChTrCellContent() pStrm->Ignore( 4 ); switch( nValueType & EXC_CHTR_TYPE_FORMATMASK ) { - case 0x0000: break; + case 0x0000: break; case 0x1100: pStrm->Ignore( 16 ); break; case 0x1300: pStrm->Ignore( 8 ); break; - default: DBG_ERROR( "XclImpChangeTrack::ReadChTrCellContent - unknown format info" ); + default: DBG_ERROR( "XclImpChangeTrack::ReadChTrCellContent - unknown format info" ); } ScBaseCell* pOldCell; @@ -456,17 +456,17 @@ void XclImpChangeTrack::ReadRecords() { switch( pStrm->GetRecId() ) { - case 0x000A: bGlobExit = sal_True; break; - case 0x0137: ReadChTrInsert(); break; - case 0x0138: ReadChTrInfo(); break; - case 0x013B: ReadChTrCellContent(); break; - case 0x013D: ReadChTrTabId(); break; - case 0x0140: ReadChTrMoveRange(); break; - case 0x014D: ReadChTrInsertTab(); break; + case 0x000A: bGlobExit = sal_True; break; + case 0x0137: ReadChTrInsert(); break; + case 0x0138: ReadChTrInfo(); break; + case 0x013B: ReadChTrCellContent(); break; + case 0x013D: ReadChTrTabId(); break; + case 0x0140: ReadChTrMoveRange(); break; + case 0x014D: ReadChTrInsertTab(); break; case 0x014E: - case 0x0150: InitNestedMode(); break; + case 0x0150: InitNestedMode(); break; case 0x014F: - case 0x0151: bExitLoop = EndNestedMode(); break; + case 0x0151: bExitLoop = EndNestedMode(); break; } } } @@ -495,7 +495,7 @@ XclImpChTrFmlConverter::~XclImpChTrFmlConverter() } // virtual, called from ExcToSc8::Convert() -bool XclImpChTrFmlConverter::Read3DTabReference( UINT16 /*nIxti*/, SCTAB& rFirstTab, SCTAB& rLastTab, +bool XclImpChTrFmlConverter::Read3DTabReference( UINT16 /*nIxti*/, SCTAB& rFirstTab, SCTAB& rLastTab, ExternalTabInfo& rExtInfo ) { return rChangeTrack.Read3DTabRefInfo( rFirstTab, rLastTab, rExtInfo ); diff --git a/sc/source/filter/xcl97/xcl97dum.cxx b/sc/source/filter/xcl97/xcl97dum.cxx index 8340ce397ffa..7d188ecb2472 100644 --- a/sc/source/filter/xcl97/xcl97dum.cxx +++ b/sc/source/filter/xcl97/xcl97dum.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 @@ -40,10 +40,10 @@ // ... (8+) := neu in Biff8, ... (8*) := anders in Biff8 const BYTE ExcDummy8_00a::pMyData[] = { - 0xe1, 0x00, 0x02, 0x00, 0xb0, 0x04, // INTERFACEHDR - 0xc1, 0x00, 0x02, 0x00, 0x00, 0x00, // MMS - 0xe2, 0x00, 0x00, 0x00, // INTERFACEEND - 0x5c, 0x00, 0x70, 0x00, // WRITEACCESS (8*) + 0xe1, 0x00, 0x02, 0x00, 0xb0, 0x04, // INTERFACEHDR + 0xc1, 0x00, 0x02, 0x00, 0x00, 0x00, // MMS + 0xe2, 0x00, 0x00, 0x00, // INTERFACEEND + 0x5c, 0x00, 0x70, 0x00, // WRITEACCESS (8*) 0x04, 0x00, 0x00, 'C', 'a', 'l', 'c', 0x20, // "Calc" 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, @@ -58,34 +58,34 @@ const BYTE ExcDummy8_00a::pMyData[] = { 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x42, 0x00, 0x02, 0x00, 0xb0, 0x04, // CODEPAGE - 0x61, 0x01, 0x02, 0x00, 0x00, 0x00 // DSF (8+) + 0x42, 0x00, 0x02, 0x00, 0xb0, 0x04, // CODEPAGE + 0x61, 0x01, 0x02, 0x00, 0x00, 0x00 // DSF (8+) }; const sal_Size ExcDummy8_00a::nMyLen = sizeof(ExcDummy8_00a::pMyData); // TABID (8+): ExcTabid const BYTE ExcDummy8_00b::pMyData[] = { - 0x9c, 0x00, 0x02, 0x00, 0x0e, 0x00 // FNGROUPCOUNT + 0x9c, 0x00, 0x02, 0x00, 0x0e, 0x00 // FNGROUPCOUNT }; const sal_Size ExcDummy8_00b::nMyLen = sizeof(ExcDummy8_00b::pMyData); const BYTE ExcDummy8_040::pMyData[] = { - 0xaf, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REV (8+) - 0xbc, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REVPASS (8+) -// 0x3d, 0x00, 0x12, 0x00, 0xe0, 0x01, 0x5a, 0x00, 0xcf, // WINDOW1 -// 0x3f, 0x4e, 0x2a, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, -// 0x01, 0x00, 0x58, 0x02, - 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP - 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00 // HIDEOBJ + 0xaf, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REV (8+) + 0xbc, 0x01, 0x02, 0x00, 0x00, 0x00, // PROT4REVPASS (8+) +// 0x3d, 0x00, 0x12, 0x00, 0xe0, 0x01, 0x5a, 0x00, 0xcf, // WINDOW1 +// 0x3f, 0x4e, 0x2a, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, +// 0x01, 0x00, 0x58, 0x02, + 0x40, 0x00, 0x02, 0x00, 0x00, 0x00, // BACKUP + 0x8d, 0x00, 0x02, 0x00, 0x00, 0x00 // HIDEOBJ }; const sal_Size ExcDummy8_040::nMyLen = sizeof(ExcDummy8_040::pMyData); const BYTE ExcDummy8_041::pMyData[] = { - 0xb7, 0x01, 0x02, 0x00, 0x00, 0x00, // REFRESHALL (8+) - 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL + 0xb7, 0x01, 0x02, 0x00, 0x00, 0x00, // REFRESHALL (8+) + 0xda, 0x00, 0x02, 0x00, 0x00, 0x00 // BOOKBOOL }; const sal_Size ExcDummy8_041::nMyLen = sizeof(ExcDummy8_041::pMyData); diff --git a/sc/source/filter/xcl97/xcl97esc.cxx b/sc/source/filter/xcl97/xcl97esc.cxx index 8f4674cb7e44..f7a6273c10c4 100644 --- a/sc/source/filter/xcl97/xcl97esc.cxx +++ b/sc/source/filter/xcl97/xcl97esc.cxx @@ -202,7 +202,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape nAdditionalText++; BOOL bInGroup = ( pCurrXclObj != NULL ); if ( bInGroup ) - { // stacked recursive group object + { // stacked recursive group object if ( !pCurrAppData->IsStackedGroup() ) { //! UpdateDffFragmentEnd only once pCurrAppData->SetStackedGroup( TRUE ); @@ -267,7 +267,7 @@ EscherExHostAppData* XclEscherEx::StartShape( const Reference< XShape >& rxShape if ( pCurrXclObj ) { if ( !mrObjMgr.AddObj( pCurrXclObj ) ) - { // maximum count reached, object got deleted + { // maximum count reached, object got deleted pCurrXclObj = NULL; } else @@ -492,7 +492,7 @@ void XclEscherEx::DeleteCurrAppData() // --- class XclEscherClientData ------------------------------------- void XclEscherClientData::WriteData( EscherEx& rEx ) const -{ // actual data is in the following OBJ record +{ // actual data is in the following OBJ record rEx.AddAtom( 0, ESCHER_ClientData ); } diff --git a/sc/source/filter/xcl97/xcl97rec.cxx b/sc/source/filter/xcl97/xcl97rec.cxx index 14858d41362c..921e58a83e1a 100644 --- a/sc/source/filter/xcl97/xcl97rec.cxx +++ b/sc/source/filter/xcl97/xcl97rec.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 @@ -447,12 +447,12 @@ static void lcl_FillProps( EscherPropertyContainer& rPropOpt, SdrObject* pCaptio { rPropOpt.CreateFillProperties( aXPropSet, sal_True); - rPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // undocumented - rPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented + rPropOpt.AddOpt( ESCHER_Prop_lTxid, 0 ); // undocumented + rPropOpt.AddOpt( 0x0158, 0x00000000 ); // undocumented sal_uInt32 nValue = 0; if( !rPropOpt.GetOpt( ESCHER_Prop_FitTextToShape, nValue ) ) - rPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field + rPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field if( rPropOpt.GetOpt( ESCHER_Prop_fillColor, nValue ) ) { @@ -473,11 +473,11 @@ static void lcl_FillProps( EscherPropertyContainer& rPropOpt, SdrObject* pCaptio if( !rPropOpt.GetOpt( ESCHER_Prop_fillBackColor, nValue ) ) rPropOpt.AddOpt( ESCHER_Prop_fillBackColor, 0x08000050 ); if( !rPropOpt.GetOpt( ESCHER_Prop_fNoFillHitTest, nValue ) ) - rPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00110010 ); // bool field + rPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00110010 ); // bool field if( !rPropOpt.GetOpt( ESCHER_Prop_shadowColor, nValue ) ) rPropOpt.AddOpt( ESCHER_Prop_shadowColor, 0x00000000 ); - if( !rPropOpt.GetOpt( ESCHER_Prop_fshadowObscured, nValue ) ) // bool field - rPropOpt.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // bool field + if( !rPropOpt.GetOpt( ESCHER_Prop_fshadowObscured, nValue ) ) // bool field + rPropOpt.AddOpt( ESCHER_Prop_fshadowObscured, 0x00030003 ); // bool field } } @@ -493,7 +493,7 @@ void XclObjComment::ProcessEscherObj( const XclExpRoot& rRoot, const Rectangle& lcl_FillProps( aPropOpt, pCaption, bVisible ); - nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked + nGrbit = 0; // all off: AutoLine, AutoFill, Printable, Locked mrEscherEx.OpenContainer( ESCHER_SpContainer ); mrEscherEx.AddShape( ESCHER_ShpInst_TextBox, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT ); aPropOpt.Commit( mrEscherEx.GetStream() ); @@ -607,15 +607,15 @@ XclObjDropDown::XclObjDropDown( XclExpObjectManager& rObjMgr, const ScAddress& r SetPrintable( FALSE ); SetAutoFill( TRUE ); SetAutoLine( FALSE ); - nGrbit |= 0x0100; // undocumented + nGrbit |= 0x0100; // undocumented mrEscherEx.OpenContainer( ESCHER_SpContainer ); mrEscherEx.AddShape( ESCHER_ShpInst_HostControl, SHAPEFLAG_HAVEANCHOR | SHAPEFLAG_HAVESPT ); EscherPropertyContainer aPropOpt; - aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01040104 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00010000 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080000 ); // bool field - aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x000A0000 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_LockAgainstGrouping, 0x01040104 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_FitTextToShape, 0x00080008 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_fNoFillHitTest, 0x00010000 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_fNoLineDrawDash, 0x00080000 ); // bool field + aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x000A0000 ); // bool field aPropOpt.Commit( mrEscherEx.GetStream() ); XclExpDffDropDownAnchor( rObjMgr.GetRoot(), rPos ).WriteDffData( mrEscherEx ); @@ -821,10 +821,10 @@ XclObjOle::~XclObjOle() void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) { // write only as embedded, not linked - String aStorageName( RTL_CONSTASCII_USTRINGPARAM( "MBD" ) ); - sal_Char aBuf[ sizeof(UINT32) * 2 + 1 ]; + String aStorageName( RTL_CONSTASCII_USTRINGPARAM( "MBD" ) ); + sal_Char aBuf[ sizeof(UINT32) * 2 + 1 ]; // FIXME Eeek! Is this just a way to get a unique id? - UINT32 nPictureId = UINT32(sal_uIntPtr(this) >> 2); + UINT32 nPictureId = UINT32(sal_uIntPtr(this) >> 2); sprintf( aBuf, "%08X", static_cast< unsigned int >( nPictureId ) ); // #100211# - checked aStorageName.AppendAscii( aBuf ); SotStorageRef xOleStg = pRootStorage->OpenSotStorage( aStorageName, @@ -836,8 +836,8 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) { // set version to "old" version, because it must be // saved in MS notation. - UINT32 nFl = 0; - SvtFilterOptions* pFltOpts = SvtFilterOptions::Get(); + UINT32 nFl = 0; + SvtFilterOptions* pFltOpts = SvtFilterOptions::Get(); if( pFltOpts ) { if( pFltOpts->IsMath2MathType() ) @@ -853,7 +853,7 @@ void XclObjOle::WriteSubRecs( XclExpStream& rStrm ) nFl |= OLE_STARIMPRESS_2_POWERPOINT; } - SvxMSExportOLEObjects aOLEExpFilt( nFl ); + SvxMSExportOLEObjects aOLEExpFilt( nFl ); aOLEExpFilt.ExportOLEObject( xObj, *xOleStg ); // OBJCF subrecord, undocumented as usual @@ -926,12 +926,12 @@ void XclObjAny::Save( XclExpStream& rStrm ) ExcBof8_Base::ExcBof8_Base() { - nVers = 0x0600; - nRupBuild = 0x0dbb; - nRupYear = 0x07cc; -// nFileHistory = 0x00000001; // last edited by Microsoft Excel for Windows - nFileHistory = 0x00000000; - nLowestBiffVer = 0x00000006; // Biff8 + nVers = 0x0600; + nRupBuild = 0x0dbb; + nRupYear = 0x07cc; +// nFileHistory = 0x00000001; // last edited by Microsoft Excel for Windows + nFileHistory = 0x00000000; + nLowestBiffVer = 0x00000006; // Biff8 } void XclObjAny::WriteFromTo( XclExpXmlStream& rStrm, const Reference< XShape >& rShape, SCTAB nTab ) { @@ -1055,7 +1055,7 @@ void XclObjAny::SaveXml( XclExpXmlStream& rStrm ) void ExcBof8_Base::SaveCont( XclExpStream& rStrm ) { rStrm.DisableEncryption(); - rStrm << nVers << nDocType << nRupBuild << nRupYear + rStrm << nVers << nDocType << nRupBuild << nRupYear << nFileHistory << nLowestBiffVer; } @@ -1122,7 +1122,7 @@ void ExcBundlesheet8::SaveCont( XclExpStream& rStrm ) sal_Size ExcBundlesheet8::GetLen() const -{ // Text max 255 chars +{ // Text max 255 chars return 8 + GetName().GetBufferSize(); } @@ -1223,10 +1223,10 @@ void ExcEScenarioCell::SaveXml( XclExpXmlStream& rStrm ) ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) { - String sTmpName; - String sTmpComm; - Color aDummyCol; - USHORT nFlags; + String sTmpName; + String sTmpComm; + Color aDummyCol; + USHORT nFlags; ScDocument& rDoc = rRoot.GetDoc(); rDoc.GetName( nTab, sTmpName ); @@ -1246,11 +1246,11 @@ ExcEScenario::ExcEScenario( const XclExpRoot& rRoot, SCTAB nTab ) if( !pRList ) return; - BOOL bContLoop = TRUE; - SCROW nRow; - SCCOL nCol; - String sText; - double fVal; + BOOL bContLoop = TRUE; + SCROW nRow; + SCCOL nCol; + String sText; + double fVal; for( UINT32 nRange = 0; (nRange < pRList->Count()) && bContLoop; nRange++ ) { @@ -1294,9 +1294,9 @@ BOOL ExcEScenario::Append( UINT16 nCol, UINT16 nRow, const String& rTxt ) void ExcEScenario::SaveCont( XclExpStream& rStrm ) { - rStrm << (UINT16) List::Count() // number of cells - << nProtected // fProtection - << (UINT8) 0 // fHidden + rStrm << (UINT16) List::Count() // number of cells + << nProtected // fProtection + << (UINT8) 0 // fHidden << (UINT8) sName.Len() // length of scen name << (UINT8) sComment.Len() // length of comment << (UINT8) sUserName.Len(); // length of user name @@ -1310,9 +1310,9 @@ void ExcEScenario::SaveCont( XclExpStream& rStrm ) ExcEScenarioCell* pCell; for( pCell = _First(); pCell; pCell = _Next() ) - pCell->WriteAddress( rStrm ); // pos of cell + pCell->WriteAddress( rStrm ); // pos of cell for( pCell = _First(); pCell; pCell = _Next() ) - pCell->WriteText( rStrm ); // string content + pCell->WriteText( rStrm ); // string content rStrm.SetSliceSize( 2 ); rStrm.WriteZeroBytes( 2 * List::Count() ); // date format } @@ -1355,8 +1355,8 @@ ExcEScenarioManager::ExcEScenarioManager( const XclExpRoot& rRoot, SCTAB nTab ) if( rDoc.IsScenario( nTab ) ) return; - SCTAB nFirstTab = nTab + 1; - SCTAB nNewTab = nFirstTab; + SCTAB nFirstTab = nTab + 1; + SCTAB nNewTab = nFirstTab; while( rDoc.IsScenario( nNewTab ) ) { @@ -1376,10 +1376,10 @@ ExcEScenarioManager::~ExcEScenarioManager() void ExcEScenarioManager::SaveCont( XclExpStream& rStrm ) { - rStrm << (UINT16) List::Count() // number of scenarios - << nActive // active scen - << nActive // last displayed - << (UINT16) 0; // reference areas + rStrm << (UINT16) List::Count() // number of scenarios + << nActive // active scen + << nActive // last displayed + << (UINT16) 0; // reference areas } void ExcEScenarioManager::Save( XclExpStream& rStrm ) diff --git a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx b/sc/source/filter/xml/XMLCalculationSettingsContext.cxx index 98d7a41da7c7..f26dd20140f4 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.cxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.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/xml/XMLCalculationSettingsContext.hxx b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx index 867c01a5d923..b9f3eeee711e 100644 --- a/sc/source/filter/xml/XMLCalculationSettingsContext.hxx +++ b/sc/source/filter/xml/XMLCalculationSettingsContext.hxx @@ -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/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx index 6b9bed748fb6..35e6efd67f2f 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.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 @@ -63,15 +63,15 @@ ScXMLCellRangeSourceContext::ScXMLCellRangeSourceContext( { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableCellRangeSourceAttrTokenMap(); + sal_Int16 nAttrCount = xAttrList->getLength(); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetTableCellRangeSourceAttrTokenMap(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { const rtl::OUString& sAttrName(xAttrList->getNameByIndex( nIndex )); const OUString& sValue(xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx index 711e83c7ea55..7282802df0eb 100644 --- a/sc/source/filter/xml/XMLCellRangeSourceContext.hxx +++ b/sc/source/filter/xml/XMLCellRangeSourceContext.hxx @@ -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 @@ -38,13 +38,13 @@ class ScXMLImport; struct ScMyImpCellRangeSource { - ::rtl::OUString sSourceStr; - ::rtl::OUString sFilterName; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; - sal_Int32 nColumns; - sal_Int32 nRows; - sal_Int32 nRefresh; + ::rtl::OUString sSourceStr; + ::rtl::OUString sFilterName; + ::rtl::OUString sFilterOptions; + ::rtl::OUString sURL; + sal_Int32 nColumns; + sal_Int32 nRows; + sal_Int32 nRefresh; ScMyImpCellRangeSource(); }; @@ -55,8 +55,8 @@ struct ScMyImpCellRangeSource class ScXMLCellRangeSourceContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLCellRangeSourceContext( @@ -66,14 +66,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpCellRangeSource* pCellRangeSource ); - virtual ~ScXMLCellRangeSourceContext(); + virtual ~ScXMLCellRangeSourceContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx index 9f129bd160dd..fe13d9a6f356 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.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 @@ -127,7 +127,7 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction { SvXMLElementExport aCreatorElem( rExport, XML_NAMESPACE_DC, - XML_CREATOR, sal_True, + XML_CREATOR, sal_True, sal_False ); rtl::OUString sAuthor(pAction->GetUser()); rExport.Characters(sAuthor); @@ -137,10 +137,10 @@ void ScChangeTrackingExportHelper::WriteChangeInfo(const ScChangeAction* pAction rtl::OUStringBuffer sDate; ScXMLConverter::ConvertDateTimeToString(pAction->GetDateTimeUTC(), sDate); SvXMLElementExport aDateElem( rExport, XML_NAMESPACE_DC, - XML_DATE, sal_True, + XML_DATE, sal_True, sal_False ); rExport.Characters(sDate.makeStringAndClear()); - } + } rtl::OUString sComment(pAction->GetComment()); if (sComment.getLength()) @@ -334,7 +334,7 @@ void ScChangeTrackingExportHelper::WriteValueCell(const ScBaseCell* pCell, const { SetValueAttributes(pValueCell->GetValue(), sValue); SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TABLE, XML_CHANGE_TRACK_TABLE_CELL, sal_True, sal_True); -/* if (sValue.Len()) +/* if (sValue.Len()) { SvXMLElementExport aElemC(rExport, XML_NAMESPACE_TEXT, XML_P, sal_True, sal_False); sal_Bool bPrevCharWasSpace(sal_True); @@ -420,12 +420,12 @@ void ScChangeTrackingExportHelper::WriteFormulaCell(const ScBaseCell* pCell, con rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_MATRIX_COVERED, XML_TRUE); } rtl::OUString sMatrixFormula = sOUFormula.copy(1, sOUFormula.getLength() - 2); - rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sMatrixFormula, sal_False ); + rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sMatrixFormula, sal_False ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FORMULA, sQValue); } else { - rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sFormula, sal_False ); + rtl::OUString sQValue = rExport.GetNamespaceMap().GetQNameByKey( nNamespacePrefix, sFormula, sal_False ); rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_FORMULA, sQValue); } if (pFormulaCell->IsValue()) @@ -793,7 +793,7 @@ void ScChangeTrackingExportHelper::CollectAndWriteChanges() { if (pChangeTrack) { -/* if (pChangeTrack->IsProtected()) +/* if (pChangeTrack->IsProtected()) { rtl::OUStringBuffer aBuffer; SvXMLUnitConverter::encodeBase64(aBuffer, pChangeTrack->GetProtection()); diff --git a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx index cfb518e58b29..ed32a7ec93a6 100644 --- a/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingExportHelper.hxx @@ -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 @@ typedef std::list<ScChangeActionDel*> ScMyDeletionsList; class ScChangeTrackingExportHelper { - ScXMLExport& rExport; + ScXMLExport& rExport; - ScChangeTrack* pChangeTrack; + ScChangeTrack* pChangeTrack; ScEditEngineTextObj* pEditTextObj; ScChangeActionTable* pDependings; - rtl::OUString sChangeIDPrefix; - com::sun::star::uno::Reference<com::sun::star::text::XText> xText; + rtl::OUString sChangeIDPrefix; + com::sun::star::uno::Reference<com::sun::star::text::XText> xText; rtl::OUString GetChangeID(const sal_uInt32 nActionNumber); void GetAcceptanceState(const ScChangeAction* pAction); diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx index 65294d496d87..c23846789258 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.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 @@ -481,7 +481,7 @@ void ScXMLChangeTrackingImportHelper::ConvertInfo(const ScMyActionInfo& aInfo, S rUser = aInfo.sUser; // shouldn't happen } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsAction* pAction) { DateTime aDateTime( Date(0), Time(0) ); String aUser; @@ -494,7 +494,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateInsertAction(ScMyInsActio return pNewAction; } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelAction* pAction) { DateTime aDateTime( Date(0), Time(0) ); String aUser; @@ -507,7 +507,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateDeleteAction(ScMyDelActio return pNewAction; } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction* pAction) { DBG_ASSERT(pAction->pMoveRanges, "no move ranges"); if (pAction->pMoveRanges) @@ -525,7 +525,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateMoveAction(ScMyMoveAction return NULL; } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAction* pAction) { DateTime aDateTime( Date(0), Time(0) ); String aUser; @@ -538,7 +538,7 @@ ScChangeAction* ScXMLChangeTrackingImportHelper::CreateRejectionAction(ScMyRejAc return pNewAction; } -ScChangeAction* ScXMLChangeTrackingImportHelper::CreateContentAction(ScMyContentAction* pAction) +ScChangeAction* ScXMLChangeTrackingImportHelper::CreateContentAction(ScMyContentAction* pAction) { ScBaseCell* pCell = NULL; if (pAction->pCellInfo) diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index 5a98df08a2c7..937b8f9b7fb3 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -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 @@ -82,9 +82,9 @@ typedef std::list<ScMyDeleted*> ScMyDeletedList; struct ScMyGenerated { - ScBigRange aBigRange; - sal_uInt32 nID; - ScMyCellInfo* pCellInfo; + ScBigRange aBigRange; + sal_uInt32 nID; + ScMyCellInfo* pCellInfo; ScMyGenerated(ScMyCellInfo* pCellInfo, const ScBigRange& aBigRange); ~ScMyGenerated(); @@ -168,7 +168,7 @@ struct ScMyMoveAction : public ScMyBaseAction struct ScMyContentAction : public ScMyBaseAction { - ScMyCellInfo* pCellInfo; + ScMyCellInfo* pCellInfo; ScMyContentAction(); ~ScMyContentAction(); @@ -186,25 +186,25 @@ class ScChangeViewSettings; class ScXMLChangeTrackingImportHelper { - ScStrCollection aUsers; - ScMyActions aActions; - com::sun::star::uno::Sequence<sal_Int8> aProtect; - ScDocument* pDoc; - ScChangeTrack* pTrack; - ScMyBaseAction* pCurrentAction; - rtl::OUString sIDPrefix; - sal_uInt32 nPrefixLength; - sal_Int16 nMultiSpanned; - sal_Int16 nMultiSpannedSlaveCount; - sal_Bool bChangeTrack; + ScStrCollection aUsers; + ScMyActions aActions; + com::sun::star::uno::Sequence<sal_Int8> aProtect; + ScDocument* pDoc; + ScChangeTrack* pTrack; + ScMyBaseAction* pCurrentAction; + rtl::OUString sIDPrefix; + sal_uInt32 nPrefixLength; + sal_Int16 nMultiSpanned; + sal_Int16 nMultiSpannedSlaveCount; + sal_Bool bChangeTrack; private: void ConvertInfo(const ScMyActionInfo& aInfo, String& rUser, DateTime& aDateTime); - ScChangeAction* CreateInsertAction(ScMyInsAction* pAction); - ScChangeAction* CreateDeleteAction(ScMyDelAction* pAction); - ScChangeAction* CreateMoveAction(ScMyMoveAction* pAction); - ScChangeAction* CreateRejectionAction(ScMyRejAction* pAction); - ScChangeAction* CreateContentAction(ScMyContentAction* pAction); + ScChangeAction* CreateInsertAction(ScMyInsAction* pAction); + ScChangeAction* CreateDeleteAction(ScMyDelAction* pAction); + ScChangeAction* CreateMoveAction(ScMyMoveAction* pAction); + ScChangeAction* CreateRejectionAction(ScMyRejAction* pAction); + ScChangeAction* CreateContentAction(ScMyContentAction* pAction); void CreateGeneratedActions(ScMyGeneratedList& rList); diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx index 2f971e547abf..9cfe67d81d11 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.cxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.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 @@ -62,18 +62,18 @@ sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeN } -XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : - mpDoc( pDoc ), +XMLCodeNameProvider::XMLCodeNameProvider( ScDocument* pDoc ) : + mpDoc( pDoc ), msDocName( RTL_CONSTASCII_USTRINGPARAM("*doc*") ), msCodeNameProp( RTL_CONSTASCII_USTRINGPARAM("CodeName") ) { } -XMLCodeNameProvider::~XMLCodeNameProvider() +XMLCodeNameProvider::~XMLCodeNameProvider() { } -::sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName ) +::sal_Bool SAL_CALL XMLCodeNameProvider::hasByName( const OUString& aName ) throw (uno::RuntimeException ) { if( aName == msDocName ) @@ -95,7 +95,7 @@ XMLCodeNameProvider::~XMLCodeNameProvider() } uno::Any SAL_CALL XMLCodeNameProvider::getByName( const OUString& aName ) - throw (container::NoSuchElementException, + throw (container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException) { uno::Any aRet; @@ -131,7 +131,7 @@ uno::Sequence< OUString > SAL_CALL XMLCodeNameProvider::getElementNames( ) throw (uno::RuntimeException) { SCTAB nCount = mpDoc->GetTableCount() + 1; - uno::Sequence< rtl::OUString > aNames( nCount ); + uno::Sequence< rtl::OUString > aNames( nCount ); sal_Int32 nRealCount = 0; if( mpDoc->GetCodeName().Len() ) @@ -194,7 +194,7 @@ void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xN String sSheetName; for( SCTAB i = 0; i < nCount; i++ ) { - if( pDoc->GetName( i, sSheetName ) && + if( pDoc->GetName( i, sSheetName ) && xNameAccess->hasByName( sSheetName ) ) { aAny = xNameAccess->getByName( sSheetName ); diff --git a/sc/source/filter/xml/XMLCodeNameProvider.hxx b/sc/source/filter/xml/XMLCodeNameProvider.hxx index 81a5b5e3ebdc..61e12770bf9b 100644 --- a/sc/source/filter/xml/XMLCodeNameProvider.hxx +++ b/sc/source/filter/xml/XMLCodeNameProvider.hxx @@ -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,19 +41,19 @@ class XMLCodeNameProvider : public ::cppu::WeakImplHelper1< ::com::sun::star::co ::rtl::OUString msDocName; ::rtl::OUString msCodeNameProp; - static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny, + static sal_Bool _getCodeName( const ::com::sun::star::uno::Any& aAny, String& rCodeName ); public: XMLCodeNameProvider( ScDocument* pDoc ); virtual ~XMLCodeNameProvider(); - virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) + virtual ::sal_Bool SAL_CALL hasByName( const ::rtl::OUString& aName ) throw (::com::sun::star::uno::RuntimeException ); virtual ::com::sun::star::uno::Any SAL_CALL getByName( const ::rtl::OUString& aName ) - throw (::com::sun::star::container::NoSuchElementException, - ::com::sun::star::lang::WrappedTargetException, + throw (::com::sun::star::container::NoSuchElementException, + ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getElementNames( ) diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx b/sc/source/filter/xml/XMLColumnRowGroupExport.cxx index bc53d9a373b2..2ce898512f10 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.cxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.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 @@ -90,9 +90,9 @@ sal_Bool ScMyOpenCloseColumnRowGroup::IsGroupStart(const sal_Int32 nField) sal_Int32 nItrField = aItr->nField; if ( nItrField < nField ) { - // #103327# when used to find repeated rows at the beginning of a group, - // aTableStart may contain entries before nField. They must be skipped here - // (they will be used for OpenGroups later in the right order). + // #103327# when used to find repeated rows at the beginning of a group, + // aTableStart may contain entries before nField. They must be skipped here + // (they will be used for OpenGroups later in the right order). ScMyColumnRowGroupVec::iterator aEnd(aTableStart.end()); while ( aItr != aEnd && nItrField < nField ) diff --git a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx index 37608b737f5e..f0d3d525b224 100644 --- a/sc/source/filter/xml/XMLColumnRowGroupExport.hxx +++ b/sc/source/filter/xml/XMLColumnRowGroupExport.hxx @@ -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 @@ -35,9 +35,9 @@ struct ScMyColumnRowGroup { - sal_Int32 nField; - sal_Int16 nLevel; - sal_Bool bDisplay; + sal_Int32 nField; + sal_Int16 nLevel; + sal_Bool bDisplay; ScMyColumnRowGroup(); sal_Bool operator< (const ScMyColumnRowGroup& rGroup) const; @@ -49,10 +49,10 @@ typedef std::list <sal_Int32> ScMyFieldGroupVec; class ScXMLExport; class ScMyOpenCloseColumnRowGroup { - ScXMLExport& rExport; - const rtl::OUString rName; - ScMyColumnRowGroupVec aTableStart; - ScMyFieldGroupVec aTableEnd; + ScXMLExport& rExport; + const rtl::OUString rName; + ScMyColumnRowGroupVec aTableStart; + ScMyFieldGroupVec aTableEnd; void OpenGroup(const ScMyColumnRowGroup& rGroup); void CloseGroup(); diff --git a/sc/source/filter/xml/XMLConsolidationContext.cxx b/sc/source/filter/xml/XMLConsolidationContext.cxx index f075dfc68129..157b263c473c 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.cxx +++ b/sc/source/filter/xml/XMLConsolidationContext.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 @@ -60,15 +60,15 @@ ScXMLConsolidationContext::ScXMLConsolidationContext( rImport.LockSolarMutex(); if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConsolidationAttrTokenMap(); + sal_Int16 nAttrCount = xAttrList->getLength(); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetConsolidationAttrTokenMap(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -130,7 +130,7 @@ void ScXMLConsolidationContext::EndElement() if ( !ScRangeStringConverter::GetAreaFromString( *ppAreas[ nIndex ], sSourceList, GetScImport().GetDocument(), ::formula::FormulaGrammar::CONV_OOO, nOffset ) ) { - bError = sal_True; //! handle error + bError = sal_True; //! handle error } } diff --git a/sc/source/filter/xml/XMLConsolidationContext.hxx b/sc/source/filter/xml/XMLConsolidationContext.hxx index a059c1309f04..d20bba79eb8f 100644 --- a/sc/source/filter/xml/XMLConsolidationContext.hxx +++ b/sc/source/filter/xml/XMLConsolidationContext.hxx @@ -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,16 +41,16 @@ class ScXMLImport; class ScXMLConsolidationContext : public SvXMLImportContext { private: - ::rtl::OUString sSourceList; - ::rtl::OUString sUseLabel; - ScAddress aTargetAddr; - ScSubTotalFunc eFunction; - sal_Bool bLinkToSource; - sal_Bool bTargetAddr; + ::rtl::OUString sSourceList; + ::rtl::OUString sUseLabel; + ScAddress aTargetAddr; + ScSubTotalFunc eFunction; + sal_Bool bLinkToSource; + sal_Bool bTargetAddr; protected: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLConsolidationContext( @@ -59,14 +59,14 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual ~ScXMLConsolidationContext(); + virtual ~ScXMLConsolidationContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; diff --git a/sc/source/filter/xml/XMLConverter.cxx b/sc/source/filter/xml/XMLConverter.cxx index ee6a345fdc11..28b0caf5efa5 100644 --- a/sc/source/filter/xml/XMLConverter.cxx +++ b/sc/source/filter/xml/XMLConverter.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,7 +49,7 @@ using namespace xmloff::token; //___________________________________________________________________ -ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel ) +ScDocument* ScXMLConverter::GetScDocument( uno::Reference< frame::XModel > xModel ) { if (xModel.is()) { @@ -128,19 +128,19 @@ void ScXMLConverter::GetStringFromFunction( OUString sFuncStr; switch( eFunction ) { - case sheet::GeneralFunction_AUTO: sFuncStr = GetXMLToken( XML_AUTO ); break; - case sheet::GeneralFunction_AVERAGE: sFuncStr = GetXMLToken( XML_AVERAGE ); break; - case sheet::GeneralFunction_COUNT: sFuncStr = GetXMLToken( XML_COUNT ); break; - case sheet::GeneralFunction_COUNTNUMS: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break; - case sheet::GeneralFunction_MAX: sFuncStr = GetXMLToken( XML_MAX ); break; - case sheet::GeneralFunction_MIN: sFuncStr = GetXMLToken( XML_MIN ); break; - case sheet::GeneralFunction_NONE: sFuncStr = GetXMLToken( XML_NONE ); break; - case sheet::GeneralFunction_PRODUCT: sFuncStr = GetXMLToken( XML_PRODUCT ); break; - case sheet::GeneralFunction_STDEV: sFuncStr = GetXMLToken( XML_STDEV ); break; - case sheet::GeneralFunction_STDEVP: sFuncStr = GetXMLToken( XML_STDEVP ); break; - case sheet::GeneralFunction_SUM: sFuncStr = GetXMLToken( XML_SUM ); break; - case sheet::GeneralFunction_VAR: sFuncStr = GetXMLToken( XML_VAR ); break; - case sheet::GeneralFunction_VARP: sFuncStr = GetXMLToken( XML_VARP ); break; + case sheet::GeneralFunction_AUTO: sFuncStr = GetXMLToken( XML_AUTO ); break; + case sheet::GeneralFunction_AVERAGE: sFuncStr = GetXMLToken( XML_AVERAGE ); break; + case sheet::GeneralFunction_COUNT: sFuncStr = GetXMLToken( XML_COUNT ); break; + case sheet::GeneralFunction_COUNTNUMS: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break; + case sheet::GeneralFunction_MAX: sFuncStr = GetXMLToken( XML_MAX ); break; + case sheet::GeneralFunction_MIN: sFuncStr = GetXMLToken( XML_MIN ); break; + case sheet::GeneralFunction_NONE: sFuncStr = GetXMLToken( XML_NONE ); break; + case sheet::GeneralFunction_PRODUCT: sFuncStr = GetXMLToken( XML_PRODUCT ); break; + case sheet::GeneralFunction_STDEV: sFuncStr = GetXMLToken( XML_STDEV ); break; + case sheet::GeneralFunction_STDEVP: sFuncStr = GetXMLToken( XML_STDEVP ); break; + case sheet::GeneralFunction_SUM: sFuncStr = GetXMLToken( XML_SUM ); break; + case sheet::GeneralFunction_VAR: sFuncStr = GetXMLToken( XML_VAR ); break; + case sheet::GeneralFunction_VARP: sFuncStr = GetXMLToken( XML_VARP ); break; default: { // added to avoid warnings @@ -157,18 +157,18 @@ void ScXMLConverter::GetStringFromFunction( OUString sFuncStr; switch( eFunction ) { - case SUBTOTAL_FUNC_AVE: sFuncStr = GetXMLToken( XML_AVERAGE ); break; - case SUBTOTAL_FUNC_CNT: sFuncStr = GetXMLToken( XML_COUNT ); break; - case SUBTOTAL_FUNC_CNT2: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break; - case SUBTOTAL_FUNC_MAX: sFuncStr = GetXMLToken( XML_MAX ); break; - case SUBTOTAL_FUNC_MIN: sFuncStr = GetXMLToken( XML_MIN ); break; - case SUBTOTAL_FUNC_NONE: sFuncStr = GetXMLToken( XML_NONE ); break; - case SUBTOTAL_FUNC_PROD: sFuncStr = GetXMLToken( XML_PRODUCT ); break; - case SUBTOTAL_FUNC_STD: sFuncStr = GetXMLToken( XML_STDEV ); break; - case SUBTOTAL_FUNC_STDP: sFuncStr = GetXMLToken( XML_STDEVP ); break; - case SUBTOTAL_FUNC_SUM: sFuncStr = GetXMLToken( XML_SUM ); break; - case SUBTOTAL_FUNC_VAR: sFuncStr = GetXMLToken( XML_VAR ); break; - case SUBTOTAL_FUNC_VARP: sFuncStr = GetXMLToken( XML_VARP ); break; + case SUBTOTAL_FUNC_AVE: sFuncStr = GetXMLToken( XML_AVERAGE ); break; + case SUBTOTAL_FUNC_CNT: sFuncStr = GetXMLToken( XML_COUNT ); break; + case SUBTOTAL_FUNC_CNT2: sFuncStr = GetXMLToken( XML_COUNTNUMS ); break; + case SUBTOTAL_FUNC_MAX: sFuncStr = GetXMLToken( XML_MAX ); break; + case SUBTOTAL_FUNC_MIN: sFuncStr = GetXMLToken( XML_MIN ); break; + case SUBTOTAL_FUNC_NONE: sFuncStr = GetXMLToken( XML_NONE ); break; + case SUBTOTAL_FUNC_PROD: sFuncStr = GetXMLToken( XML_PRODUCT ); break; + case SUBTOTAL_FUNC_STD: sFuncStr = GetXMLToken( XML_STDEV ); break; + case SUBTOTAL_FUNC_STDP: sFuncStr = GetXMLToken( XML_STDEVP ); break; + case SUBTOTAL_FUNC_SUM: sFuncStr = GetXMLToken( XML_SUM ); break; + case SUBTOTAL_FUNC_VAR: sFuncStr = GetXMLToken( XML_VAR ); break; + case SUBTOTAL_FUNC_VARP: sFuncStr = GetXMLToken( XML_VARP ); break; } ScRangeStringConverter::AssignString( rString, sFuncStr, bAppendStr ); } @@ -333,7 +333,7 @@ void ScXMLConverter::ParseFormula(OUString& sFormula, const sal_Bool bIsFormula) ++nCountBraces; else if (sFormula[i] == ']') nCountBraces--; - else if ((sFormula[i] != '.') || + else if ((sFormula[i] != '.') || ((nCountBraces == 0) && bIsFormula) || !((chPrevious == '[') || (chPrevious == ':') || (chPrevious == ' ') || (chPrevious == '='))) sBuffer.append(sFormula[i]); diff --git a/sc/source/filter/xml/XMLConverter.hxx b/sc/source/filter/xml/XMLConverter.hxx index f8d6f40ef6d0..037117f347ab 100644 --- a/sc/source/filter/xml/XMLConverter.hxx +++ b/sc/source/filter/xml/XMLConverter.hxx @@ -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 @@ -50,11 +50,11 @@ class SvXMLUnitConverter; class ScXMLConverter { public: - inline ScXMLConverter() {} - inline ~ScXMLConverter() {} + inline ScXMLConverter() {} + inline ~ScXMLConverter() {} // helper methods - static ScDocument* GetScDocument( + static ScDocument* GetScDocument( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel ); // IMPORT: GeneralFunction / ScSubTotalFunc @@ -65,11 +65,11 @@ public: const ::rtl::OUString& rString ); // EXPORT: GeneralFunction / ScSubTotalFunc - static void GetStringFromFunction( + static void GetStringFromFunction( ::rtl::OUString& rString, const ::com::sun::star::sheet::GeneralFunction eFunction, sal_Bool bAppendStr = sal_False ); - static void GetStringFromFunction( + static void GetStringFromFunction( ::rtl::OUString& rString, const ScSubTotalFunc eFunction, sal_Bool bAppendStr = sal_False ); @@ -80,7 +80,7 @@ public: const ::rtl::OUString& rString ); // EXPORT: DataPilotFieldOrientation - static void GetStringFromOrientation( + static void GetStringFromOrientation( ::rtl::OUString& rString, const ::com::sun::star::sheet::DataPilotFieldOrientation eOrientation, sal_Bool bAppendStr = sal_False ); @@ -89,27 +89,27 @@ public: static ScDetectiveObjType GetDetObjTypeFromString( const ::rtl::OUString& rString ); - static sal_Bool GetDetOpTypeFromString( + static sal_Bool GetDetOpTypeFromString( ScDetOpType& rDetOpType, const ::rtl::OUString& rString ); // EXPORT: Detective - static void GetStringFromDetObjType( + static void GetStringFromDetObjType( ::rtl::OUString& rString, const ScDetectiveObjType eObjType, sal_Bool bAppendStr = sal_False ); - static void GetStringFromDetOpType( + static void GetStringFromDetOpType( ::rtl::OUString& rString, const ScDetOpType eOpType, sal_Bool bAppendStr = sal_False ); // IMPORT: Formulas - static void ParseFormula( + static void ParseFormula( ::rtl::OUString& sFormula, const sal_Bool bIsFormula = sal_True); // EXPORT: Core Date Time - static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); - static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); + static void ConvertDateTimeToString(const DateTime& aDateTime, rtl::OUStringBuffer& sDate); + static void ConvertCoreToAPIDateTime(const DateTime& aDateTime, com::sun::star::util::DateTime& rDateTime); static void ConvertAPIToCoreDateTime(const com::sun::star::util::DateTime& aDateTime, DateTime& rDateTime); }; diff --git a/sc/source/filter/xml/XMLDDELinksContext.cxx b/sc/source/filter/xml/XMLDDELinksContext.cxx index 792c19b5e30a..269861a5c745 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.cxx +++ b/sc/source/filter/xml/XMLDDELinksContext.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 @@ -165,10 +165,10 @@ void ScXMLDDELinkContext::EndElement() { bool bSizeMatch = (static_cast<size_t>(nColumns * nRows) == aDDELinkTable.size()); DBG_ASSERT( bSizeMatch, "ScXMLDDELinkContext::EndElement: matrix dimension doesn't match cells count"); - // Excel writes bad ODF in that it does not write the + // Excel writes bad ODF in that it does not write the // table:number-columns-repeated attribute of the - // <table:table-column> element, but apparently uses the number of - // <table:table-cell> elements within a <table:table-row> element to + // <table:table-column> element, but apparently uses the number of + // <table:table-cell> elements within a <table:table-row> element to // determine the column count instead. Be lenient ... if (!bSizeMatch && nColumns == 1) { @@ -220,14 +220,14 @@ ScXMLDDESourceContext::ScXMLDDESourceContext( ScXMLImport& rImport, { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); + sal_Int16 nAttrCount = xAttrList->getLength(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (nPrefix == XML_NAMESPACE_OFFICE) { @@ -322,14 +322,14 @@ ScXMLDDEColumnContext::ScXMLDDEColumnContext( ScXMLImport& rImport, if( !xAttrList.is() ) return; sal_Int32 nCols(1); - sal_Int16 nAttrCount = xAttrList->getLength(); + sal_Int16 nAttrCount = xAttrList->getLength(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (nPrefix == XML_NAMESPACE_TABLE) if (IsXMLToken(aLocalName, XML_NUMBER_COLUMNS_REPEATED)) @@ -368,14 +368,14 @@ ScXMLDDERowContext::ScXMLDDERowContext( ScXMLImport& rImport, { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); + sal_Int16 nAttrCount = xAttrList->getLength(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (nPrefix == XML_NAMESPACE_TABLE) if (IsXMLToken(aLocalName, XML_NUMBER_ROWS_REPEATED)) @@ -427,14 +427,14 @@ ScXMLDDECellContext::ScXMLDDECellContext( ScXMLImport& rImport, { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); + sal_Int16 nAttrCount = xAttrList->getLength(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sTempValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); if (nPrefix == XML_NAMESPACE_OFFICE) { diff --git a/sc/source/filter/xml/XMLDDELinksContext.hxx b/sc/source/filter/xml/XMLDDELinksContext.hxx index d296df83be2c..2ecb49370131 100644 --- a/sc/source/filter/xml/XMLDDELinksContext.hxx +++ b/sc/source/filter/xml/XMLDDELinksContext.hxx @@ -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 @@ -67,15 +67,15 @@ typedef std::list<ScDDELinkCell> ScDDELinkCells; class ScXMLDDELinkContext : public SvXMLImportContext { - ScDDELinkCells aDDELinkTable; - ScDDELinkCells aDDELinkRow; - rtl::OUString sApplication; - rtl::OUString sTopic; - rtl::OUString sItem; - sal_Int32 nPosition; - sal_Int32 nColumns; - sal_Int32 nRows; - sal_uInt8 nMode; + ScDDELinkCells aDDELinkTable; + ScDDELinkCells aDDELinkRow; + rtl::OUString sApplication; + rtl::OUString sTopic; + rtl::OUString sItem; + sal_Int32 nPosition; + sal_Int32 nColumns; + sal_Int32 nRows; + sal_uInt8 nMode; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -176,8 +176,8 @@ public: class ScXMLDDERowContext : public SvXMLImportContext { - ScXMLDDELinkContext* pDDELink; - sal_Int32 nRows; + ScXMLDDELinkContext* pDDELink; + sal_Int32 nRows; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -200,12 +200,12 @@ public: class ScXMLDDECellContext : public SvXMLImportContext { - rtl::OUString sValue; - double fValue; - sal_Int32 nCells; - sal_Bool bString; - sal_Bool bString2; - sal_Bool bEmpty; + rtl::OUString sValue; + double fValue; + sal_Int32 nCells; + sal_Bool bString; + sal_Bool bString2; + sal_Bool bEmpty; ScXMLDDELinkContext* pDDELink; diff --git a/sc/source/filter/xml/XMLDetectiveContext.cxx b/sc/source/filter/xml/XMLDetectiveContext.cxx index 131dea72379d..02a5ea00b549 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.cxx +++ b/sc/source/filter/xml/XMLDetectiveContext.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 @@ -101,8 +101,8 @@ SvXMLImportContext *ScXMLDetectiveContext::CreateChildContext( const OUString& rLName, const uno::Reference< xml::sax::XAttributeList>& xAttrList ) { - SvXMLImportContext* pContext = NULL; - const SvXMLTokenMap& rTokenMap = GetScImport().GetDetectiveElemTokenMap(); + SvXMLImportContext* pContext = NULL; + const SvXMLTokenMap& rTokenMap = GetScImport().GetDetectiveElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) { @@ -139,15 +139,15 @@ ScXMLDetectiveHighlightedContext::ScXMLDetectiveHighlightedContext( { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveHighlightedAttrTokenMap(); + sal_Int16 nAttrCount = xAttrList->getLength(); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveHighlightedAttrTokenMap(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { @@ -219,15 +219,15 @@ ScXMLDetectiveOperationContext::ScXMLDetectiveOperationContext( { if( !xAttrList.is() ) return; - sal_Int16 nAttrCount = xAttrList->getLength(); - const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveOperationAttrTokenMap(); + sal_Int16 nAttrCount = xAttrList->getLength(); + const SvXMLTokenMap& rAttrTokenMap = GetScImport().GetDetectiveOperationAttrTokenMap(); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); OUString aLocalName; - USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); + USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/XMLDetectiveContext.hxx b/sc/source/filter/xml/XMLDetectiveContext.hxx index 4e2d6b402574..67be1637ba01 100644 --- a/sc/source/filter/xml/XMLDetectiveContext.hxx +++ b/sc/source/filter/xml/XMLDetectiveContext.hxx @@ -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,9 +43,9 @@ class ScXMLImport; struct ScMyImpDetectiveObj { - ScRange aSourceRange; - ScDetectiveObjType eObjType; - sal_Bool bHasError; + ScRange aSourceRange; + ScDetectiveObjType eObjType; + sal_Bool bHasError; ScMyImpDetectiveObj(); }; @@ -57,12 +57,12 @@ typedef ::std::vector< ScMyImpDetectiveObj > ScMyImpDetectiveObjVec; struct ScMyImpDetectiveOp { - ScAddress aPosition; - ScDetOpType eOpType; - sal_Int32 nIndex; + ScAddress aPosition; + ScDetOpType eOpType; + sal_Int32 nIndex; - inline ScMyImpDetectiveOp() : nIndex( -1 ) {} - sal_Bool operator<(const ScMyImpDetectiveOp& rDetOp) const; + inline ScMyImpDetectiveOp() : nIndex( -1 ) {} + sal_Bool operator<(const ScMyImpDetectiveOp& rDetOp) const; }; typedef ::std::list< ScMyImpDetectiveOp > ScMyImpDetectiveOpList; @@ -70,17 +70,17 @@ typedef ::std::list< ScMyImpDetectiveOp > ScMyImpDetectiveOpList; class ScMyImpDetectiveOpArray { private: - ScMyImpDetectiveOpList aDetectiveOpList; + ScMyImpDetectiveOpList aDetectiveOpList; public: - inline ScMyImpDetectiveOpArray() : - aDetectiveOpList() {} + inline ScMyImpDetectiveOpArray() : + aDetectiveOpList() {} - inline void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp ) + inline void AddDetectiveOp( const ScMyImpDetectiveOp& rDetOp ) { aDetectiveOpList.push_back( rDetOp ); } - void Sort(); - sal_Bool GetFirstOp( ScMyImpDetectiveOp& rDetOp ); + void Sort(); + sal_Bool GetFirstOp( ScMyImpDetectiveOp& rDetOp ); }; @@ -89,10 +89,10 @@ public: class ScXMLDetectiveContext : public SvXMLImportContext { private: - ScMyImpDetectiveObjVec* pDetectiveObjVec; + ScMyImpDetectiveObjVec* pDetectiveObjVec; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDetectiveContext( @@ -101,14 +101,14 @@ public: const ::rtl::OUString& rLName, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); - virtual ~ScXMLDetectiveContext(); + virtual ~ScXMLDetectiveContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; @@ -117,12 +117,12 @@ public: class ScXMLDetectiveHighlightedContext : public SvXMLImportContext { private: - ScMyImpDetectiveObjVec* pDetectiveObjVec; - ScMyImpDetectiveObj aDetectiveObj; - sal_Bool bValid; + ScMyImpDetectiveObjVec* pDetectiveObjVec; + ScMyImpDetectiveObj aDetectiveObj; + sal_Bool bValid; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDetectiveHighlightedContext( @@ -132,14 +132,14 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList, ScMyImpDetectiveObjVec* pNewDetectiveObjVec ); - virtual ~ScXMLDetectiveHighlightedContext(); + virtual ~ScXMLDetectiveHighlightedContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; @@ -148,11 +148,11 @@ public: class ScXMLDetectiveOperationContext : public SvXMLImportContext { private: - ScMyImpDetectiveOp aDetectiveOp; - sal_Bool bHasType; + ScMyImpDetectiveOp aDetectiveOp; + sal_Bool bHasType; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLDetectiveOperationContext( @@ -161,14 +161,14 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual ~ScXMLDetectiveOperationContext(); + virtual ~ScXMLDetectiveOperationContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList >& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; diff --git a/sc/source/filter/xml/XMLEmptyContext.cxx b/sc/source/filter/xml/XMLEmptyContext.cxx index 20bec1f097b2..6f5a74ad2698 100644 --- a/sc/source/filter/xml/XMLEmptyContext.cxx +++ b/sc/source/filter/xml/XMLEmptyContext.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/xml/XMLEmptyContext.hxx b/sc/source/filter/xml/XMLEmptyContext.hxx index 1b090c719281..0bfadc3d5e9e 100644 --- a/sc/source/filter/xml/XMLEmptyContext.hxx +++ b/sc/source/filter/xml/XMLEmptyContext.hxx @@ -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 @@ -34,8 +34,8 @@ class ScXMLImport; class ScXMLEmptyContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; - sal_Bool bStartFormPage; + rtl::OUString sPrintRanges; + sal_Bool bStartFormPage; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLExportDDELinks.cxx b/sc/source/filter/xml/XMLExportDDELinks.cxx index f0b80840098c..11796bae510e 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.cxx +++ b/sc/source/filter/xml/XMLExportDDELinks.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/xml/XMLExportDDELinks.hxx b/sc/source/filter/xml/XMLExportDDELinks.hxx index f7fd55574cf9..9f09d6236029 100644 --- a/sc/source/filter/xml/XMLExportDDELinks.hxx +++ b/sc/source/filter/xml/XMLExportDDELinks.hxx @@ -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 @@ -36,12 +36,12 @@ class ScXMLExport; class ScXMLExportDDELinks { - ScXMLExport& rExport; + ScXMLExport& rExport; - sal_Bool CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue, + sal_Bool CellsEqual(const sal_Bool bPrevEmpty, const sal_Bool bPrevString, const String& sPrevValue, const double& fPrevValue, const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue); - void WriteCell(const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue, const sal_Int32 nRepeat); - void WriteTable(const sal_Int32 nPos); + void WriteCell(const sal_Bool bEmpty, const sal_Bool bString, const String& sValue, const double& fValue, const sal_Int32 nRepeat); + void WriteTable(const sal_Int32 nPos); public: ScXMLExportDDELinks(ScXMLExport& rExport); ~ScXMLExportDDELinks(); diff --git a/sc/source/filter/xml/XMLExportDataPilot.cxx b/sc/source/filter/xml/XMLExportDataPilot.cxx index 0bfdafc4d566..6cb026c42531 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.cxx +++ b/sc/source/filter/xml/XMLExportDataPilot.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 @@ -181,7 +181,7 @@ void ScXMLExportDataPilot::WriteDPFilter(const ScQueryParam& aQueryParam) if (nQueryEntryCount) { // There is never a target range in a data pilot. -/* if (!aQueryParam.bInplace) +/* if (!aQueryParam.bInplace) { ScAddress aTargetAddress(aQueryParam.nDestCol, aQueryParam.nDestRow, aQueryParam.nDestTab); rtl::OUString sAddress; diff --git a/sc/source/filter/xml/XMLExportDataPilot.hxx b/sc/source/filter/xml/XMLExportDataPilot.hxx index c1b9426f552d..2fa3187efa59 100644 --- a/sc/source/filter/xml/XMLExportDataPilot.hxx +++ b/sc/source/filter/xml/XMLExportDataPilot.hxx @@ -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 @@ -46,8 +46,8 @@ struct ScQueryParam; class ScXMLExportDataPilot { - ScXMLExport& rExport; - ScDocument* pDoc; + ScXMLExport& rExport; + ScDocument* pDoc; rtl::OUString getDPOperatorXML(const ScQueryOp aFilterOperator, const sal_Bool bUseRegularExpressions, const sal_Bool bIsString, const double dVal, const String& sVal) const; diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx b/sc/source/filter/xml/XMLExportDatabaseRanges.cxx index 530ea31e47c7..a8e6aa178809 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.cxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.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 @@ -423,7 +423,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COPYOUT) == 0) bCopyOutputData = ::cppu::any2bool(aSortProperties[i].Value); // no longer supported -/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISCASE) == 0) +/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISCASE) == 0) bIsCaseSensitive = ::cppu::any2bool(aSortProperties[i].Value);*/ else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_ISULIST) == 0) bIsUserListEnabled = ::cppu::any2bool(aSortProperties[i].Value); @@ -434,7 +434,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_SORTFLD) == 0) aSortProperties[i].Value >>= aSortFields; // no longer supported -/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLLOC) == 0) +/* else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLLOC) == 0) aSortProperties[i].Value >>= aCollatorLocale; else if (aSortProperties[i].Name.compareToAscii(SC_UNONAME_COLLALG) == 0) aSortProperties[i].Value >>= sCollatorAlgorithm;*/ @@ -451,8 +451,8 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, sOUCellAddress); } // no longer supported -// if (bIsCaseSensitive) -// rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); +// if (bIsCaseSensitive) +// rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); if (aSortFields[0].IsCaseSensitive) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); @@ -464,7 +464,7 @@ void ScXMLExportDatabaseRanges::WriteSortDescriptor(const uno::Sequence <beans:: } #endif // no longer supported -/* if (aCollatorLocale.Language.getLength()) +/* if (aCollatorLocale.Language.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_LANGUAGE, aCollatorLocale.Language); if (aCollatorLocale.Country.getLength()) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_COUNTRY, aCollatorLocale.Country); @@ -530,9 +530,9 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un if (nSubTotalFields > 0) { uno::Reference <beans::XPropertySet> xPropertySet (xSubTotalDescriptor, uno::UNO_QUERY); -// sal_Bool bEnableUserSortList = sal_False; -// sal_Bool bSortAscending = sal_True; -// sal_Int32 nUserSortListIndex = 0; +// sal_Bool bEnableUserSortList = sal_False; +// sal_Bool bSortAscending = sal_True; +// sal_Int32 nUserSortListIndex = 0; if (xPropertySet.is()) { if (!::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_BINDFMT))))) @@ -541,9 +541,9 @@ void ScXMLExportDatabaseRanges::WriteSubTotalDescriptor(const com::sun::star::un rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TRUE); if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ISCASE))))) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TRUE); -// bSortAscending = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SORTASCENDING)))); -// if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ENABLEUSERSORTLIST))))) -// xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERSORTLISTINDEX))) >>= nUserSortListIndex; +// bSortAscending = ::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SORTASCENDING)))); +// if (::cppu::any2bool(xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ENABLEUSERSORTLIST))))) +// xPropertySet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_USERSORTLISTINDEX))) >>= nUserSortListIndex; } SvXMLElementExport aElemSTRs(rExport, XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, sal_True, sal_True); rExport.CheckAttrList(); @@ -642,7 +642,7 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges(const com::sun::star::uno::R if (::cppu::any2bool(xPropertySetDatabaseRange->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_STRIPDAT))))) rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_FALSE); } - + uno::Reference< sheet::XSheetFilterDescriptor2 > xSheetFilterDescriptor( xDatabaseRange->getFilterDescriptor(), uno::UNO_QUERY ); uno::Sequence <beans::PropertyValue> aSortProperties(xDatabaseRange->getSortDescriptor()); @@ -655,7 +655,7 @@ void ScXMLExportDatabaseRanges::WriteDatabaseRanges(const com::sun::star::uno::R rExport.AddAttribute(XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_FALSE); // #98317#; there is no orientation on the filter -/* table::TableOrientation eFilterOrient(table::TableOrientation_ROWS); +/* table::TableOrientation eFilterOrient(table::TableOrientation_ROWS); if (::cppu::any2bool(xFilterProperties->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_ORIENT))))) eFilterOrient = table::TableOrientation_ROWS;*/ diff --git a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx index 31b27c4c87d2..e4d7813e8424 100644 --- a/sc/source/filter/xml/XMLExportDatabaseRanges.hxx +++ b/sc/source/filter/xml/XMLExportDatabaseRanges.hxx @@ -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,8 +43,8 @@ class ScMyEmptyDatabaseRangesContainer; class ScXMLExportDatabaseRanges { - ScXMLExport& rExport; - ScDocument* pDoc; + ScXMLExport& rExport; + ScDocument* pDoc; void WriteImportDescriptor(const com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aImportDescriptor); rtl::OUString getOperatorXML(const long aFilterOperator, const sal_Bool bUseRegularExpressions) const; diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index 57b2534ed6ad..d1594b355073 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.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 @@ -297,7 +297,7 @@ void ScMyMergedRangesContainer::Sort() sal_Bool ScMyAreaLink::Compare( const ScMyAreaLink& rAreaLink ) const { - return (GetRowCount() == rAreaLink.GetRowCount()) && + return (GetRowCount() == rAreaLink.GetRowCount()) && (sFilter == rAreaLink.sFilter) && (sFilterOptions == rAreaLink.sFilterOptions) && (sURL == rAreaLink.sURL) && @@ -733,7 +733,7 @@ void ScMyNotEmptyCellsIterator::SetMatrixCellData( ScMyCell& rMyCell ) rMyCell.nType = table::CellContentType_FORMULA; break; default: - rMyCell.nType = table::CellContentType_EMPTY; + rMyCell.nType = table::CellContentType_EMPTY; } if (rMyCell.nType == table::CellContentType_FORMULA) @@ -767,7 +767,7 @@ void ScMyNotEmptyCellsIterator::HasAnnotation(ScMyCell& aCell) // test - bypass the API // if (xCellRange.is()) - // aCell.xCell.set(xCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row)); + // aCell.xCell.set(xCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row)); } void ScMyNotEmptyCellsIterator::SetCurrentTable(const SCTAB nTable, @@ -817,7 +817,7 @@ void ScMyNotEmptyCellsIterator::SkipTable(SCTAB nSkip) { // Skip entries for a sheet that is copied instead of saving normally. // Cells (including aAnnotations) are handled separately in SetCurrentTable. - + if( pShapes ) pShapes->SkipTable(nSkip); if( pNoteShapes ) @@ -836,7 +836,7 @@ void ScMyNotEmptyCellsIterator::SkipTable(SCTAB nSkip) sal_Bool ScMyNotEmptyCellsIterator::GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles) { - table::CellAddress aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 ); + table::CellAddress aAddress( nCurrentTable, MAXCOL + 1, MAXROW + 1 ); UpdateAddress( aAddress ); if( pShapes ) diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index 1334e42c3e5c..317546dbb8d3 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -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 @@ -42,10 +42,10 @@ #include "detfunc.hxx" #include "detdata.hxx" -class ScHorizontalCellIterator; -struct ScMyCell; -class ScXMLExport; -class ScFormatRangeStyles; +class ScHorizontalCellIterator; +struct ScMyCell; +class ScXMLExport; +class ScFormatRangeStyles; class ScBaseCell; //============================================================================== @@ -53,47 +53,47 @@ class ScBaseCell; class ScMyIteratorBase { protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0; + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ) = 0; public: ScMyIteratorBase(); - virtual ~ScMyIteratorBase(); + virtual ~ScMyIteratorBase(); - virtual void SetCellData( ScMyCell& rMyCell ) = 0; - virtual void Sort() = 0; + virtual void SetCellData( ScMyCell& rMyCell ) = 0; + virtual void Sort() = 0; - virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual void UpdateAddress( ::com::sun::star::table::CellAddress& rCellAddress ); }; //============================================================================== struct ScMyShape { - ScAddress aAddress; - ScAddress aEndAddress; + ScAddress aAddress; + ScAddress aEndAddress; com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xShape; sal_Bool operator<(const ScMyShape& aShape) const; }; -typedef std::list<ScMyShape> ScMyShapeList; +typedef std::list<ScMyShape> ScMyShapeList; class ScMyShapesContainer : ScMyIteratorBase { private: - ScMyShapeList aShapeList; + ScMyShapeList aShapeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyShapesContainer(); - virtual ~ScMyShapesContainer(); + virtual ~ScMyShapesContainer(); using ScMyIteratorBase::UpdateAddress; - void AddNewShape(const ScMyShape& aShape); - sal_Bool HasShapes() { return !aShapeList.empty(); } - const ScMyShapeList* GetShapes() { return &aShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + void AddNewShape(const ScMyShape& aShape); + sal_Bool HasShapes() { return !aShapeList.empty(); } + const ScMyShapeList* GetShapes() { return &aShapeList; } + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -105,24 +105,24 @@ struct ScMyNoteShape sal_Bool operator<(const ScMyNoteShape& aNote) const; }; -typedef std::list<ScMyNoteShape> ScMyNoteShapeList; +typedef std::list<ScMyNoteShape> ScMyNoteShapeList; class ScMyNoteShapesContainer : ScMyIteratorBase { private: - ScMyNoteShapeList aNoteShapeList; + ScMyNoteShapeList aNoteShapeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyNoteShapesContainer(); - virtual ~ScMyNoteShapesContainer(); + virtual ~ScMyNoteShapesContainer(); using ScMyIteratorBase::UpdateAddress; - void AddNewNote(const ScMyNoteShape& aNote); - sal_Bool HasNotes() { return !aNoteShapeList.empty(); } - const ScMyNoteShapeList* GetNotes() { return &aNoteShapeList; } - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + void AddNewNote(const ScMyNoteShape& aNote); + sal_Bool HasNotes() { return !aNoteShapeList.empty(); } + const ScMyNoteShapeList* GetNotes() { return &aNoteShapeList; } + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -131,27 +131,27 @@ public: struct ScMyMergedRange { com::sun::star::table::CellRangeAddress aCellRange; - sal_Int32 nRows; - sal_Bool bIsFirst; - sal_Bool operator<(const ScMyMergedRange& aRange) const; + sal_Int32 nRows; + sal_Bool bIsFirst; + sal_Bool operator<(const ScMyMergedRange& aRange) const; }; -typedef std::list<ScMyMergedRange> ScMyMergedRangeList; +typedef std::list<ScMyMergedRange> ScMyMergedRangeList; class ScMyMergedRangesContainer : ScMyIteratorBase { private: - ScMyMergedRangeList aRangeList; + ScMyMergedRangeList aRangeList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyMergedRangesContainer(); - virtual ~ScMyMergedRangesContainer(); - void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange); + virtual ~ScMyMergedRangesContainer(); + void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); // + remove doublets + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); // + remove doublets void SkipTable(SCTAB nSkip); }; @@ -159,20 +159,20 @@ public: struct ScMyAreaLink { - ::rtl::OUString sFilter; - ::rtl::OUString sFilterOptions; - ::rtl::OUString sURL; - ::rtl::OUString sSourceStr; + ::rtl::OUString sFilter; + ::rtl::OUString sFilterOptions; + ::rtl::OUString sURL; + ::rtl::OUString sSourceStr; ::com::sun::star::table::CellRangeAddress aDestRange; - sal_Int32 nRefresh; + sal_Int32 nRefresh; - inline ScMyAreaLink() : nRefresh( 0 ) {} + inline ScMyAreaLink() : nRefresh( 0 ) {} - inline sal_Int32 GetColCount() const { return aDestRange.EndColumn - aDestRange.StartColumn + 1; } - inline sal_Int32 GetRowCount() const { return aDestRange.EndRow - aDestRange.StartRow + 1; } + inline sal_Int32 GetColCount() const { return aDestRange.EndColumn - aDestRange.StartColumn + 1; } + inline sal_Int32 GetRowCount() const { return aDestRange.EndRow - aDestRange.StartRow + 1; } - sal_Bool Compare( const ScMyAreaLink& rAreaLink ) const; - sal_Bool operator<(const ScMyAreaLink& rAreaLink ) const; + sal_Bool Compare( const ScMyAreaLink& rAreaLink ) const; + sal_Bool operator<(const ScMyAreaLink& rAreaLink ) const; }; typedef ::std::list< ScMyAreaLink > ScMyAreaLinkList; @@ -180,19 +180,19 @@ typedef ::std::list< ScMyAreaLink > ScMyAreaLinkList; class ScMyAreaLinksContainer : ScMyIteratorBase { private: - ScMyAreaLinkList aAreaLinkList; + ScMyAreaLinkList aAreaLinkList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyAreaLinksContainer(); - virtual ~ScMyAreaLinksContainer(); + virtual ~ScMyAreaLinksContainer(); - inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink ) + inline void AddNewAreaLink( const ScMyAreaLink& rAreaLink ) { aAreaLinkList.push_back( rAreaLink ); } using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -201,7 +201,7 @@ public: struct ScMyCellRangeAddress : com::sun::star::table::CellRangeAddress { ScMyCellRangeAddress(const com::sun::star::table::CellRangeAddress& rRange); - sal_Bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const; + sal_Bool operator<(const ScMyCellRangeAddress& rCellRangeAddress ) const; }; typedef std::list<ScMyCellRangeAddress> ScMyEmptyDatabaseRangeList; @@ -209,17 +209,17 @@ typedef std::list<ScMyCellRangeAddress> ScMyEmptyDatabaseRangeList; class ScMyEmptyDatabaseRangesContainer : ScMyIteratorBase { private: - ScMyEmptyDatabaseRangeList aDatabaseList; + ScMyEmptyDatabaseRangeList aDatabaseList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyEmptyDatabaseRangesContainer(); - virtual ~ScMyEmptyDatabaseRangesContainer(); - void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); + virtual ~ScMyEmptyDatabaseRangesContainer(); + void AddNewEmptyDatabaseRange(const com::sun::star::table::CellRangeAddress& aCellRangeAddress); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -227,10 +227,10 @@ public: struct ScMyDetectiveObj { - ::com::sun::star::table::CellAddress aPosition; - ::com::sun::star::table::CellRangeAddress aSourceRange; - ScDetectiveObjType eObjType; - sal_Bool bHasError; + ::com::sun::star::table::CellAddress aPosition; + ::com::sun::star::table::CellRangeAddress aSourceRange; + ScDetectiveObjType eObjType; + sal_Bool bHasError; sal_Bool operator<(const ScMyDetectiveObj& rDetObj) const; }; @@ -240,14 +240,14 @@ typedef ::std::vector< ScMyDetectiveObj > ScMyDetectiveObjVec; class ScMyDetectiveObjContainer : ScMyIteratorBase { private: - ScMyDetectiveObjList aDetectiveObjList; + ScMyDetectiveObjList aDetectiveObjList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyDetectiveObjContainer(); - virtual ~ScMyDetectiveObjContainer(); + virtual ~ScMyDetectiveObjContainer(); - void AddObject( + void AddObject( ScDetectiveObjType eObjType, const SCTAB nSheet, const ScAddress& rPosition, @@ -255,8 +255,8 @@ public: sal_Bool bHasError ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -264,9 +264,9 @@ public: struct ScMyDetectiveOp { - ::com::sun::star::table::CellAddress aPosition; - ScDetOpType eOpType; - sal_Int32 nIndex; + ::com::sun::star::table::CellAddress aPosition; + ScDetOpType eOpType; + sal_Int32 nIndex; sal_Bool operator<(const ScMyDetectiveOp& rDetOp) const; }; @@ -276,18 +276,18 @@ typedef ::std::vector< ScMyDetectiveOp > ScMyDetectiveOpVec; class ScMyDetectiveOpContainer : ScMyIteratorBase { private: - ScMyDetectiveOpList aDetectiveOpList; + ScMyDetectiveOpList aDetectiveOpList; protected: - virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); + virtual sal_Bool GetFirstAddress( ::com::sun::star::table::CellAddress& rCellAddress ); public: ScMyDetectiveOpContainer(); - virtual ~ScMyDetectiveOpContainer(); + virtual ~ScMyDetectiveOpContainer(); - void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex ); + void AddOperation( ScDetOpType eOpType, const ScAddress& rPosition, sal_uInt32 nIndex ); using ScMyIteratorBase::UpdateAddress; - virtual void SetCellData( ScMyCell& rMyCell ); - virtual void Sort(); + virtual void SetCellData( ScMyCell& rMyCell ); + virtual void Sort(); void SkipTable(SCTAB nSkip); }; @@ -296,49 +296,49 @@ public: // contains data to export for the current cell position struct ScMyCell { -// com::sun::star::uno::Reference<com::sun::star::table::XCell> xCell; -// com::sun::star::uno::Reference<com::sun::star::text::XText> xText; +// com::sun::star::uno::Reference<com::sun::star::table::XCell> xCell; +// com::sun::star::uno::Reference<com::sun::star::text::XText> xText; com::sun::star::uno::Reference<com::sun::star::sheet::XSheetAnnotation> xAnnotation; com::sun::star::uno::Reference<com::sun::star::drawing::XShape> xNoteShape; - com::sun::star::table::CellAddress aCellAddress; - com::sun::star::table::CellRangeAddress aMergeRange; - com::sun::star::table::CellRangeAddress aMatrixRange; + com::sun::star::table::CellAddress aCellAddress; + com::sun::star::table::CellRangeAddress aMergeRange; + com::sun::star::table::CellRangeAddress aMatrixRange; - rtl::OUString sStringValue; - rtl::OUString sAnnotationText; + rtl::OUString sStringValue; + rtl::OUString sAnnotationText; - ScMyAreaLink aAreaLink; - ScMyShapeList aShapeList; - ScMyDetectiveObjVec aDetectiveObjVec; - ScMyDetectiveOpVec aDetectiveOpVec; + ScMyAreaLink aAreaLink; + ScMyShapeList aShapeList; + ScMyDetectiveObjVec aDetectiveObjVec; + ScMyDetectiveOpVec aDetectiveOpVec; - double fValue; - sal_Int32 nValidationIndex; - sal_Int32 nStyleIndex; - sal_Int32 nNumberFormat; - com::sun::star::table::CellContentType nType; + double fValue; + sal_Int32 nValidationIndex; + sal_Int32 nStyleIndex; + sal_Int32 nNumberFormat; + com::sun::star::table::CellContentType nType; ScBaseCell* pBaseCell; - sal_Bool bIsAutoStyle; + sal_Bool bIsAutoStyle; - sal_Bool bHasShape; - sal_Bool bIsMergedBase; - sal_Bool bIsCovered; - sal_Bool bHasAreaLink; - sal_Bool bHasEmptyDatabase; - sal_Bool bHasDetectiveObj; - sal_Bool bHasDetectiveOp; + sal_Bool bHasShape; + sal_Bool bIsMergedBase; + sal_Bool bIsCovered; + sal_Bool bHasAreaLink; + sal_Bool bHasEmptyDatabase; + sal_Bool bHasDetectiveObj; + sal_Bool bHasDetectiveOp; - sal_Bool bIsEditCell; - sal_Bool bKnowWhetherIsEditCell; - sal_Bool bHasStringValue; - sal_Bool bHasDoubleValue; - sal_Bool bHasXText; + sal_Bool bIsEditCell; + sal_Bool bKnowWhetherIsEditCell; + sal_Bool bHasStringValue; + sal_Bool bHasDoubleValue; + sal_Bool bHasXText; - sal_Bool bIsMatrixBase; - sal_Bool bIsMatrixCovered; - sal_Bool bHasAnnotation; + sal_Bool bIsMatrixBase; + sal_Bool bIsMatrixCovered; + sal_Bool bHasAnnotation; ScMyCell(); ~ScMyCell(); @@ -349,7 +349,7 @@ struct ScMyCell struct ScMyExportAnnotation { com::sun::star::uno::Reference<com::sun::star::sheet::XSheetAnnotation> xAnnotation; - com::sun::star::table::CellAddress aCellAddress; + com::sun::star::table::CellAddress aCellAddress; sal_Bool operator<(const ScMyExportAnnotation& rAnno) const; }; @@ -359,55 +359,55 @@ class ScMyNotEmptyCellsIterator { com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet> xTable; com::sun::star::uno::Reference<com::sun::star::table::XCellRange> xCellRange; - com::sun::star::table::CellAddress aLastAddress; - ScMyExportAnnotationList aAnnotations; + com::sun::star::table::CellAddress aLastAddress; + ScMyExportAnnotationList aAnnotations; - ScMyShapesContainer* pShapes; - ScMyNoteShapesContainer* pNoteShapes; - ScMyEmptyDatabaseRangesContainer* pEmptyDatabaseRanges; - ScMyMergedRangesContainer* pMergedRanges; - ScMyAreaLinksContainer* pAreaLinks; - ScMyDetectiveObjContainer* pDetectiveObj; - ScMyDetectiveOpContainer* pDetectiveOp; + ScMyShapesContainer* pShapes; + ScMyNoteShapesContainer* pNoteShapes; + ScMyEmptyDatabaseRangesContainer* pEmptyDatabaseRanges; + ScMyMergedRangesContainer* pMergedRanges; + ScMyAreaLinksContainer* pAreaLinks; + ScMyDetectiveObjContainer* pDetectiveObj; + ScMyDetectiveOpContainer* pDetectiveOp; - ScXMLExport& rExport; - ScHorizontalCellIterator* pCellItr; + ScXMLExport& rExport; + ScHorizontalCellIterator* pCellItr; - SCCOL nCellCol; - SCROW nCellRow; - SCTAB nCurrentTable; + SCCOL nCellCol; + SCROW nCellRow; + SCTAB nCurrentTable; - void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress ); - void SetCellData( ScMyCell& rMyCell, ::com::sun::star::table::CellAddress& rAddress ); + void UpdateAddress( ::com::sun::star::table::CellAddress& rAddress ); + void SetCellData( ScMyCell& rMyCell, ::com::sun::star::table::CellAddress& rAddress ); - void SetMatrixCellData( ScMyCell& rMyCell ); - void HasAnnotation( ScMyCell& aCell ); + void SetMatrixCellData( ScMyCell& rMyCell ); + void HasAnnotation( ScMyCell& aCell ); public: ScMyNotEmptyCellsIterator(ScXMLExport& rExport); ~ScMyNotEmptyCellsIterator(); - void Clear(); + void Clear(); - inline void SetShapes(ScMyShapesContainer* pNewShapes) + inline void SetShapes(ScMyShapesContainer* pNewShapes) { pShapes = pNewShapes; } - inline void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes) + inline void SetNoteShapes(ScMyNoteShapesContainer* pNewNoteShapes) { pNoteShapes = pNewNoteShapes; } - inline void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges) + inline void SetEmptyDatabaseRanges(ScMyEmptyDatabaseRangesContainer* pNewEmptyDatabaseRanges) { pEmptyDatabaseRanges = pNewEmptyDatabaseRanges; } - inline void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges) + inline void SetMergedRanges(ScMyMergedRangesContainer* pNewMergedRanges) { pMergedRanges = pNewMergedRanges; } - inline void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks) + inline void SetAreaLinks(ScMyAreaLinksContainer* pNewAreaLinks) { pAreaLinks = pNewAreaLinks; } - inline void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj) + inline void SetDetectiveObj(ScMyDetectiveObjContainer* pNewDetectiveObj) { pDetectiveObj = pNewDetectiveObj; } - inline void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp) + inline void SetDetectiveOp(ScMyDetectiveOpContainer* pNewDetectiveOp) { pDetectiveOp = pNewDetectiveOp; } - void SetCurrentTable(const SCTAB nTable, + void SetCurrentTable(const SCTAB nTable, com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& rxTable); void SkipTable(SCTAB nSkip); - sal_Bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); + sal_Bool GetNext(ScMyCell& aCell, ScFormatRangeStyles* pCellStyles); }; #endif diff --git a/sc/source/filter/xml/XMLExportSharedData.cxx b/sc/source/filter/xml/XMLExportSharedData.cxx index a3e4d3ae80b5..c3de04075326 100644 --- a/sc/source/filter/xml/XMLExportSharedData.cxx +++ b/sc/source/filter/xml/XMLExportSharedData.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/xml/XMLExportSharedData.hxx b/sc/source/filter/xml/XMLExportSharedData.hxx index 7337cbbc27e7..48497b530979 100644 --- a/sc/source/filter/xml/XMLExportSharedData.hxx +++ b/sc/source/filter/xml/XMLExportSharedData.hxx @@ -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 @@ -54,14 +54,14 @@ class ScMyNoteShapesContainer; class ScMySharedData { - std::vector<sal_Int32> nLastColumns; - std::vector<sal_Int32> nLastRows; - ScMyTableShapes* pTableShapes; - ScMyDrawPages* pDrawPages; - ScMyShapesContainer* pShapesContainer; - ScMyDetectiveObjContainer* pDetectiveObjContainer; + std::vector<sal_Int32> nLastColumns; + std::vector<sal_Int32> nLastRows; + ScMyTableShapes* pTableShapes; + ScMyDrawPages* pDrawPages; + ScMyShapesContainer* pShapesContainer; + ScMyDetectiveObjContainer* pDetectiveObjContainer; ScMyNoteShapesContainer* pNoteShapes; - sal_Int32 nTableCount; + sal_Int32 nTableCount; public: ScMySharedData(const sal_Int32 nTableCount); ~ScMySharedData(); diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index 79c0d24eb1f8..5e20443e65fc 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.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 @@ -192,9 +192,9 @@ sal_Bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny, rtl::OUString ScMyValidationsContainer::GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation) { - /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY - * ever be changed, adapt the conditional call of - * MarkUsedExternalReferences() in + /* ATTENTION! Should the condition to not write sheet::ValidationType_ANY + * ever be changed, adapt the conditional call of + * MarkUsedExternalReferences() in * ScTableValidationObj::ScTableValidationObj() accordingly! */ rtl::OUString sCondition; if (aValidation.aValidationType != sheet::ValidationType_ANY) diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 405dedf9f26b..a1070b2c1739 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -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,73 +43,73 @@ class ScXMLExport; struct ScMyValidation { - rtl::OUString sName; - rtl::OUString sErrorMessage; - rtl::OUString sErrorTitle; - rtl::OUString sImputMessage; - rtl::OUString sImputTitle; - rtl::OUString sFormula1; - rtl::OUString sFormula2; - com::sun::star::table::CellAddress aBaseCell; - com::sun::star::sheet::ValidationAlertStyle aAlertStyle; - com::sun::star::sheet::ValidationType aValidationType; - com::sun::star::sheet::ConditionOperator aOperator; + rtl::OUString sName; + rtl::OUString sErrorMessage; + rtl::OUString sErrorTitle; + rtl::OUString sImputMessage; + rtl::OUString sImputTitle; + rtl::OUString sFormula1; + rtl::OUString sFormula2; + com::sun::star::table::CellAddress aBaseCell; + com::sun::star::sheet::ValidationAlertStyle aAlertStyle; + com::sun::star::sheet::ValidationType aValidationType; + com::sun::star::sheet::ConditionOperator aOperator; sal_Int16 nShowList; - sal_Bool bShowErrorMessage; - sal_Bool bShowImputMessage; - sal_Bool bIgnoreBlanks; + sal_Bool bShowErrorMessage; + sal_Bool bShowImputMessage; + sal_Bool bIgnoreBlanks; ScMyValidation(); ~ScMyValidation(); - sal_Bool IsEqual(const ScMyValidation& aVal) const; + sal_Bool IsEqual(const ScMyValidation& aVal) const; }; -typedef std::vector<ScMyValidation> ScMyValidationVec; +typedef std::vector<ScMyValidation> ScMyValidationVec; class ScMyValidationsContainer { private: - ScMyValidationVec aValidationVec; - const rtl::OUString sEmptyString; - const rtl::OUString sERRALSTY; - const rtl::OUString sIGNOREBL; + ScMyValidationVec aValidationVec; + const rtl::OUString sEmptyString; + const rtl::OUString sERRALSTY; + const rtl::OUString sIGNOREBL; const rtl::OUString sSHOWLIST; - const rtl::OUString sTYPE; - const rtl::OUString sSHOWINP; - const rtl::OUString sSHOWERR; - const rtl::OUString sINPTITLE; - const rtl::OUString sINPMESS; - const rtl::OUString sERRTITLE; - const rtl::OUString sERRMESS; - const rtl::OUString sOnError; - const rtl::OUString sEventType; - const rtl::OUString sStarBasic; - const rtl::OUString sScript; - const rtl::OUString sLibrary; - const rtl::OUString sMacroName; + const rtl::OUString sTYPE; + const rtl::OUString sSHOWINP; + const rtl::OUString sSHOWERR; + const rtl::OUString sINPTITLE; + const rtl::OUString sINPMESS; + const rtl::OUString sERRTITLE; + const rtl::OUString sERRMESS; + const rtl::OUString sOnError; + const rtl::OUString sEventType; + const rtl::OUString sStarBasic; + const rtl::OUString sScript; + const rtl::OUString sLibrary; + const rtl::OUString sMacroName; public: ScMyValidationsContainer(); ~ScMyValidationsContainer(); - sal_Bool AddValidation(const com::sun::star::uno::Any& aAny, + sal_Bool AddValidation(const com::sun::star::uno::Any& aAny, sal_Int32& nValidationIndex); - rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); - rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); - void WriteMessage(ScXMLExport& rExport, + rtl::OUString GetCondition(ScXMLExport& rExport, const ScMyValidation& aValidation); + rtl::OUString GetBaseCellAddress(ScDocument* pDoc, const com::sun::star::table::CellAddress& aCell); + void WriteMessage(ScXMLExport& rExport, const rtl::OUString& sTitle, const rtl::OUString& sMessage, const sal_Bool bShowMessage, const sal_Bool bIsHelpMessage); - void WriteValidations(ScXMLExport& rExport); - const rtl::OUString& GetValidationName(const sal_Int32 nIndex); + void WriteValidations(ScXMLExport& rExport); + const rtl::OUString& GetValidationName(const sal_Int32 nIndex); }; //============================================================================== struct ScMyDefaultStyle { - sal_Int32 nIndex; - sal_Int32 nRepeat; - sal_Bool bIsAutoStyle; + sal_Int32 nIndex; + sal_Int32 nRepeat; + sal_Bool bIsAutoStyle; ScMyDefaultStyle() : nIndex(-1), nRepeat(1), bIsAutoStyle(sal_True) {} @@ -145,12 +145,12 @@ public: struct ScMyRowFormatRange { - sal_Int32 nStartColumn; - sal_Int32 nRepeatColumns; - sal_Int32 nRepeatRows; - sal_Int32 nIndex; - sal_Int32 nValidationIndex; - sal_Bool bIsAutoStyle; + sal_Int32 nStartColumn; + sal_Int32 nRepeatColumns; + sal_Int32 nRepeatRows; + sal_Int32 nIndex; + sal_Int32 nValidationIndex; + sal_Bool bIsAutoStyle; ScMyRowFormatRange(); sal_Bool operator<(const ScMyRowFormatRange& rRange) const; @@ -160,10 +160,10 @@ typedef std::list<ScMyRowFormatRange> ScMyRowFormatRangesList; class ScRowFormatRanges { - ScMyRowFormatRangesList aRowFormatRanges; - const ScMyDefaultStyleList* pRowDefaults; - const ScMyDefaultStyleList* pColDefaults; - sal_uInt32 nSize; + ScMyRowFormatRangesList aRowFormatRanges; + const ScMyDefaultStyleList* pRowDefaults; + const ScMyDefaultStyleList* pColDefaults; + sal_uInt32 nSize; void AddRange(const sal_Int32 nPrevStartCol, const sal_Int32 nRepeat, const sal_Int32 nPrevIndex, const sal_Bool bPrevAutoStyle, const ScMyRowFormatRange& rFormatRange); @@ -183,30 +183,30 @@ public: void Sort(); }; -typedef std::vector<rtl::OUString*> ScMyOUStringVec; +typedef std::vector<rtl::OUString*> ScMyOUStringVec; struct ScMyFormatRange { com::sun::star::table::CellRangeAddress aRangeAddress; - sal_Int32 nStyleNameIndex; - sal_Int32 nValidationIndex; - sal_Int32 nNumberFormat; - sal_Bool bIsAutoStyle; + sal_Int32 nStyleNameIndex; + sal_Int32 nValidationIndex; + sal_Int32 nNumberFormat; + sal_Bool bIsAutoStyle; ScMyFormatRange(); sal_Bool operator< (const ScMyFormatRange& rRange) const; }; -typedef std::list<ScMyFormatRange> ScMyFormatRangeAddresses; -typedef std::vector<ScMyFormatRangeAddresses*> ScMyFormatRangeListVec; +typedef std::list<ScMyFormatRange> ScMyFormatRangeAddresses; +typedef std::vector<ScMyFormatRangeAddresses*> ScMyFormatRangeListVec; class ScFormatRangeStyles { - ScMyFormatRangeListVec aTables; - ScMyOUStringVec aStyleNames; - ScMyOUStringVec aAutoStyleNames; - const ScMyDefaultStyleList* pRowDefaults; - const ScMyDefaultStyleList* pColDefaults; + ScMyFormatRangeListVec aTables; + ScMyOUStringVec aStyleNames; + ScMyOUStringVec aAutoStyleNames; + const ScMyDefaultStyleList* pRowDefaults; + const ScMyDefaultStyleList* pColDefaults; public: ScFormatRangeStyles(); @@ -233,7 +233,7 @@ public: class ScColumnRowStylesBase { - ScMyOUStringVec aStyleNames; + ScMyOUStringVec aStyleNames; public: ScColumnRowStylesBase(); @@ -248,19 +248,19 @@ public: struct ScColumnStyle { - sal_Int32 nIndex; - sal_Bool bIsVisible; + sal_Int32 nIndex; + sal_Bool bIsVisible; ScColumnStyle() : nIndex(-1), bIsVisible(sal_True) {} }; -typedef std::vector<ScColumnStyle> ScMyColumnStyleVec; -typedef std::vector<ScMyColumnStyleVec> ScMyColumnVectorVec; +typedef std::vector<ScColumnStyle> ScMyColumnStyleVec; +typedef std::vector<ScMyColumnStyleVec> ScMyColumnVectorVec; class ScColumnStyles : public ScColumnRowStylesBase { - ScMyColumnVectorVec aTables; + ScMyColumnVectorVec aTables; public: ScColumnStyles(); @@ -273,12 +273,12 @@ public: virtual rtl::OUString* GetStyleName(const sal_Int32 nTable, const sal_Int32 nField); }; -typedef std::vector<sal_Int32> ScMysalInt32Vec; -typedef std::vector<ScMysalInt32Vec> ScMyRowVectorVec; +typedef std::vector<sal_Int32> ScMysalInt32Vec; +typedef std::vector<ScMysalInt32Vec> ScMyRowVectorVec; class ScRowStyles : public ScColumnRowStylesBase { - ScMyRowVectorVec aTables; + ScMyRowVectorVec aTables; public: ScRowStyles(); diff --git a/sc/source/filter/xml/XMLStylesImportHelper.cxx b/sc/source/filter/xml/XMLStylesImportHelper.cxx index 3a4ea8384539..83f8632b377e 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.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/xml/XMLStylesImportHelper.hxx b/sc/source/filter/xml/XMLStylesImportHelper.hxx index 2c39d4eacf12..526959ff9970 100644 --- a/sc/source/filter/xml/XMLStylesImportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesImportHelper.hxx @@ -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 @@ -44,8 +44,8 @@ class ScXMLImport; struct ScMyStyleNumberFormat { - rtl::OUString sStyleName; - sal_Int32 nNumberFormat; + rtl::OUString sStyleName; + sal_Int32 nNumberFormat; ScMyStyleNumberFormat() : nNumberFormat(-1) {} ScMyStyleNumberFormat(const rtl::OUString& rStyleName) : @@ -62,11 +62,11 @@ struct LessStyleNumberFormat } }; -typedef std::set< ScMyStyleNumberFormat, LessStyleNumberFormat > ScMyStyleNumberFormatSet; +typedef std::set< ScMyStyleNumberFormat, LessStyleNumberFormat > ScMyStyleNumberFormatSet; class ScMyStyleNumberFormats { - ScMyStyleNumberFormatSet aSet; + ScMyStyleNumberFormatSet aSet; public: void AddStyleNumberFormat(const rtl::OUString& rStyleName, const sal_Int32 nNumberFormat); @@ -75,7 +75,7 @@ public: struct ScMyCurrencyStyle { - rtl::OUString sCurrency; + rtl::OUString sCurrency; ::boost::shared_ptr<ScSimpleRangeList> mpRanges; ScMyCurrencyStyle() : @@ -92,7 +92,7 @@ struct LessCurrencyStyle } }; -typedef std::set<ScMyCurrencyStyle, LessCurrencyStyle> ScMyCurrencyStylesSet; +typedef std::set<ScMyCurrencyStyle, LessCurrencyStyle> ScMyCurrencyStylesSet; class ScMyStyleRanges : public SvRefBase { @@ -103,7 +103,7 @@ class ScMyStyleRanges : public SvRefBase ::boost::shared_ptr<ScSimpleRangeList> mpPercentList; ::boost::shared_ptr<ScSimpleRangeList> mpLogicalList; ::boost::shared_ptr<ScSimpleRangeList> mpUndefinedList; - ScMyCurrencyStylesSet* pCurrencyList; + ScMyCurrencyStylesSet* pCurrencyList; void AddRange(const ScRange& rRange, ScRangeList* pList, const rtl::OUString* pStyleName, const sal_Int16 nType, @@ -137,8 +137,8 @@ SV_DECL_IMPL_REF( ScMyStyleRanges ); struct ScMyStyle { - rtl::OUString sStyleName; - ScMyStyleRangesRef xRanges; + rtl::OUString sStyleName; + ScMyStyleRangesRef xRanges; ScMyStyle() : xRanges(new ScMyStyleRanges()) {} ~ScMyStyle() {} @@ -152,24 +152,24 @@ struct LessStyle } }; -typedef std::set<ScMyStyle, LessStyle> ScMyStylesSet; +typedef std::set<ScMyStyle, LessStyle> ScMyStylesSet; typedef std::vector<ScMyStylesSet::iterator> ScMyStyles; class ScMyStylesImportHelper { - ScMyStylesSet aCellStyles; - ScMyStyles aColDefaultStyles; - ScMyStylesSet::iterator aRowDefaultStyle; - ScXMLImport& rImport; - rtl::OUString* pStyleName; - rtl::OUString* pPrevStyleName; - rtl::OUString* pCurrency; - rtl::OUString* pPrevCurrency; - ScRange aPrevRange; - sal_uInt32 nMaxRanges; - sal_Int16 nCellType; - sal_Int16 nPrevCellType; - sal_Bool bPrevRangeAdded; + ScMyStylesSet aCellStyles; + ScMyStyles aColDefaultStyles; + ScMyStylesSet::iterator aRowDefaultStyle; + ScXMLImport& rImport; + rtl::OUString* pStyleName; + rtl::OUString* pPrevStyleName; + rtl::OUString* pCurrency; + rtl::OUString* pPrevCurrency; + ScRange aPrevRange; + sal_uInt32 nMaxRanges; + sal_Int16 nCellType; + sal_Int16 nPrevCellType; + sal_Bool bPrevRangeAdded; void ResetAttributes(); ScMyStylesSet::iterator GetIterator(const rtl::OUString* pStyleName); diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx index ec79d21aba40..80abe62b92cb 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.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/xml/XMLTableHeaderFooterContext.hxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx index eecedc746b3e..8d3b2169f233 100644 --- a/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx +++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.hxx @@ -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,19 +49,19 @@ class XMLTableHeaderFooterContext: public SvXMLImportContext ::com::sun::star::uno::Reference < ::com::sun::star::sheet::XHeaderFooterContent > xHeaderFooterContent; - const ::rtl::OUString sOn; - const ::rtl::OUString sShareContent; - const ::rtl::OUString sContent; - const ::rtl::OUString sContentLeft; - const ::rtl::OUString sEmpty; - rtl::OUString sCont; - - sal_Bool bDisplay; - sal_Bool bInsertContent; - sal_Bool bLeft; - sal_Bool bContainsLeft; - sal_Bool bContainsRight; - sal_Bool bContainsCenter; + const ::rtl::OUString sOn; + const ::rtl::OUString sShareContent; + const ::rtl::OUString sContent; + const ::rtl::OUString sContentLeft; + const ::rtl::OUString sEmpty; + rtl::OUString sCont; + + sal_Bool bDisplay; + sal_Bool bInsertContent; + sal_Bool bLeft; + sal_Bool bContainsLeft; + sal_Bool bContainsRight; + sal_Bool bContainsCenter; public: TYPEINFO(); diff --git a/sc/source/filter/xml/XMLTableMasterPageExport.cxx b/sc/source/filter/xml/XMLTableMasterPageExport.cxx index aeb0444ae2a5..7e555b5d39aa 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.cxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.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/xml/XMLTableMasterPageExport.hxx b/sc/source/filter/xml/XMLTableMasterPageExport.hxx index 33327ee3b90d..f6d879743c79 100644 --- a/sc/source/filter/xml/XMLTableMasterPageExport.hxx +++ b/sc/source/filter/xml/XMLTableMasterPageExport.hxx @@ -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 @@ -63,6 +63,6 @@ public: }; -#endif // _XMLOFF_XMLTABLEMASTERPAGEEXPORT_HXX +#endif // _XMLOFF_XMLTABLEMASTERPAGEEXPORT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx b/sc/source/filter/xml/XMLTableShapeImportHelper.cxx index 9ddc5ede06a5..320681e8e132 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.cxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.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/xml/XMLTableShapeImportHelper.hxx b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx index fb40daa82756..6bb9b9253549 100644 --- a/sc/source/filter/xml/XMLTableShapeImportHelper.hxx +++ b/sc/source/filter/xml/XMLTableShapeImportHelper.hxx @@ -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/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx index 23e72c369267..696b102da1f5 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.cxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.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 @@ -247,7 +247,7 @@ void ScMyShapeResizer::ResizeShapes() uno::Reference<beans::XPropertySet> xShapeProps (aItr->xShape, uno::UNO_QUERY); if(xShapeProps.is()) { - uno::Reference<drawing::XShape> xStartShape(xShapeProps->getPropertyValue( sStartShape ), uno::UNO_QUERY); + uno::Reference<drawing::XShape> xStartShape(xShapeProps->getPropertyValue( sStartShape ), uno::UNO_QUERY); uno::Reference<drawing::XShape> xEndShape(xShapeProps->getPropertyValue( sEndShape ), uno::UNO_QUERY); if (!xStartShape.is() && !xEndShape.is()) { @@ -378,8 +378,8 @@ void ScMyShapeResizer::ResizeShapes() aItr = aShapes.erase(aItr); } rImport.UnlockSolarMutex(); -// if (pCollection) -// pDoc->SetChartListenerCollection(pCollection); +// if (pCollection) +// pDoc->SetChartListenerCollection(pCollection); } } } diff --git a/sc/source/filter/xml/XMLTableShapeResizer.hxx b/sc/source/filter/xml/XMLTableShapeResizer.hxx index 6372f50be673..618b0a35c3fb 100644 --- a/sc/source/filter/xml/XMLTableShapeResizer.hxx +++ b/sc/source/filter/xml/XMLTableShapeResizer.hxx @@ -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,8 +43,8 @@ struct ScMyToResizeShape { com::sun::star::uno::Reference <com::sun::star::drawing::XShape> xShape; rtl::OUString* pRangeList; - com::sun::star::table::CellAddress aEndCell; - com::sun::star::table::CellAddress aStartCell; + com::sun::star::table::CellAddress aEndCell; + com::sun::star::table::CellAddress aStartCell; sal_Int32 nEndX; sal_Int32 nEndY; @@ -55,9 +55,9 @@ typedef std::list<ScMyToResizeShape> ScMyToResizeShapes; class ScMyShapeResizer { - ScXMLImport& rImport; - ScMyToResizeShapes aShapes; - ScChartListenerCollection* pCollection; + ScXMLImport& rImport; + ScMyToResizeShapes aShapes; + ScChartListenerCollection* pCollection; sal_Bool IsOLE(com::sun::star::uno::Reference< com::sun::star::drawing::XShape >& rShape) const; void CreateChartListener(ScDocument* pDoc, @@ -71,12 +71,12 @@ public: ScMyShapeResizer(ScXMLImport& rImport); ~ScMyShapeResizer(); - void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, + void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, rtl::OUString* pRangeList, com::sun::star::table::CellAddress& rStartAddress, com::sun::star::table::CellAddress& rEndAddress, sal_Int32 nEndX, sal_Int32 nEndY); - void ResizeShapes(); + void ResizeShapes(); }; #endif diff --git a/sc/source/filter/xml/XMLTableShapesContext.cxx b/sc/source/filter/xml/XMLTableShapesContext.cxx index 2421bb785870..dd26e2d1e01b 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.cxx +++ b/sc/source/filter/xml/XMLTableShapesContext.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/xml/XMLTableShapesContext.hxx b/sc/source/filter/xml/XMLTableShapesContext.hxx index 168e7538ed0f..a8000a8f6efa 100644 --- a/sc/source/filter/xml/XMLTableShapesContext.hxx +++ b/sc/source/filter/xml/XMLTableShapesContext.hxx @@ -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/xml/XMLTableSourceContext.cxx b/sc/source/filter/xml/XMLTableSourceContext.cxx index 9cc6d9a7090a..090e5415c7f7 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.cxx +++ b/sc/source/filter/xml/XMLTableSourceContext.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/xml/XMLTableSourceContext.hxx b/sc/source/filter/xml/XMLTableSourceContext.hxx index 00985a721bb1..f5fe4eb30dc2 100644 --- a/sc/source/filter/xml/XMLTableSourceContext.hxx +++ b/sc/source/filter/xml/XMLTableSourceContext.hxx @@ -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 @@ -36,12 +36,12 @@ class ScXMLImport; class ScXMLTableSourceContext : public SvXMLImportContext { - rtl::OUString sLink; - rtl::OUString sTableName; - rtl::OUString sFilterName; - rtl::OUString sFilterOptions; - sal_Int32 nRefresh; - com::sun::star::sheet::SheetLinkMode nMode; + rtl::OUString sLink; + rtl::OUString sTableName; + rtl::OUString sFilterName; + rtl::OUString sFilterOptions; + sal_Int32 nRefresh; + com::sun::star::sheet::SheetLinkMode nMode; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLTextPContext.cxx b/sc/source/filter/xml/XMLTextPContext.cxx index 724a87a65626..661296516ddd 100644 --- a/sc/source/filter/xml/XMLTextPContext.cxx +++ b/sc/source/filter/xml/XMLTextPContext.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 @@ -150,7 +150,7 @@ SvXMLImportContext *ScXMLTextPContext::CreateChildContext( USHORT nTempPrefix, sSetString = sSimpleContent; sal_Unicode cNonSpace(0); - + sal_Int32 nLength = sSetString.getLength(); if ( nLength > 0 ) { diff --git a/sc/source/filter/xml/XMLTextPContext.hxx b/sc/source/filter/xml/XMLTextPContext.hxx index e2f3e9446b2e..9b92599b4254 100644 --- a/sc/source/filter/xml/XMLTextPContext.hxx +++ b/sc/source/filter/xml/XMLTextPContext.hxx @@ -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 @@ -38,13 +38,13 @@ class ScXMLTableRowCellContext; class ScXMLTextPContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - SvXMLImportContext* pTextPContext; - ScXMLTableRowCellContext* pCellContext; - rtl::OUString sLName; + SvXMLImportContext* pTextPContext; + ScXMLTableRowCellContext* pCellContext; + rtl::OUString sLName; rtl::OUString sSimpleContent; // copy of the first Character call's argument rtl::OUStringBuffer* pContentBuffer; // used if there's more than one string - USHORT nPrefix; - sal_Bool bIsOwn; + USHORT nPrefix; + sal_Bool bIsOwn; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.cxx b/sc/source/filter/xml/XMLTrackedChangesContext.cxx index 86a5f4a88a81..40ae2111630e 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.cxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.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 @@ -54,12 +54,12 @@ using rtl::OUString; class ScXMLChangeInfoContext : public SvXMLImportContext { - ScMyActionInfo aInfo; + ScMyActionInfo aInfo; ::rtl::OUStringBuffer sAuthorBuffer; ::rtl::OUStringBuffer sDateTimeBuffer; ::rtl::OUStringBuffer sCommentBuffer; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - sal_uInt32 nParagraphCount; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + sal_uInt32 nParagraphCount; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -83,7 +83,7 @@ public: class ScXMLBigRangeContext : public SvXMLImportContext { - ScBigRange& rBigRange; + ScBigRange& rBigRange; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -107,22 +107,22 @@ public: class ScXMLCellContentDeletionContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; + rtl::OUString sFormulaAddress; + rtl::OUString sFormula; rtl::OUString sFormulaNmsp; rtl::OUString sInputString; - ScBigRange aBigRange; - double fValue; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScBaseCell* pCell; - sal_uInt32 nID; - sal_Int32 nMatrixCols; - sal_Int32 nMatrixRows; + ScBigRange aBigRange; + double fValue; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScBaseCell* pCell; + sal_uInt32 nID; + sal_Int32 nMatrixCols; + sal_Int32 nMatrixRows; formula::FormulaGrammar::Grammar eGrammar; - sal_uInt16 nType; - sal_uInt8 nMatrixFlag; - sal_Bool bBigRange; - sal_Bool bContainsCell; + sal_uInt16 nType; + sal_uInt8 nMatrixFlag; + sal_Bool bBigRange; + sal_Bool bContainsCell; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -146,7 +146,7 @@ public: class ScXMLDependenceContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -170,7 +170,7 @@ public: class ScXMLDependingsContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -194,7 +194,7 @@ public: class ScXMLChangeDeletionContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -218,7 +218,7 @@ public: class ScXMLDeletionsContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -245,11 +245,11 @@ class ScXMLChangeCellContext; class ScXMLChangeTextPContext : public SvXMLImportContext { ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList> xAttrList; - rtl::OUString sLName; - rtl::OUStringBuffer sText; - ScXMLChangeCellContext* pChangeCellContext; - SvXMLImportContext* pTextPContext; - USHORT nPrefix; + rtl::OUString sLName; + rtl::OUStringBuffer sText; + ScXMLChangeCellContext* pChangeCellContext; + SvXMLImportContext* pTextPContext; + USHORT nPrefix; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -278,19 +278,19 @@ public: class ScXMLChangeCellContext : public SvXMLImportContext { - rtl::OUString sText; + rtl::OUString sText; rtl::OUString& rInputString; - ScBaseCell*& rOldCell; - ScEditEngineTextObj* pEditTextObj; - double& rDateTimeValue; - double fValue; - sal_uInt16& rType; + ScBaseCell*& rOldCell; + ScEditEngineTextObj* pEditTextObj; + double& rDateTimeValue; + double fValue; + sal_uInt16& rType; // sal_Bool bIsMatrix; // sal_Bool bIsCoveredMatrix; - sal_Bool bEmpty; - sal_Bool bFirstParagraph; - sal_Bool bString; - sal_Bool bFormula; + sal_Bool bEmpty; + sal_Bool bFirstParagraph; + sal_Bool bString; + sal_Bool bFormula; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -322,19 +322,19 @@ public: class ScXMLPreviousContext : public SvXMLImportContext { - rtl::OUString sFormulaAddress; - rtl::OUString sFormula; + rtl::OUString sFormulaAddress; + rtl::OUString sFormula; rtl::OUString sFormulaNmsp; rtl::OUString sInputString; - double fValue; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScBaseCell* pOldCell; - sal_uInt32 nID; - sal_Int32 nMatrixCols; - sal_Int32 nMatrixRows; + double fValue; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScBaseCell* pOldCell; + sal_uInt32 nID; + sal_Int32 nMatrixCols; + sal_Int32 nMatrixRows; formula::FormulaGrammar::Grammar eGrammar; - sal_uInt16 nType; - sal_uInt8 nMatrixFlag; + sal_uInt16 nType; + sal_uInt8 nMatrixFlag; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -358,8 +358,8 @@ public: class ScXMLContentChangeContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScBigRange aBigRange; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScBigRange aBigRange; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -382,7 +382,7 @@ public: class ScXMLInsertionContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -405,7 +405,7 @@ public: class ScXMLInsertionCutOffContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -428,7 +428,7 @@ public: class ScXMLMovementCutOffContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -451,7 +451,7 @@ public: class ScXMLCutOffsContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -474,7 +474,7 @@ public: class ScXMLDeletionContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -497,9 +497,9 @@ public: class ScXMLMovementContext : public SvXMLImportContext { - ScBigRange aSourceRange; - ScBigRange aTargetRange; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScBigRange aSourceRange; + ScBigRange aTargetRange; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -522,7 +522,7 @@ public: class ScXMLRejectionContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/XMLTrackedChangesContext.hxx b/sc/source/filter/xml/XMLTrackedChangesContext.hxx index 82753f25e5c0..14b418356545 100644 --- a/sc/source/filter/xml/XMLTrackedChangesContext.hxx +++ b/sc/source/filter/xml/XMLTrackedChangesContext.hxx @@ -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 @@ -40,7 +40,7 @@ class ScEditEngineTextObj; class ScXMLTrackedChangesContext : public SvXMLImportContext { - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/sheetdata.cxx b/sc/source/filter/xml/sheetdata.cxx index 9f35e99f5326..e81ddae8d00a 100644 --- a/sc/source/filter/xml/sheetdata.cxx +++ b/sc/source/filter/xml/sheetdata.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/xml/xmlannoi.cxx b/sc/source/filter/xml/xmlannoi.cxx index 6fcb70393eec..ca282395393e 100644 --- a/sc/source/filter/xml/xmlannoi.cxx +++ b/sc/source/filter/xml/xmlannoi.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 @@ -159,7 +159,7 @@ SvXMLImportContext *ScXMLAnnotationContext::CreateChildContext( USHORT nPrefix, pContext = new ScXMLContentContext(GetScImport(), nPrefix, rLName, xAttrList, maCreateDateStringBuffer); } -/* else if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_P) ) +/* else if ((nPrefix == XML_NAMESPACE_TEXT) && IsXMLToken(rLName, XML_P) ) { if (!bHasTextP) { diff --git a/sc/source/filter/xml/xmlannoi.hxx b/sc/source/filter/xml/xmlannoi.hxx index de0f61e9820e..97913a91b9fd 100644 --- a/sc/source/filter/xml/xmlannoi.hxx +++ b/sc/source/filter/xml/xmlannoi.hxx @@ -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/xml/xmlbodyi.cxx b/sc/source/filter/xml/xmlbodyi.cxx index 7f92f82aa1a6..d768ad47c276 100644 --- a/sc/source/filter/xml/xmlbodyi.cxx +++ b/sc/source/filter/xml/xmlbodyi.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 @@ -157,18 +157,18 @@ SvXMLImportContext *ScXMLBodyContext::CreateChildContext( USHORT nPrefix, // sal_Bool bHeading = sal_False; switch( rTokenMap.Get( nPrefix, rLocalName ) ) { -// case XML_TOK_TEXT_H: -// bHeading = TRUE; -// case XML_TOK_TEXT_P: -// pContext = new SwXMLParaContext( GetSwImport(),nPrefix, rLocalName, -// xAttrList, bHeading ); -// break; -// case XML_TOK_TEXT_ORDERED_LIST: -// bOrdered = TRUE; -// case XML_TOK_TEXT_UNORDERED_LIST: -// pContext = new SwXMLListBlockContext( GetSwImport(),nPrefix, rLocalName, -// xAttrList, bOrdered ); -// break; +// case XML_TOK_TEXT_H: +// bHeading = TRUE; +// case XML_TOK_TEXT_P: +// pContext = new SwXMLParaContext( GetSwImport(),nPrefix, rLocalName, +// xAttrList, bHeading ); +// break; +// case XML_TOK_TEXT_ORDERED_LIST: +// bOrdered = TRUE; +// case XML_TOK_TEXT_UNORDERED_LIST: +// pContext = new SwXMLListBlockContext( GetSwImport(),nPrefix, rLocalName, +// xAttrList, bOrdered ); +// break; case XML_TOK_BODY_TRACKED_CHANGES : { pChangeTrackingImportHelper = GetScImport().GetChangeTrackingImportHelper(); @@ -269,9 +269,9 @@ void ScXMLBodyContext::EndElement() pContext->EndElement(); } GetScImport().LockSolarMutex(); - ScMyImpDetectiveOpArray* pDetOpArray = GetScImport().GetDetectiveOpArray(); - ScDocument* pDoc = GetScImport().GetDocument(); - ScMyImpDetectiveOp aDetOp; + ScMyImpDetectiveOpArray* pDetOpArray = GetScImport().GetDetectiveOpArray(); + ScDocument* pDoc = GetScImport().GetDocument(); + ScMyImpDetectiveOp aDetOp; if (pDoc && GetScImport().GetModel().is()) { diff --git a/sc/source/filter/xml/xmlbodyi.hxx b/sc/source/filter/xml/xmlbodyi.hxx index 7e643221b934..f0060eb59cb5 100644 --- a/sc/source/filter/xml/xmlbodyi.hxx +++ b/sc/source/filter/xml/xmlbodyi.hxx @@ -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,13 +39,13 @@ class ScXMLChangeTrackingImportHelper; class ScXMLBodyContext : public SvXMLImportContext { - rtl::OUString sPassword; + rtl::OUString sPassword; ScPasswordHash meHash1; ScPasswordHash meHash2; - sal_Bool bProtected; + sal_Bool bProtected; sal_Bool bHadCalculationSettings; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx index cc3588a3c249..35f78f7a632b 100644 --- a/sc/source/filter/xml/xmlcelli.cxx +++ b/sc/source/filter/xml/xmlcelli.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 @@ -92,7 +92,7 @@ #include <i18npool/lang.h> #include <comphelper/extract.hxx> -#define SC_CURRENCYSYMBOL "CurrencySymbol" +#define SC_CURRENCYSYMBOL "CurrencySymbol" using namespace com::sun::star; using namespace xmloff::token; @@ -712,7 +712,7 @@ void ScXMLTableRowCellContext::SetDetectiveObj( const table::CellAddress& rPosit if( CellExists(rPosition) && pDetectiveObjVec && pDetectiveObjVec->size() ) { LockSolarMutex(); - ScDetectiveFunc aDetFunc( rXMLImport.GetDocument(), rPosition.Sheet ); + ScDetectiveFunc aDetFunc( rXMLImport.GetDocument(), rPosition.Sheet ); uno::Reference<container::XIndexAccess> xShapesIndex (rXMLImport.GetTables().GetCurrentXShapes(), uno::UNO_QUERY); // make draw page ScMyImpDetectiveObjVec::iterator aItr(pDetectiveObjVec->begin()); ScMyImpDetectiveObjVec::iterator aEndItr(pDetectiveObjVec->end()); @@ -827,7 +827,7 @@ void ScXMLTableRowCellContext::EndElement() bIsEmpty = sal_True; } sal_Bool bWasEmpty = bIsEmpty; -// uno::Reference <table::XCell> xCell; +// uno::Reference <table::XCell> xCell; table::CellAddress aCurrentPos( aCellPos ); if ((pContentValidationName && pContentValidationName->getLength()) || mxAnnotationData.get() || pDetectiveObjVec || pCellRangeSource) @@ -858,7 +858,7 @@ void ScXMLTableRowCellContext::EndElement() // { // try // { - // xCell.set(xCellRange->getCellByPosition(aCurrentPos.Column, aCurrentPos.Row)); + // xCell.set(xCellRange->getCellByPosition(aCurrentPos.Column, aCurrentPos.Row)); // } // catch (lang::IndexOutOfBoundsException&) // { diff --git a/sc/source/filter/xml/xmlcelli.hxx b/sc/source/filter/xml/xmlcelli.hxx index 7bfe5c932796..6c6524174d5a 100644 --- a/sc/source/filter/xml/xmlcelli.hxx +++ b/sc/source/filter/xml/xmlcelli.hxx @@ -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 @@ -58,25 +58,25 @@ class ScXMLTableRowCellContext : public SvXMLImportContext ::boost::optional< FormulaWithNamespace > pOUFormula; rtl::OUString* pContentValidationName; ::std::auto_ptr< ScXMLAnnotationData > mxAnnotationData; - ScMyImpDetectiveObjVec* pDetectiveObjVec; - ScMyImpCellRangeSource* pCellRangeSource; - double fValue; - sal_Int32 nMergedRows, nMergedCols; - sal_Int32 nMatrixRows, nMatrixCols; - sal_Int32 nRepeatedRows; - sal_Int32 nCellsRepeated; + ScMyImpDetectiveObjVec* pDetectiveObjVec; + ScMyImpCellRangeSource* pCellRangeSource; + double fValue; + sal_Int32 nMergedRows, nMergedCols; + sal_Int32 nMatrixRows, nMatrixCols; + sal_Int32 nRepeatedRows; + sal_Int32 nCellsRepeated; ScXMLImport& rXMLImport; formula::FormulaGrammar::Grammar eGrammar; - sal_Int16 nCellType; - sal_Bool bIsMerged; - sal_Bool bIsMatrix; - sal_Bool bHasSubTable; - sal_Bool bIsCovered; - sal_Bool bIsEmpty; - sal_Bool bHasTextImport; - sal_Bool bIsFirstTextImport; - sal_Bool bSolarMutexLocked; - sal_Bool bFormulaTextResult; + sal_Int16 nCellType; + sal_Bool bIsMerged; + sal_Bool bIsMatrix; + sal_Bool bHasSubTable; + sal_Bool bIsCovered; + sal_Bool bIsEmpty; + sal_Bool bHasTextImport; + sal_Bool bIsFirstTextImport; + sal_Bool bSolarMutexLocked; + sal_Bool bFormulaTextResult; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcoli.cxx b/sc/source/filter/xml/xmlcoli.cxx index 4b05c89dc4e2..93112790364b 100644 --- a/sc/source/filter/xml/xmlcoli.cxx +++ b/sc/source/filter/xml/xmlcoli.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 @@ -120,14 +120,14 @@ SvXMLImportContext *ScXMLTableColContext::CreateChildContext( USHORT nPrefix, switch( rTokenMap.Get( nPrefix, rLName ) ) { case XML_TOK_TABLE_ROW_CELL: -// if( IsInsertCellPossible() ) +// if( IsInsertCellPossible() ) pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, rLName, xAttrList//, //this ); break; case XML_TOK_TABLE_ROW_COVERED_CELL: -// if( IsInsertCellPossible() ) +// if( IsInsertCellPossible() ) pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, rLName, xAttrList//, //this diff --git a/sc/source/filter/xml/xmlcoli.hxx b/sc/source/filter/xml/xmlcoli.hxx index 295f1ba41278..f72712b9e33e 100644 --- a/sc/source/filter/xml/xmlcoli.hxx +++ b/sc/source/filter/xml/xmlcoli.hxx @@ -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 @@ -35,10 +35,10 @@ class ScXMLImport; class ScXMLTableColContext : public SvXMLImportContext { - sal_Int32 nColCount; - rtl::OUString sStyleName; - rtl::OUString sVisibility; - rtl::OUString sCellStyleName; + sal_Int32 nColCount; + rtl::OUString sStyleName; + rtl::OUString sVisibility; + rtl::OUString sCellStyleName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -62,13 +62,13 @@ public: class ScXMLTableColsContext : public SvXMLImportContext { - sal_Int32 nHeaderStartCol; - sal_Int32 nHeaderEndCol; - sal_Int32 nGroupStartCol; - sal_Int32 nGroupEndCol; - sal_Bool bHeader; - sal_Bool bGroup; - sal_Bool bGroupDisplay; + sal_Int32 nHeaderStartCol; + sal_Int32 nHeaderEndCol; + sal_Int32 nGroupStartCol; + sal_Int32 nGroupEndCol; + sal_Bool bHeader; + sal_Bool bGroup; + sal_Bool bGroupDisplay; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlconti.cxx b/sc/source/filter/xml/xmlconti.cxx index dfb34beab24c..36a9cff9a977 100644 --- a/sc/source/filter/xml/xmlconti.cxx +++ b/sc/source/filter/xml/xmlconti.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/xml/xmlconti.hxx b/sc/source/filter/xml/xmlconti.hxx index ffde3d98e51a..47c2410f6380 100644 --- a/sc/source/filter/xml/xmlconti.hxx +++ b/sc/source/filter/xml/xmlconti.hxx @@ -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/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx index 40f1a00000a0..bf485eca555a 100644 --- a/sc/source/filter/xml/xmlcvali.cxx +++ b/sc/source/filter/xml/xmlcvali.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 @@ -67,7 +67,7 @@ class ScXMLContentValidationContext : public SvXMLImportContext sal_Bool bDisplayHelp; sal_Bool bDisplayError; - SvXMLImportContextRef xEventContext; + SvXMLImportContextRef xEventContext; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -100,10 +100,10 @@ public: class ScXMLHelpMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; - sal_Int32 nParagraphCount; - sal_Bool bDisplay; + rtl::OUString sTitle; + rtl::OUStringBuffer sMessage; + sal_Int32 nParagraphCount; + sal_Bool bDisplay; ScXMLContentValidationContext* pValidationContext; @@ -130,11 +130,11 @@ public: class ScXMLErrorMessageContext : public SvXMLImportContext { - rtl::OUString sTitle; - rtl::OUStringBuffer sMessage; - rtl::OUString sMessageType; - sal_Int32 nParagraphCount; - sal_Bool bDisplay; + rtl::OUString sTitle; + rtl::OUStringBuffer sMessage; + rtl::OUString sMessageType; + sal_Int32 nParagraphCount; + sal_Bool bDisplay; ScXMLContentValidationContext* pValidationContext; @@ -161,10 +161,10 @@ public: class ScXMLErrorMacroContext : public SvXMLImportContext { - rtl::OUString sName; - sal_Bool bExecute; + rtl::OUString sName; + sal_Bool bExecute; - ScXMLContentValidationContext* pValidationContext; + ScXMLContentValidationContext* pValidationContext; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlcvali.hxx b/sc/source/filter/xml/xmlcvali.hxx index 2328a0ff7844..131b10e583bc 100644 --- a/sc/source/filter/xml/xmlcvali.hxx +++ b/sc/source/filter/xml/xmlcvali.hxx @@ -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/xml/xmldpimp.cxx b/sc/source/filter/xml/xmldpimp.cxx index 3f1af06fd309..d515637de971 100644 --- a/sc/source/filter/xml/xmldpimp.cxx +++ b/sc/source/filter/xml/xmldpimp.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 @@ -169,17 +169,17 @@ ScXMLDataPilotTableContext::ScXMLDataPilotTableContext( ScXMLImport& rImport, { sGrandTotal = sValue; if (IsXMLToken(sValue, XML_BOTH)) - { + { maRowGrandTotal.mbVisible = true; maColGrandTotal.mbVisible = true; } else if (IsXMLToken(sValue, XML_ROW)) - { + { maRowGrandTotal.mbVisible = true; maColGrandTotal.mbVisible = false; } else if (IsXMLToken(sValue, XML_COLUMN)) - { + { maRowGrandTotal.mbVisible = false; maColGrandTotal.mbVisible = true; } @@ -295,7 +295,7 @@ SvXMLImportContext *ScXMLDataPilotTableContext::CreateChildContext( USHORT nPref } void ScXMLDataPilotTableContext::SetButtons() -{ +{ ScDPOutputGeometry aGeometry(aTargetRangeAddress, bShowFilter, ScDPOutputGeometry::ODF); aGeometry.setColumnFieldCount(mnColFieldCount); aGeometry.setRowFieldCount(mnRowFieldCount); @@ -319,7 +319,7 @@ void ScXMLDataPilotTableContext::SetButtons() if (eType == ScDPOutputGeometry::Column || eType == ScDPOutputGeometry::Row) nMFlag |= SC_MF_BUTTON_POPUP; - // Use the cell's string value to see if this field contains a + // Use the cell's string value to see if this field contains a // hidden member. Isn't there a better way? GetString() is // quite expensive... String aCellStr; @@ -340,8 +340,8 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas { if (pDPSave) { - // #91045# if a dimension with that name has already been inserted, - // mark the new one as duplicate + // #91045# if a dimension with that name has already been inserted, + // mark the new one as duplicate if ( !pDim->IsDataLayout() && pDPSave->GetExistingDimensionByName(pDim->GetName()) ) pDim->SetDupFlag( TRUE ); @@ -369,7 +369,7 @@ void ScXMLDataPilotTableContext::AddDimension(ScDPSaveDimension* pDim, bool bHas if (bHasHiddenMember) { - // the layout name takes priority over the original name, + // the layout name takes priority over the original name, // since this data is used against cell values. const OUString* pLayoutName = pDim->GetLayoutName(); if (pLayoutName) @@ -457,7 +457,7 @@ void ScXMLDataPilotTableContext::EndElement() pDPSave->SetRowGrand(maRowGrandTotal.mbVisible); pDPSave->SetColumnGrand(maColGrandTotal.mbVisible); if (maRowGrandTotal.maDisplayName.getLength()) - // TODO: Right now, we only support one grand total name for both + // TODO: Right now, we only support one grand total name for both // column and row totals. Take the value from the row total for // now. pDPSave->SetGrandTotalName(maRowGrandTotal.maDisplayName); @@ -801,7 +801,7 @@ ScXMLDataPilotGrandTotalContext::~ScXMLDataPilotGrandTotalContext() { } -SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( +SvXMLImportContext* ScXMLDataPilotGrandTotalContext::CreateChildContext( USHORT /*nPrefix*/, const ::rtl::OUString& /*rLocalName*/, const Reference<XAttributeList>& /*xAttrList*/ ) { return NULL; @@ -966,7 +966,7 @@ ScXMLDataPilotFieldContext::ScXMLDataPilotFieldContext( ScXMLImport& rImport, } } if (bHasName) - { + { pDim = new ScDPSaveDimension(String(sName), bDataLayout); if (aDisplayName.getLength()) pDim->SetLayoutName(aDisplayName); @@ -1042,7 +1042,7 @@ void ScXMLDataPilotFieldContext::EndElement() } pDataPilotTable->AddDimension(pDim, mbHasHiddenMember); if (bIsGroupField) - { + { ScDPNumGroupInfo aInfo; aInfo.Enable = sal_True; aInfo.DateValues = bDateValue; @@ -1756,7 +1756,7 @@ ScXMLDataPilotGroupContext::ScXMLDataPilotGroupContext( ScXMLImport& rImport, USHORT nPrefix = GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName ); rtl::OUString sValue = xAttrList->getValueByIndex( i ); - + if (nPrefix == XML_NAMESPACE_TABLE) { if (IsXMLToken(aLocalName, XML_NAME)) diff --git a/sc/source/filter/xml/xmldpimp.hxx b/sc/source/filter/xml/xmldpimp.hxx index 554853ff78ff..1e9ac075e70a 100644 --- a/sc/source/filter/xml/xmldpimp.hxx +++ b/sc/source/filter/xml/xmldpimp.hxx @@ -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 @@ -89,42 +89,42 @@ class ScXMLDataPilotTableContext : public SvXMLImportContext bool mbVisible; GrandTotalItem(); }; - ScDocument* pDoc; - ScDPObject* pDPObject; - ScDPSaveData* pDPSave; + ScDocument* pDoc; + ScDPObject* pDPObject; + ScDPSaveData* pDPSave; ScDPDimensionSaveData* pDPDimSaveData; GrandTotalItem maRowGrandTotal; GrandTotalItem maColGrandTotal; - rtl::OUString sDataPilotTableName; - rtl::OUString sApplicationData; - rtl::OUString sGrandTotal; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; - rtl::OUString sServiceName; - rtl::OUString sServiceSourceName; - rtl::OUString sServiceSourceObject; - rtl::OUString sServiceUsername; - rtl::OUString sServicePassword; - rtl::OUString sButtons; - ScRange aSourceCellRangeAddress; - ScRange aTargetRangeAddress; - ScRange aFilterSourceRange; - ScAddress aFilterOutputPosition; - ScQueryParam aSourceQueryParam; - ScMySourceType nSourceType; + rtl::OUString sDataPilotTableName; + rtl::OUString sApplicationData; + rtl::OUString sGrandTotal; + rtl::OUString sDatabaseName; + rtl::OUString sSourceObject; + rtl::OUString sServiceName; + rtl::OUString sServiceSourceName; + rtl::OUString sServiceSourceObject; + rtl::OUString sServiceUsername; + rtl::OUString sServicePassword; + rtl::OUString sButtons; + ScRange aSourceCellRangeAddress; + ScRange aTargetRangeAddress; + ScRange aFilterSourceRange; + ScAddress aFilterOutputPosition; + ScQueryParam aSourceQueryParam; + ScMySourceType nSourceType; sal_uInt32 mnRowFieldCount; sal_uInt32 mnColFieldCount; sal_uInt32 mnPageFieldCount; sal_uInt32 mnDataFieldCount; - sal_Bool bIsNative; - sal_Bool bIgnoreEmptyRows; - sal_Bool bIdentifyCategories; - sal_Bool bUseRegularExpression; - sal_Bool bIsCaseSensitive; - sal_Bool bSkipDuplicates; - sal_Bool bFilterCopyOutputData; - sal_Bool bTargetRangeAddress; - sal_Bool bSourceCellRange; + sal_Bool bIsNative; + sal_Bool bIgnoreEmptyRows; + sal_Bool bIdentifyCategories; + sal_Bool bUseRegularExpression; + sal_Bool bIsCaseSensitive; + sal_Bool bSkipDuplicates; + sal_Bool bFilterCopyOutputData; + sal_Bool bTargetRangeAddress; + sal_Bool bSourceCellRange; sal_Bool bShowFilter; sal_Bool bDrillDown; sal_Bool bHeaderGridLayout; @@ -159,12 +159,12 @@ public: void SetServicePassword(const rtl::OUString& sValue) { sServicePassword = sValue; } void SetSourceCellRangeAddress(const ScRange& aValue) { aSourceCellRangeAddress = aValue; bSourceCellRange = sal_True; } void SetSourceQueryParam(const ScQueryParam& aValue) { aSourceQueryParam = aValue; } -// void SetFilterUseRegularExpressions(const sal_Bool bValue) { aSourceQueryParam.bRegExp = bValue; } +// void SetFilterUseRegularExpressions(const sal_Bool bValue) { aSourceQueryParam.bRegExp = bValue; } void SetFilterOutputPosition(const ScAddress& aValue) { aFilterOutputPosition = aValue; } void SetFilterCopyOutputData(const sal_Bool bValue) { bFilterCopyOutputData = bValue; } void SetFilterSourceRange(const ScRange& aValue) { aFilterSourceRange = aValue; } -// void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; } -// void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; } +// void SetFilterIsCaseSensitive(const sal_Bool bValue) { aSourceQueryParam.bCaseSens = bValue; } +// void SetFilterSkipDuplicates(const sal_Bool bValue) { aSourceQueryParam.bDuplicate = !bValue; } void AddDimension(ScDPSaveDimension* pDim, bool bHasHiddenMember); void AddGroupDim(const ScDPSaveNumGroupDimension& aNumGroupDim); void AddGroupDim(const ScDPSaveGroupDimension& aGroupDim); @@ -173,7 +173,7 @@ public: class ScXMLDPSourceSQLContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -198,7 +198,7 @@ public: class ScXMLDPSourceTableContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -223,7 +223,7 @@ public: class ScXMLDPSourceQueryContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -248,7 +248,7 @@ public: class ScXMLSourceServiceContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -281,11 +281,11 @@ class ScXMLDataPilotGrandTotalContext : public SvXMLImportContext ::rtl::OUString maDisplayName; Orientation meOrientation; bool mbVisible; - + public: - ScXMLDataPilotGrandTotalContext( + ScXMLDataPilotGrandTotalContext( ScXMLImport& rImport, USHORT nPrefix, const ::rtl::OUString& rLName, - const ::com::sun::star::uno::Reference< + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList, ScXMLDataPilotTableContext* pTableContext ); @@ -301,7 +301,7 @@ public: class ScXMLSourceCellRangeContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; + ScXMLDataPilotTableContext* pDataPilotTable; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -332,8 +332,8 @@ struct ScXMLDataPilotGroup class ScXMLDataPilotFieldContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; - ScDPSaveDimension* pDim; + ScXMLDataPilotTableContext* pDataPilotTable; + ScDPSaveDimension* pDim; ::std::vector<ScXMLDataPilotGroup> aGroups; rtl::OUString sGroupSource; @@ -342,11 +342,11 @@ class ScXMLDataPilotFieldContext : public SvXMLImportContext double fStart; double fEnd; double fStep; - sal_Int32 nUsedHierarchy; + sal_Int32 nUsedHierarchy; sal_Int32 nGroupPart; - sal_Int16 nFunction; - sal_Int16 nOrientation; - sal_Bool bShowEmpty:1; + sal_Int16 nFunction; + sal_Int16 nOrientation; + sal_Bool bShowEmpty:1; sal_Bool bSelectedPage:1; sal_Bool bIsGroupField:1; sal_Bool bDateValue:1; @@ -382,7 +382,7 @@ public: void SetAutoShowInfo(const com::sun::star::sheet::DataPilotFieldAutoShowInfo& aInfo) { if (pDim) pDim->SetAutoShowInfo(&aInfo); } void SetSortInfo(const com::sun::star::sheet::DataPilotFieldSortInfo& aInfo) { if (pDim) pDim->SetSortInfo(&aInfo); } void SetLayoutInfo(const com::sun::star::sheet::DataPilotFieldLayoutInfo& aInfo) { if (pDim) pDim->SetLayoutInfo(&aInfo); } - void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, + void SetGrouping(const rtl::OUString& rGroupSource, const double& rStart, const double& rEnd, const double& rStep, sal_Int32 nPart, sal_Bool bDate, sal_Bool bAutoSt, sal_Bool bAutoE) { bIsGroupField = sal_True; @@ -418,7 +418,7 @@ public: class ScXMLDataPilotLevelContext : public SvXMLImportContext { - ScXMLDataPilotFieldContext* pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -499,8 +499,8 @@ class ScXMLDataPilotSubTotalsContext : public SvXMLImportContext { ScXMLDataPilotFieldContext* pDataPilotField; - sal_Int16 nFunctionCount; - sal_uInt16* pFunctions; + sal_Int16 nFunctionCount; + sal_uInt16* pFunctions; ::rtl::OUString maDisplayName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -530,7 +530,7 @@ public: class ScXMLDataPilotSubTotalContext : public SvXMLImportContext { - ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals; + ScXMLDataPilotSubTotalsContext* pDataPilotSubTotals; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -580,12 +580,12 @@ public: class ScXMLDataPilotMemberContext : public SvXMLImportContext { - ScXMLDataPilotFieldContext* pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; rtl::OUString sName; rtl::OUString maDisplayName; - sal_Bool bDisplay; - sal_Bool bDisplayDetails; + sal_Bool bDisplay; + sal_Bool bDisplayDetails; sal_Bool bHasName; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } @@ -611,7 +611,7 @@ public: class ScXMLDataPilotGroupsContext : public SvXMLImportContext { - ScXMLDataPilotFieldContext* pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -636,7 +636,7 @@ public: class ScXMLDataPilotGroupContext : public SvXMLImportContext { - ScXMLDataPilotFieldContext* pDataPilotField; + ScXMLDataPilotFieldContext* pDataPilotField; rtl::OUString sName; ::std::vector<rtl::OUString> aMembers; @@ -666,7 +666,7 @@ public: class ScXMLDataPilotGroupMemberContext : public SvXMLImportContext { - ScXMLDataPilotGroupContext* pDataPilotGroup; + ScXMLDataPilotGroupContext* pDataPilotGroup; rtl::OUString sName; diff --git a/sc/source/filter/xml/xmldrani.cxx b/sc/source/filter/xml/xmldrani.cxx index 33c19be9a824..8f517cc57a5a 100644 --- a/sc/source/filter/xml/xmldrani.cxx +++ b/sc/source/filter/xml/xmldrani.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 @@ -62,9 +62,9 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/xml/sax/XLocator.hpp> -#define SC_ENABLEUSERSORTLIST "EnableUserSortList" -#define SC_USERSORTLISTINDEX "UserSortListIndex" -#define SC_USERLIST "UserList" +#define SC_ENABLEUSERSORTLIST "EnableUserSortList" +#define SC_USERSORTLISTINDEX "UserSortListIndex" +#define SC_USERLIST "UserList" using namespace com::sun::star; using namespace xmloff::token; diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 7d2d5b2292eb..182b3638edda 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -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 @@ -71,11 +71,11 @@ struct ScSubTotalRule class ScXMLDatabaseRangeContext : public SvXMLImportContext { - rtl::OUString sDatabaseRangeName; + rtl::OUString sDatabaseRangeName; rtl::OUString sConnectionRessource; - rtl::OUString sRangeAddress; - rtl::OUString sDatabaseName; - rtl::OUString sSourceObject; + rtl::OUString sRangeAddress; + rtl::OUString sDatabaseName; + rtl::OUString sSourceObject; com::sun::star::uno::Sequence <com::sun::star::beans::PropertyValue> aSortSequence; com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2> aFilterFields; std::vector < ScSubTotalRule > aSubTotalRules; @@ -83,29 +83,29 @@ class ScXMLDatabaseRangeContext : public SvXMLImportContext com::sun::star::table::CellRangeAddress aFilterConditionSourceRangeAddress; com::sun::star::sheet::DataImportMode nSourceType; com::sun::star::table::TableOrientation eOrientation; - sal_Int32 nRefresh; - sal_Int16 nSubTotalsUserListIndex; - sal_Int16 nSubTotalRuleGroupFieldNumber; - sal_Bool bContainsSort; - sal_Bool bContainsSubTotal; - sal_Bool bNative; - sal_Bool bIsSelection; - sal_Bool bKeepFormats; - sal_Bool bMoveCells; - sal_Bool bStripData; - sal_Bool bContainsHeader; - sal_Bool bAutoFilter; - sal_Bool bSubTotalsBindFormatsToContent; - sal_Bool bSubTotalsIsCaseSensitive; - sal_Bool bSubTotalsInsertPageBreaks; - sal_Bool bSubTotalsSortGroups; - sal_Bool bSubTotalsEnabledUserList; - sal_Bool bSubTotalsAscending; - sal_Bool bFilterCopyOutputData; - sal_Bool bFilterIsCaseSensitive; - sal_Bool bFilterSkipDuplicates; - sal_Bool bFilterUseRegularExpressions; - sal_Bool bFilterConditionSourceRange; + sal_Int32 nRefresh; + sal_Int16 nSubTotalsUserListIndex; + sal_Int16 nSubTotalRuleGroupFieldNumber; + sal_Bool bContainsSort; + sal_Bool bContainsSubTotal; + sal_Bool bNative; + sal_Bool bIsSelection; + sal_Bool bKeepFormats; + sal_Bool bMoveCells; + sal_Bool bStripData; + sal_Bool bContainsHeader; + sal_Bool bAutoFilter; + sal_Bool bSubTotalsBindFormatsToContent; + sal_Bool bSubTotalsIsCaseSensitive; + sal_Bool bSubTotalsInsertPageBreaks; + sal_Bool bSubTotalsSortGroups; + sal_Bool bSubTotalsEnabledUserList; + sal_Bool bSubTotalsAscending; + sal_Bool bFilterCopyOutputData; + sal_Bool bFilterIsCaseSensitive; + sal_Bool bFilterSkipDuplicates; + sal_Bool bFilterUseRegularExpressions; + sal_Bool bFilterConditionSourceRange; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 2f31b209d375..1430be85368d 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -145,21 +145,21 @@ #define SC_STANDARDFORMAT "StandardFormat" #define SC_LAYERID "LayerID" -#define SC_DEFAULT_TABLE_COUNT 3 -#define SC_VIEWCHANGES_COUNT 13 -#define SC_SHOW_CHANGES 0 -#define SC_SHOW_ACCEPTED_CHANGES 1 -#define SC_SHOW_REJECTED_CHANGES 2 -#define SC_SHOW_CHANGES_BY_DATETIME 3 -#define SC_SHOW_CHANGES_BY_DATETIME_MODE 4 -#define SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME 5 -#define SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME 6 -#define SC_SHOW_CHANGES_BY_AUTHOR 7 -#define SC_SHOW_CHANGES_BY_AUTHOR_NAME 8 -#define SC_SHOW_CHANGES_BY_COMMENT 9 -#define SC_SHOW_CHANGES_BY_COMMENT_TEXT 10 -#define SC_SHOW_CHANGES_BY_RANGES 11 -#define SC_SHOW_CHANGES_BY_RANGES_LIST 12 +#define SC_DEFAULT_TABLE_COUNT 3 +#define SC_VIEWCHANGES_COUNT 13 +#define SC_SHOW_CHANGES 0 +#define SC_SHOW_ACCEPTED_CHANGES 1 +#define SC_SHOW_REJECTED_CHANGES 2 +#define SC_SHOW_CHANGES_BY_DATETIME 3 +#define SC_SHOW_CHANGES_BY_DATETIME_MODE 4 +#define SC_SHOW_CHANGES_BY_DATETIME_FIRST_DATETIME 5 +#define SC_SHOW_CHANGES_BY_DATETIME_SECOND_DATETIME 6 +#define SC_SHOW_CHANGES_BY_AUTHOR 7 +#define SC_SHOW_CHANGES_BY_AUTHOR_NAME 8 +#define SC_SHOW_CHANGES_BY_COMMENT 9 +#define SC_SHOW_CHANGES_BY_COMMENT_TEXT 10 +#define SC_SHOW_CHANGES_BY_RANGES 11 +#define SC_SHOW_CHANGES_BY_RANGES_LIST 12 using namespace rtl; using namespace formula; @@ -458,7 +458,7 @@ sal_Int16 ScXMLExport::GetFieldUnit() ScXMLExport::ScXMLExport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const sal_uInt16 nExportFlag) -: SvXMLExport( xServiceFactory, SvXMLUnitConverter::GetMapUnit(GetFieldUnit()), XML_SPREADSHEET, nExportFlag ), +: SvXMLExport( xServiceFactory, SvXMLUnitConverter::GetMapUnit(GetFieldUnit()), XML_SPREADSHEET, nExportFlag ), pDoc(NULL), nSourceStreamPos(0), pNumberFormatAttributesExportHelper(NULL), @@ -847,7 +847,7 @@ void ScXMLExport::_ExportMeta() void ScXMLExport::_ExportFontDecls() { - GetFontAutoStylePool(); // make sure the pool is created + GetFontAutoStylePool(); // make sure the pool is created SvXMLExport::_ExportFontDecls(); } @@ -1948,7 +1948,7 @@ void ScXMLExport::_ExportStyles( sal_Bool bUsed ) if (pSharedData->HasShapes()) { GetShapeExport()->ExportGraphicDefaults(); -/* xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults"))); +/* xInterface = xMultiServiceFactory->createInstance(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.Defaults"))); uno::Reference <beans::XPropertySet> xDrawProperties(xInterface, uno::UNO_QUERY); if (xDrawProperties.is()) aStylesExp.exportDefaultStyle(xDrawProperties, rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_SD_GRAPHICS_NAME)), GetShapeExport()->CreateShapePropMapper(*this));*/ @@ -2756,10 +2756,10 @@ void ScXMLExport::CollectInternalShape( uno::Reference< drawing::XShape > xShape // other objects from internal layer only (detective) else if( pObject->GetLayer() == SC_LAYER_INTERN ) { - ScDetectiveFunc aDetFunc( pDoc, static_cast<SCTAB>(nCurrentTable) ); - ScAddress aPosition; - ScRange aSourceRange; - sal_Bool bRedLine; + ScDetectiveFunc aDetFunc( pDoc, static_cast<SCTAB>(nCurrentTable) ); + ScAddress aPosition; + ScRange aSourceRange; + sal_Bool bRedLine; ScDetectiveObjType eObjType = aDetFunc.GetDetectiveObjectType( pObject, nCurrentTable, aPosition, aSourceRange, bRedLine ); pSharedData->GetDetectiveObjContainer()->AddObject( eObjType, static_cast<SCTAB>(nCurrentTable), aPosition, aSourceRange, bRedLine ); @@ -2841,7 +2841,7 @@ sal_Bool ScXMLExport::IsMatrix (const ScAddress& aCell, return sal_False; -/* uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCell, uno::UNO_QUERY); +/* uno::Reference <sheet::XArrayFormulaRange> xArrayFormulaRange (xCell, uno::UNO_QUERY); if (xArrayFormulaRange.is()) { rtl::OUString sArrayFormula(xArrayFormulaRange->getArrayFormula()); @@ -2886,17 +2886,17 @@ sal_Bool ScXMLExport::GetCellText (ScMyCell& rMyCell, const ScAddress& aPos) con return sal_True; else { -/* if (!rMyCell.bHasXText) +/* if (!rMyCell.bHasXText) { rMyCell.xText.set(xCurrentTableCellRange->getCellByPosition(rMyCell.aCellAddress.Column, rMyCell.aCellAddress.Row), uno::UNO_QUERY); rMyCell.bHasXText = sal_True; }*/ -// if (rMyCell.xText.is()) -// { +// if (rMyCell.xText.is()) +// { rMyCell.sStringValue = ScCellObj::GetOutputString_Impl(pDoc, aPos); rMyCell.bHasStringValue = sal_True; return sal_True; -// } +// } } } @@ -3058,7 +3058,7 @@ void ScXMLExport::WriteCell (ScMyCell& aCell) void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, awt::Point* pPoint) { uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY ); -//BM sal_Bool bMemChart(sal_False); // das muss man jetzt umbenennen :-) +//BM sal_Bool bMemChart(sal_False); // das muss man jetzt umbenennen :-) bool bIsChart( false ); rtl::OUString sPropCLSID (RTL_CONSTASCII_USTRINGPARAM("CLSID")); rtl::OUString sPropModel (RTL_CONSTASCII_USTRINGPARAM("Model")); @@ -3147,50 +3147,50 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape, } } -//BM rtl::OUString sOUName; -//BM xShapeProps->getPropertyValue(sPersistName) >>= sOUName; -//BM String sName(sOUName); -//BM if (!pChartListener) -//BM { -//BM String aEmptyString; -//BM ScRange aRange; -//BM pChartListener = new ScChartListener ( aEmptyString, GetDocument(), aRange ); -//BM } -//BM if(pChartListener) -//BM { -//BM USHORT nIndex(0); -//BM pChartListener->SetString( sName ); -//BM if ( GetDocument() && GetDocument()->GetChartListenerCollection()->Search( pChartListener, nIndex ) ) -//BM { -//BM const ScRangeListRef& rRangeListRef(((ScChartListener*) -//BM (GetDocument()->GetChartListenerCollection()-> -//BM At( nIndex )))->GetRangeList()); -//BM if (rRangeListRef.Is()) -//BM { -//BM bMemChart = sal_True; -//BM rtl::OUString sRanges; -//BM ScRangeStringConverter::GetStringFromRangeList(sRanges, rRangeListRef, GetDocument()); +//BM rtl::OUString sOUName; +//BM xShapeProps->getPropertyValue(sPersistName) >>= sOUName; +//BM String sName(sOUName); +//BM if (!pChartListener) +//BM { +//BM String aEmptyString; +//BM ScRange aRange; +//BM pChartListener = new ScChartListener ( aEmptyString, GetDocument(), aRange ); +//BM } +//BM if(pChartListener) +//BM { +//BM USHORT nIndex(0); +//BM pChartListener->SetString( sName ); +//BM if ( GetDocument() && GetDocument()->GetChartListenerCollection()->Search( pChartListener, nIndex ) ) +//BM { +//BM const ScRangeListRef& rRangeListRef(((ScChartListener*) +//BM (GetDocument()->GetChartListenerCollection()-> +//BM At( nIndex )))->GetRangeList()); +//BM if (rRangeListRef.Is()) +//BM { +//BM bMemChart = sal_True; +//BM rtl::OUString sRanges; +//BM ScRangeStringConverter::GetStringFromRangeList(sRanges, rRangeListRef, GetDocument()); //BM SvXMLAttributeList* pAttrList = NULL; -//BM if (sRanges.getLength()) +//BM if (sRanges.getLength()) //BM { //BM pAttrList = new SvXMLAttributeList(); //BM pAttrList->AddAttribute( //BM GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), sRanges ); //BM } -//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList); -//BM } -//BM } -//BM else -//BM { -//BM bMemChart = sal_True; +//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList); +//BM } +//BM } +//BM else +//BM { +//BM bMemChart = sal_True; //BM SvXMLAttributeList* pAttrList = new SvXMLAttributeList(); //BM pAttrList->AddAttribute( //BM GetNamespaceMap().GetQNameByKey( XML_NAMESPACE_DRAW, GetXMLToken(XML_NOTIFY_ON_UPDATE_OF_RANGES) ), rtl::OUString() ); -//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList); -//BM } -//BM } +//BM GetShapeExport()->exportShape(xShape, SEF_EXPORT_NO_CHART_DATA | SEF_DEFAULT, pPoint, pAttrList); +//BM } +//BM } -/* SchMemChart* pMemChart = pDoc->FindChartData(sName); +/* SchMemChart* pMemChart = pDoc->FindChartData(sName); if (pMemChart && pMemChart->GetSeriesAddresses().getLength()) { bMemChart = sal_True; @@ -3394,7 +3394,7 @@ void ScXMLExport::WriteAnnotation(ScMyCell& rMyCell) { if( rMyCell.bHasAnnotation && rMyCell.xAnnotation.is()) { -/* rtl::OUString sAuthor(rMyCell.xAnnotation->getAuthor()); +/* rtl::OUString sAuthor(rMyCell.xAnnotation->getAuthor()); if (sAuthor.getLength()) { SvXMLElementExport aCreatorElem( *this, XML_NAMESPACE_DC, @@ -3794,9 +3794,9 @@ void ScXMLExport::WriteScenario() { if (pDoc && pDoc->IsScenario(static_cast<SCTAB>(nCurrentTable))) { - String sComment; - Color aColor; - sal_uInt16 nFlags; + String sComment; + Color aColor; + sal_uInt16 nFlags; pDoc->GetScenarioData(static_cast<SCTAB>(nCurrentTable), sComment, aColor, nFlags); if (!(nFlags & SC_SCENARIO_SHOWFRAME)) AddAttribute(XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_FALSE); diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 07b494dce2af..e89deb8e0d62 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -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 @@ -70,44 +70,44 @@ typedef std::vector< com::sun::star::uno::Reference < com::sun::star::drawing::X class ScXMLExport : public SvXMLExport { - ScDocument* pDoc; + ScDocument* pDoc; com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheet> xCurrentTable; com::sun::star::uno::Reference <com::sun::star::table::XCellRange> xCurrentTableCellRange; com::sun::star::uno::Reference<com::sun::star::io::XInputStream> xSourceStream; sal_Int32 nSourceStreamPos; - UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; - UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > xCellStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > xColumnStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper; - UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper; + UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; + UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper; + UniReference < SvXMLExportPropertyMapper > xCellStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper > xColumnStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper > xRowStylesExportPropertySetMapper; + UniReference < SvXMLExportPropertyMapper > xTableStylesExportPropertySetMapper; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; typedef ::std::hash_map<sal_Int32, sal_Int32> NumberFormatIndexMap; NumberFormatIndexMap aNumFmtIndexMap; - ScMySharedData* pSharedData; - ScColumnStyles* pColumnStyles; - ScRowStyles* pRowStyles; - ScFormatRangeStyles* pCellStyles; - ScRowFormatRanges* pRowFormatRanges; - std::vector<rtl::OUString> aTableStyles; - com::sun::star::table::CellRangeAddress aRowHeaderRange; - ScMyOpenCloseColumnRowGroup* pGroupColumns; - ScMyOpenCloseColumnRowGroup* pGroupRows; - ScMyDefaultStyles* pDefaults; - ScChartListener* pChartListener; + ScMySharedData* pSharedData; + ScColumnStyles* pColumnStyles; + ScRowStyles* pRowStyles; + ScFormatRangeStyles* pCellStyles; + ScRowFormatRanges* pRowFormatRanges; + std::vector<rtl::OUString> aTableStyles; + com::sun::star::table::CellRangeAddress aRowHeaderRange; + ScMyOpenCloseColumnRowGroup* pGroupColumns; + ScMyOpenCloseColumnRowGroup* pGroupRows; + ScMyDefaultStyles* pDefaults; + ScChartListener* pChartListener; const ScMyCell* pCurrentCell; - ScMyMergedRangesContainer* pMergedRangesContainer; - ScMyValidationsContainer* pValidationsContainer; - ScMyNotEmptyCellsIterator* pCellsItr; - ScChangeTrackingExportHelper* pChangeTrackingExportHelper; - const rtl::OUString sLayerID; - const rtl::OUString sCaptionShape; + ScMyMergedRangesContainer* pMergedRangesContainer; + ScMyValidationsContainer* pValidationsContainer; + ScMyNotEmptyCellsIterator* pCellsItr; + ScChangeTrackingExportHelper* pChangeTrackingExportHelper; + const rtl::OUString sLayerID; + const rtl::OUString sCaptionShape; rtl::OUString sExternalRefTabStyleName; rtl::OUString sAttrName; rtl::OUString sAttrStyleName; @@ -121,19 +121,19 @@ class ScXMLExport : public SvXMLExport rtl::OUString sElemRow; rtl::OUString sElemTab; rtl::OUString sElemP; - sal_Int32 nOpenRow; + sal_Int32 nOpenRow; sal_Int32 nProgressCount; - sal_uInt16 nCurrentTable; - sal_Bool bHasRowHeader; - sal_Bool bRowHeaderOpen; - sal_Bool mbShowProgress; + sal_uInt16 nCurrentTable; + sal_Bool bHasRowHeader; + sal_Bool bRowHeaderOpen; + sal_Bool mbShowProgress; sal_Int32 GetNumberFormatStyleIndex(sal_Int32 nNumFmt) const; - sal_Bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc); - void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount); - void CollectShapesAutoStyles(const sal_Int32 nTableCount); - void WriteTablesView(const com::sun::star::uno::Any& aTableView); - void WriteView(const com::sun::star::uno::Any& aView); + sal_Bool HasDrawPages(com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xDoc); + void CollectSharedData(sal_Int32& nTableCount, sal_Int32& nShapesCount, const sal_Int32 nCellCount); + void CollectShapesAutoStyles(const sal_Int32 nTableCount); + void WriteTablesView(const com::sun::star::uno::Any& aTableView); + void WriteView(const com::sun::star::uno::Any& aView); virtual void _ExportFontDecls(); virtual void _ExportStyles( sal_Bool bUsed ); virtual void _ExportAutoStyles(); @@ -146,7 +146,7 @@ class ScXMLExport : public SvXMLExport com::sun::star::table::CellRangeAddress GetEndAddress(const com::sun::star::uno::Reference<com::sun::star::sheet::XSpreadsheet>& xTable, const sal_Int32 nTable); -// ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); +// ScMyEmptyDatabaseRangesContainer GetEmptyDatabaseRanges(); void GetAreaLinks( com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc, ScMyAreaLinksContainer& rAreaLinks ); void GetDetectiveOpList( ScMyDetectiveOpContainer& rDetOp ); void WriteSingleColumn(const sal_Int32 nRepeatColumns, const sal_Int32 nStyleIndex, @@ -196,12 +196,12 @@ class ScXMLExport : public SvXMLExport void WriteCalculationSettings(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); void WriteTableSource(); - void WriteScenario(); // core implementation + void WriteScenario(); // core implementation void WriteTheLabelRanges(const com::sun::star::uno::Reference< com::sun::star::sheet::XSpreadsheetDocument >& xSpreadDoc); void WriteLabelRanges( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& xRangesIAccess, sal_Bool bColumn ); void WriteNamedExpressions(const com::sun::star::uno::Reference <com::sun::star::sheet::XSpreadsheetDocument>& xSpreadDoc); void WriteExternalRefCaches(); - void WriteConsolidation(); // core implementation + void WriteConsolidation(); // core implementation void CollectUserDefinedNamespaces(const SfxItemPool* pPool, sal_uInt16 nAttrib); @@ -234,8 +234,8 @@ public: virtual ~ScXMLExport(); static sal_Int16 GetFieldUnit(); - inline ScDocument* GetDocument() { return pDoc; } - inline const ScDocument* GetDocument() const { return pDoc; } + inline ScDocument* GetDocument() { return pDoc; } + inline const ScDocument* GetDocument() const { return pDoc; } sal_Bool IsMatrix (const ScAddress& aCell, com::sun::star::table::CellRangeAddress& aCellAddress, sal_Bool& bIsFirst) const; diff --git a/sc/source/filter/xml/xmlexternaltabi.cxx b/sc/source/filter/xml/xmlexternaltabi.cxx index 73c00cdc136b..86c0b2ffc2a1 100644 --- a/sc/source/filter/xml/xmlexternaltabi.cxx +++ b/sc/source/filter/xml/xmlexternaltabi.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 @@ -98,12 +98,12 @@ SvXMLImportContext* ScXMLExternalRefTabSourceContext::CreateChildContext( return new SvXMLImportContext(GetImport(), nPrefix, rLocalName); } -/** - * Make sure the URL is a valid relative URL, mainly to avoid storing - * absolute URL as relative URL by accident. For now, we only check the first - * three characters which are assumed to be always '../', because the relative - * URL for an external document is always in reference to the content.xml - * fragment of the original document. +/** + * Make sure the URL is a valid relative URL, mainly to avoid storing + * absolute URL as relative URL by accident. For now, we only check the first + * three characters which are assumed to be always '../', because the relative + * URL for an external document is always in reference to the content.xml + * fragment of the original document. */ static bool lcl_isValidRelativeURL(const OUString& rUrl) { @@ -232,7 +232,7 @@ void ScXMLExternalRefRowContext::EndElement() for (sal_Int32 i = 1; i < mnRepeatRowCount; ++i) { - // Performance: duplicates of a non-existent row will still not exist. + // Performance: duplicates of a non-existent row will still not exist. // Don't find that out for every cell. // External references often are a sparse matrix. if (i == 1 && !pTab->hasRow( mrExternalRefInfo.mnRow)) diff --git a/sc/source/filter/xml/xmlexternaltabi.hxx b/sc/source/filter/xml/xmlexternaltabi.hxx index 065933ce8108..4b4cfcd00770 100644 --- a/sc/source/filter/xml/xmlexternaltabi.hxx +++ b/sc/source/filter/xml/xmlexternaltabi.hxx @@ -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/xml/xmlfilti.cxx b/sc/source/filter/xml/xmlfilti.cxx index f30c4a87c5e7..2d5aa545f248 100644 --- a/sc/source/filter/xml/xmlfilti.cxx +++ b/sc/source/filter/xml/xmlfilti.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 @@ -519,7 +519,7 @@ void ScXMLDPFilterContext::EndElement() aFilterFields.bRegExp = bUseRegularExpressions; aFilterFields.bCaseSens = bIsCaseSensitive; aFilterFields.bDuplicate = !bSkipDuplicates; -// pDataPilotTable->SetFilterUseRegularExpressions(bUseRegularExpressions); +// pDataPilotTable->SetFilterUseRegularExpressions(bUseRegularExpressions); if (bCopyOutputData) { pDataPilotTable->SetFilterOutputPosition(aOutputPosition); @@ -527,8 +527,8 @@ void ScXMLDPFilterContext::EndElement() } else pDataPilotTable->SetFilterCopyOutputData(sal_False); -// pDataPilotTable->SetFilterIsCaseSensitive(bIsCaseSensitive); -// pDataPilotTable->SetFilterSkipDuplicates(bSkipDuplicates); +// pDataPilotTable->SetFilterIsCaseSensitive(bIsCaseSensitive); +// pDataPilotTable->SetFilterSkipDuplicates(bSkipDuplicates); pDataPilotTable->SetSourceQueryParam(aFilterFields); if (bConditionSourceRange) pDataPilotTable->SetFilterSourceRange(aConditionSourceRangeAddress); diff --git a/sc/source/filter/xml/xmlfilti.hxx b/sc/source/filter/xml/xmlfilti.hxx index 7bd5c1f331d3..e8eb69976ba9 100644 --- a/sc/source/filter/xml/xmlfilti.hxx +++ b/sc/source/filter/xml/xmlfilti.hxx @@ -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 @@ -50,16 +50,16 @@ class ScXMLFilterContext : public SvXMLImportContext com::sun::star::uno::Sequence <com::sun::star::sheet::TableFilterField2> aFilterFields; com::sun::star::table::CellAddress aOutputPosition; com::sun::star::table::CellRangeAddress aConditionSourceRangeAddress; - sal_Int16 nUserListIndex; - sal_Bool bSkipDuplicates; - sal_Bool bCopyOutputData; - sal_Bool bUseRegularExpressions; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; - sal_Bool bConnectionOr; - sal_Bool bNextConnectionOr; - sal_Bool bConditionSourceRange; - Stack aConnectionOrStack; + sal_Int16 nUserListIndex; + sal_Bool bSkipDuplicates; + sal_Bool bCopyOutputData; + sal_Bool bUseRegularExpressions; + sal_Bool bIsCaseSensitive; + sal_Bool bEnabledUserList; + sal_Bool bConnectionOr; + sal_Bool bNextConnectionOr; + sal_Bool bConditionSourceRange; + Stack aConnectionOrStack; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -149,8 +149,8 @@ class ScXMLConditionContext : public SvXMLImportContext rtl::OUString sDataType; rtl::OUString sConditionValue; rtl::OUString sOperator; - sal_Int32 nField; - sal_Bool bIsCaseSensitive; + sal_Int32 nField; + sal_Bool bIsCaseSensitive; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -178,22 +178,22 @@ public: class ScXMLDPFilterContext : public SvXMLImportContext { - ScXMLDataPilotTableContext* pDataPilotTable; - - ScQueryParam aFilterFields; - ScAddress aOutputPosition; - ScRange aConditionSourceRangeAddress; - sal_uInt8 nFilterFieldCount; - sal_Int16 nUserListIndex; - sal_Bool bSkipDuplicates; - sal_Bool bCopyOutputData; - sal_Bool bUseRegularExpressions; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; - sal_Bool bConnectionOr; - sal_Bool bNextConnectionOr; - sal_Bool bConditionSourceRange; - Stack aConnectionOrStack; + ScXMLDataPilotTableContext* pDataPilotTable; + + ScQueryParam aFilterFields; + ScAddress aOutputPosition; + ScRange aConditionSourceRangeAddress; + sal_uInt8 nFilterFieldCount; + sal_Int16 nUserListIndex; + sal_Bool bSkipDuplicates; + sal_Bool bCopyOutputData; + sal_Bool bUseRegularExpressions; + sal_Bool bIsCaseSensitive; + sal_Bool bEnabledUserList; + sal_Bool bConnectionOr; + sal_Bool bNextConnectionOr; + sal_Bool bConditionSourceRange; + Stack aConnectionOrStack; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -282,8 +282,8 @@ class ScXMLDPConditionContext : public SvXMLImportContext rtl::OUString sDataType; rtl::OUString sConditionValue; rtl::OUString sOperator; - sal_Int32 nField; - sal_Bool bIsCaseSensitive; + sal_Int32 nField; + sal_Bool bIsCaseSensitive; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlfonte.cxx b/sc/source/filter/xml/xmlfonte.cxx index ec9715c7131a..001cdbd2a704 100644 --- a/sc/source/filter/xml/xmlfonte.cxx +++ b/sc/source/filter/xml/xmlfonte.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/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index b14b71f72540..5600150d4d73 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.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 @@ -95,9 +95,9 @@ #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#define SC_LOCALE "Locale" -#define SC_STANDARDFORMAT "StandardFormat" -#define SC_CURRENCYSYMBOL "CurrencySymbol" +#define SC_LOCALE "Locale" +#define SC_STANDARDFORMAT "StandardFormat" +#define SC_CURRENCYSYMBOL "CurrencySymbol" #define SC_NAMEDRANGES "NamedRanges" #define SC_REPEAT_COLUMN "repeat-column" #define SC_REPEAT_ROW "repeat-row" @@ -430,14 +430,14 @@ const SvXMLTokenMap& ScXMLImport::GetDocElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDocTokenMap[] = { - { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, - { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, - { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, - { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, - { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, - { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPTS }, - { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, - { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, + { XML_NAMESPACE_OFFICE, XML_FONT_FACE_DECLS, XML_TOK_DOC_FONTDECLS }, + { XML_NAMESPACE_OFFICE, XML_STYLES, XML_TOK_DOC_STYLES }, + { XML_NAMESPACE_OFFICE, XML_AUTOMATIC_STYLES, XML_TOK_DOC_AUTOSTYLES }, + { XML_NAMESPACE_OFFICE, XML_MASTER_STYLES, XML_TOK_DOC_MASTERSTYLES }, + { XML_NAMESPACE_OFFICE, XML_META, XML_TOK_DOC_META }, + { XML_NAMESPACE_OFFICE, XML_SCRIPTS, XML_TOK_DOC_SCRIPTS }, + { XML_NAMESPACE_OFFICE, XML_BODY, XML_TOK_DOC_BODY }, + { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, XML_TOKEN_MAP_END }; @@ -455,17 +455,17 @@ const SvXMLTokenMap& ScXMLImport::GetBodyElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aBodyTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, XML_TOK_BODY_TRACKED_CHANGES }, - { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS }, - { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS, XML_TOK_BODY_CONTENT_VALIDATIONS }, - { XML_NAMESPACE_TABLE, XML_LABEL_RANGES, XML_TOK_BODY_LABEL_RANGES }, - { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_BODY_TABLE }, - { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_BODY_NAMED_EXPRESSIONS }, - { XML_NAMESPACE_TABLE, XML_DATABASE_RANGES, XML_TOK_BODY_DATABASE_RANGES }, - { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_BODY_DATABASE_RANGE }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES, XML_TOK_BODY_DATA_PILOT_TABLES }, - { XML_NAMESPACE_TABLE, XML_CONSOLIDATION, XML_TOK_BODY_CONSOLIDATION }, - { XML_NAMESPACE_TABLE, XML_DDE_LINKS, XML_TOK_BODY_DDE_LINKS }, + { XML_NAMESPACE_TABLE, XML_TRACKED_CHANGES, XML_TOK_BODY_TRACKED_CHANGES }, + { XML_NAMESPACE_TABLE, XML_CALCULATION_SETTINGS, XML_TOK_BODY_CALCULATION_SETTINGS }, + { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATIONS, XML_TOK_BODY_CONTENT_VALIDATIONS }, + { XML_NAMESPACE_TABLE, XML_LABEL_RANGES, XML_TOK_BODY_LABEL_RANGES }, + { XML_NAMESPACE_TABLE, XML_TABLE, XML_TOK_BODY_TABLE }, + { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSIONS, XML_TOK_BODY_NAMED_EXPRESSIONS }, + { XML_NAMESPACE_TABLE, XML_DATABASE_RANGES, XML_TOK_BODY_DATABASE_RANGES }, + { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_BODY_DATABASE_RANGE }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLES, XML_TOK_BODY_DATA_PILOT_TABLES }, + { XML_NAMESPACE_TABLE, XML_CONSOLIDATION, XML_TOK_BODY_CONSOLIDATION }, + { XML_NAMESPACE_TABLE, XML_DDE_LINKS, XML_TOK_BODY_DDE_LINKS }, XML_TOKEN_MAP_END }; @@ -481,7 +481,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationsElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION }, + { XML_NAMESPACE_TABLE, XML_CONTENT_VALIDATION, XML_TOK_CONTENT_VALIDATION }, XML_TOKEN_MAP_END }; @@ -516,11 +516,11 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_CONTENT_VALIDATION_NAME }, - { XML_NAMESPACE_TABLE, XML_CONDITION, XML_TOK_CONTENT_VALIDATION_CONDITION }, - { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_CONTENT_VALIDATION_BASE_CELL_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_ALLOW_EMPTY_CELL, XML_TOK_CONTENT_VALIDATION_ALLOW_EMPTY_CELL }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_LIST, XML_TOK_CONTENT_VALIDATION_DISPLAY_LIST }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_CONTENT_VALIDATION_NAME }, + { XML_NAMESPACE_TABLE, XML_CONDITION, XML_TOK_CONTENT_VALIDATION_CONDITION }, + { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_CONTENT_VALIDATION_BASE_CELL_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_ALLOW_EMPTY_CELL, XML_TOK_CONTENT_VALIDATION_ALLOW_EMPTY_CELL }, + { XML_NAMESPACE_TABLE, XML_DISPLAY_LIST, XML_TOK_CONTENT_VALIDATION_DISPLAY_LIST }, XML_TOKEN_MAP_END }; @@ -536,7 +536,7 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationMessageElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationMessageElemTokenMap[] = { - { XML_NAMESPACE_TEXT, XML_P, XML_TOK_P }, + { XML_NAMESPACE_TEXT, XML_P, XML_TOK_P }, XML_TOKEN_MAP_END }; @@ -552,8 +552,8 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationHelpMessageAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationHelpMessageAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE }, - { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY }, + { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_HELP_MESSAGE_ATTR_TITLE }, + { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_HELP_MESSAGE_ATTR_DISPLAY }, XML_TOKEN_MAP_END }; @@ -569,9 +569,9 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMessageAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMessageAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE }, - { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY }, - { XML_NAMESPACE_TABLE, XML_MESSAGE_TYPE, XML_TOK_ERROR_MESSAGE_ATTR_MESSAGE_TYPE }, + { XML_NAMESPACE_TABLE, XML_TITLE, XML_TOK_ERROR_MESSAGE_ATTR_TITLE }, + { XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TOK_ERROR_MESSAGE_ATTR_DISPLAY }, + { XML_NAMESPACE_TABLE, XML_MESSAGE_TYPE, XML_TOK_ERROR_MESSAGE_ATTR_MESSAGE_TYPE }, XML_TOKEN_MAP_END }; @@ -587,8 +587,8 @@ const SvXMLTokenMap& ScXMLImport::GetContentValidationErrorMacroAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aContentValidationErrorMacroAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_ERROR_MACRO_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_EXECUTE, XML_TOK_ERROR_MACRO_ATTR_EXECUTE }, XML_TOKEN_MAP_END }; @@ -604,7 +604,7 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangesElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aLabelRangesElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM }, + { XML_NAMESPACE_TABLE, XML_LABEL_RANGE, XML_TOK_LABEL_RANGE_ELEM }, XML_TOKEN_MAP_END }; @@ -620,9 +620,9 @@ const SvXMLTokenMap& ScXMLImport::GetLabelRangeAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aLabelRangeAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE }, - { XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE }, - { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_LABEL_RANGE_ATTR_ORIENTATION }, + { XML_NAMESPACE_TABLE, XML_LABEL_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_LABEL_RANGE }, + { XML_NAMESPACE_TABLE, XML_DATA_CELL_RANGE_ADDRESS, XML_TOK_LABEL_RANGE_ATTR_DATA_RANGE }, + { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_LABEL_RANGE_ATTR_ORIENTATION }, XML_TOKEN_MAP_END }; @@ -638,19 +638,19 @@ const SvXMLTokenMap& ScXMLImport::GetTableElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COL_GROUP }, + { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_HEADER_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COL }, { XML_NAMESPACE_TABLE, XML_TABLE_PROTECTION, XML_TOK_TABLE_PROTECTION }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, - { XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, XML_TOK_TABLE_SOURCE }, - { XML_NAMESPACE_TABLE, XML_SCENARIO, XML_TOK_TABLE_SCENARIO }, - { XML_NAMESPACE_TABLE, XML_SHAPES, XML_TOK_TABLE_SHAPES }, - { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TABLE_FORMS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROW_GROUP }, + { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_HEADER_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_SOURCE, XML_TOK_TABLE_SOURCE }, + { XML_NAMESPACE_TABLE, XML_SCENARIO, XML_TOK_TABLE_SCENARIO }, + { XML_NAMESPACE_TABLE, XML_SHAPES, XML_TOK_TABLE_SHAPES }, + { XML_NAMESPACE_OFFICE, XML_FORMS, XML_TOK_TABLE_FORMS }, { XML_NAMESPACE_OFFICE, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS }, { XML_NAMESPACE_OFFICE_EXT, XML_EVENT_LISTENERS, XML_TOK_TABLE_EVENT_LISTENERS_EXT }, XML_TOKEN_MAP_END @@ -684,10 +684,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableRowsElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS_ROWS }, - { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROWS_ROW }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW_GROUP, XML_TOK_TABLE_ROWS_ROW_GROUP }, + { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_ROWS, XML_TOK_TABLE_ROWS_HEADER_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROWS, XML_TOK_TABLE_ROWS_ROWS }, + { XML_NAMESPACE_TABLE, XML_TABLE_ROW, XML_TOK_TABLE_ROWS_ROW }, XML_TOKEN_MAP_END }; @@ -703,10 +703,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableColsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableColsElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS_COL_GROUP }, - { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS_COLS }, - { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLS_COL }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN_GROUP, XML_TOK_TABLE_COLS_COL_GROUP }, + { XML_NAMESPACE_TABLE, XML_TABLE_HEADER_COLUMNS, XML_TOK_TABLE_COLS_HEADER_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMNS, XML_TOK_TABLE_COLS_COLS }, + { XML_NAMESPACE_TABLE, XML_TABLE_COLUMN, XML_TOK_TABLE_COLS_COL }, XML_TOKEN_MAP_END }; @@ -745,14 +745,14 @@ const SvXMLTokenMap& ScXMLImport::GetTableScenarioAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableScenarioAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER }, - { XML_NAMESPACE_TABLE, XML_BORDER_COLOR, XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR }, - { XML_NAMESPACE_TABLE, XML_COPY_BACK, XML_TOK_TABLE_SCENARIO_ATTR_COPY_BACK }, - { XML_NAMESPACE_TABLE, XML_COPY_STYLES, XML_TOK_TABLE_SCENARIO_ATTR_COPY_STYLES }, - { XML_NAMESPACE_TABLE, XML_COPY_FORMULAS, XML_TOK_TABLE_SCENARIO_ATTR_COPY_FORMULAS }, - { XML_NAMESPACE_TABLE, XML_IS_ACTIVE, XML_TOK_TABLE_SCENARIO_ATTR_IS_ACTIVE }, - { XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, XML_TOK_TABLE_SCENARIO_ATTR_SCENARIO_RANGES }, - { XML_NAMESPACE_TABLE, XML_COMMENT, XML_TOK_TABLE_SCENARIO_ATTR_COMMENT }, + { XML_NAMESPACE_TABLE, XML_DISPLAY_BORDER, XML_TOK_TABLE_SCENARIO_ATTR_DISPLAY_BORDER }, + { XML_NAMESPACE_TABLE, XML_BORDER_COLOR, XML_TOK_TABLE_SCENARIO_ATTR_BORDER_COLOR }, + { XML_NAMESPACE_TABLE, XML_COPY_BACK, XML_TOK_TABLE_SCENARIO_ATTR_COPY_BACK }, + { XML_NAMESPACE_TABLE, XML_COPY_STYLES, XML_TOK_TABLE_SCENARIO_ATTR_COPY_STYLES }, + { XML_NAMESPACE_TABLE, XML_COPY_FORMULAS, XML_TOK_TABLE_SCENARIO_ATTR_COPY_FORMULAS }, + { XML_NAMESPACE_TABLE, XML_IS_ACTIVE, XML_TOK_TABLE_SCENARIO_ATTR_IS_ACTIVE }, + { XML_NAMESPACE_TABLE, XML_SCENARIO_RANGES, XML_TOK_TABLE_SCENARIO_ATTR_SCENARIO_RANGES }, + { XML_NAMESPACE_TABLE, XML_COMMENT, XML_TOK_TABLE_SCENARIO_ATTR_COMMENT }, { XML_NAMESPACE_TABLE, XML_PROTECTED, XML_TOK_TABLE_SCENARIO_ATTR_PROTECTED }, XML_TOKEN_MAP_END }; @@ -769,9 +769,9 @@ const SvXMLTokenMap& ScXMLImport::GetTableColAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableColAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_COL_ATTR_REPEATED }, - { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_COL_ATTR_VISIBILITY }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_STYLE_NAME }, + { XML_NAMESPACE_TABLE, XML_NUMBER_COLUMNS_REPEATED, XML_TOK_TABLE_COL_ATTR_REPEATED }, + { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_COL_ATTR_VISIBILITY }, { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_COL_ATTR_DEFAULT_CELL_STYLE_NAME }, XML_TOKEN_MAP_END }; @@ -788,8 +788,8 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableRowTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL }, - { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL }, + { XML_NAMESPACE_TABLE, XML_TABLE_CELL, XML_TOK_TABLE_ROW_CELL }, + { XML_NAMESPACE_TABLE, XML_COVERED_TABLE_CELL, XML_TOK_TABLE_ROW_COVERED_CELL }, XML_TOKEN_MAP_END }; @@ -805,11 +805,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableRowAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_STYLE_NAME }, - { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_VISIBILITY }, - { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, XML_TOK_TABLE_ROW_ATTR_REPEATED }, - { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME }, - // { XML_NAMESPACE_TABLE, XML_USE_OPTIMAL_HEIGHT, XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT }, + { XML_NAMESPACE_TABLE, XML_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_STYLE_NAME }, + { XML_NAMESPACE_TABLE, XML_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_VISIBILITY }, + { XML_NAMESPACE_TABLE, XML_NUMBER_ROWS_REPEATED, XML_TOK_TABLE_ROW_ATTR_REPEATED }, + { XML_NAMESPACE_TABLE, XML_DEFAULT_CELL_STYLE_NAME, XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME }, + // { XML_NAMESPACE_TABLE, XML_USE_OPTIMAL_HEIGHT, XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT }, XML_TOKEN_MAP_END }; @@ -825,11 +825,11 @@ const SvXMLTokenMap& ScXMLImport::GetTableRowCellElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableRowCellTokenMap[] = { - { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TABLE_ROW_CELL_P }, - { XML_NAMESPACE_TABLE, XML_SUB_TABLE, XML_TOK_TABLE_ROW_CELL_TABLE }, - { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_TABLE_ROW_CELL_ANNOTATION }, - { XML_NAMESPACE_TABLE, XML_DETECTIVE, XML_TOK_TABLE_ROW_CELL_DETECTIVE }, - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE }, + { XML_NAMESPACE_TEXT, XML_P, XML_TOK_TABLE_ROW_CELL_P }, + { XML_NAMESPACE_TABLE, XML_SUB_TABLE, XML_TOK_TABLE_ROW_CELL_TABLE }, + { XML_NAMESPACE_OFFICE, XML_ANNOTATION, XML_TOK_TABLE_ROW_CELL_ANNOTATION }, + { XML_NAMESPACE_TABLE, XML_DETECTIVE, XML_TOK_TABLE_ROW_CELL_DETECTIVE }, + { XML_NAMESPACE_TABLE, XML_CELL_RANGE_SOURCE, XML_TOK_TABLE_ROW_CELL_CELL_RANGE_SOURCE }, XML_TOKEN_MAP_END }; @@ -845,10 +845,10 @@ const SvXMLTokenMap& ScXMLImport::GetTableAnnotationAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableAnnotationAttrTokenMap[] = { - { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR }, - { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE }, - { XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING }, - { XML_NAMESPACE_OFFICE, XML_DISPLAY, XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY }, + { XML_NAMESPACE_OFFICE, XML_AUTHOR, XML_TOK_TABLE_ANNOTATION_ATTR_AUTHOR }, + { XML_NAMESPACE_OFFICE, XML_CREATE_DATE, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE }, + { XML_NAMESPACE_OFFICE, XML_CREATE_DATE_STRING, XML_TOK_TABLE_ANNOTATION_ATTR_CREATE_DATE_STRING }, + { XML_NAMESPACE_OFFICE, XML_DISPLAY, XML_TOK_TABLE_ANNOTATION_ATTR_DISPLAY }, { XML_NAMESPACE_SVG, XML_X, XML_TOK_TABLE_ANNOTATION_ATTR_X }, { XML_NAMESPACE_SVG, XML_Y, XML_TOK_TABLE_ANNOTATION_ATTR_Y }, XML_TOKEN_MAP_END @@ -866,8 +866,8 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDetectiveElemTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED }, - { XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION }, + { XML_NAMESPACE_TABLE, XML_HIGHLIGHTED_RANGE, XML_TOK_DETECTIVE_ELEM_HIGHLIGHTED }, + { XML_NAMESPACE_TABLE, XML_OPERATION, XML_TOK_DETECTIVE_ELEM_OPERATION }, XML_TOKEN_MAP_END }; @@ -883,10 +883,10 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveHighlightedAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDetectiveHighlightedAttrTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE }, - { XML_NAMESPACE_TABLE, XML_DIRECTION, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION }, - { XML_NAMESPACE_TABLE, XML_CONTAINS_ERROR, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR }, - { XML_NAMESPACE_TABLE, XML_MARKED_INVALID, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID }, + { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CELL_RANGE }, + { XML_NAMESPACE_TABLE, XML_DIRECTION, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_DIRECTION }, + { XML_NAMESPACE_TABLE, XML_CONTAINS_ERROR, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_CONTAINS_ERROR }, + { XML_NAMESPACE_TABLE, XML_MARKED_INVALID, XML_TOK_DETECTIVE_HIGHLIGHTED_ATTR_MARKED_INVALID }, XML_TOKEN_MAP_END }; @@ -902,8 +902,8 @@ const SvXMLTokenMap& ScXMLImport::GetDetectiveOperationAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDetectiveOperationAttrTokenMap[]= { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DETECTIVE_OPERATION_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_INDEX, XML_TOK_DETECTIVE_OPERATION_ATTR_INDEX }, XML_TOKEN_MAP_END }; @@ -919,13 +919,13 @@ const SvXMLTokenMap& ScXMLImport::GetTableCellRangeSourceAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aTableCellRangeSourceAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME }, - { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF }, - { XML_NAMESPACE_TABLE, XML_FILTER_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME }, - { XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS }, - { XML_NAMESPACE_TABLE, XML_LAST_COLUMN_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN }, - { XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW }, - { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_NAME }, + { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_HREF }, + { XML_NAMESPACE_TABLE, XML_FILTER_NAME, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_NAME }, + { XML_NAMESPACE_TABLE, XML_FILTER_OPTIONS, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_FILTER_OPTIONS }, + { XML_NAMESPACE_TABLE, XML_LAST_COLUMN_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_COLUMN }, + { XML_NAMESPACE_TABLE, XML_LAST_ROW_SPANNED, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_LAST_ROW }, + { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_TABLE_CELL_RANGE_SOURCE_ATTR_REFRESH_DELAY }, XML_TOKEN_MAP_END }; @@ -941,8 +941,8 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionsTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAMED_RANGE, XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE }, - { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION }, + { XML_NAMESPACE_TABLE, XML_NAMED_RANGE, XML_TOK_NAMED_EXPRESSIONS_NAMED_RANGE }, + { XML_NAMESPACE_TABLE, XML_NAMED_EXPRESSION, XML_TOK_NAMED_EXPRESSIONS_NAMED_EXPRESSION }, XML_TOKEN_MAP_END }; @@ -958,10 +958,10 @@ const SvXMLTokenMap& ScXMLImport::GetNamedRangeAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aNamedRangeAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_RANGE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_BASE_CELL_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, XML_TOK_NAMED_RANGE_ATTR_RANGE_USABLE_AS }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_RANGE_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_CELL_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_RANGE_ATTR_BASE_CELL_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_RANGE_USABLE_AS, XML_TOK_NAMED_RANGE_ATTR_RANGE_USABLE_AS }, XML_TOKEN_MAP_END }; @@ -977,9 +977,9 @@ const SvXMLTokenMap& ScXMLImport::GetNamedExpressionAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aNamedExpressionAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_EXPRESSION_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_EXPRESSION, XML_TOK_NAMED_EXPRESSION_ATTR_EXPRESSION }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_NAMED_EXPRESSION_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_BASE_CELL_ADDRESS, XML_TOK_NAMED_EXPRESSION_ATTR_BASE_CELL_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_EXPRESSION, XML_TOK_NAMED_EXPRESSION_ATTR_EXPRESSION }, XML_TOKEN_MAP_END }; @@ -995,7 +995,7 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangesElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangesTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE }, + { XML_NAMESPACE_TABLE, XML_DATABASE_RANGE, XML_TOK_DATABASE_RANGE }, XML_TOKEN_MAP_END }; @@ -1011,12 +1011,12 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATABASE_RANGE_SOURCE_QUERY }, - { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_FILTER }, - { XML_NAMESPACE_TABLE, XML_SORT, XML_TOK_SORT }, - { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, XML_TOK_DATABASE_RANGE_SUBTOTAL_RULES }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATABASE_RANGE_SOURCE_SQL }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATABASE_RANGE_SOURCE_TABLE }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATABASE_RANGE_SOURCE_QUERY }, + { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_FILTER }, + { XML_NAMESPACE_TABLE, XML_SORT, XML_TOK_SORT }, + { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULES, XML_TOK_DATABASE_RANGE_SUBTOTAL_RULES }, XML_TOKEN_MAP_END }; @@ -1032,16 +1032,16 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATABASE_RANGE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_IS_SELECTION, XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION }, - { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_STYLES, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_STYLES }, - { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_SIZE, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_SIZE }, - { XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_TOK_DATABASE_RANGE_ATTR_HAS_PERSISTENT_DATA }, - { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION }, - { XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_FILTER_BUTTONS, XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS }, - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATABASE_RANGE_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_DATABASE_RANGE_ATTR_REFRESH_DELAY }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATABASE_RANGE_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_IS_SELECTION, XML_TOK_DATABASE_RANGE_ATTR_IS_SELECTION }, + { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_STYLES, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_STYLES }, + { XML_NAMESPACE_TABLE, XML_ON_UPDATE_KEEP_SIZE, XML_TOK_DATABASE_RANGE_ATTR_ON_UPDATE_KEEP_SIZE }, + { XML_NAMESPACE_TABLE, XML_HAS_PERSISTENT_DATA, XML_TOK_DATABASE_RANGE_ATTR_HAS_PERSISTENT_DATA }, + { XML_NAMESPACE_TABLE, XML_ORIENTATION, XML_TOK_DATABASE_RANGE_ATTR_ORIENTATION }, + { XML_NAMESPACE_TABLE, XML_CONTAINS_HEADER, XML_TOK_DATABASE_RANGE_ATTR_CONTAINS_HEADER }, + { XML_NAMESPACE_TABLE, XML_DISPLAY_FILTER_BUTTONS, XML_TOK_DATABASE_RANGE_ATTR_DISPLAY_FILTER_BUTTONS }, + { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATABASE_RANGE_ATTR_TARGET_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_REFRESH_DELAY, XML_TOK_DATABASE_RANGE_ATTR_REFRESH_DELAY }, XML_TOKEN_MAP_END }; @@ -1057,11 +1057,11 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceSQLAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceSQLAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME }, + { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_SQL_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_SQL_ATTR_HREF }, { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_SQL_ATTR_CONNECTION_RESSOURCE}, - { XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT }, - { XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT }, + { XML_NAMESPACE_TABLE, XML_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_SQL_STATEMENT }, + { XML_NAMESPACE_TABLE, XML_PARSE_SQL_STATEMENT, XML_TOK_SOURCE_SQL_ATTR_PARSE_SQL_STATEMENT }, XML_TOKEN_MAP_END }; @@ -1077,10 +1077,10 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceTableAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceTableAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME }, + { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_TABLE_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_TABLE_ATTR_HREF }, { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_TABLE_ATTR_CONNECTION_RESSOURCE }, - { XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME }, + { XML_NAMESPACE_TABLE, XML_TABLE_NAME, XML_TOK_SOURCE_TABLE_ATTR_TABLE_NAME }, XML_TOKEN_MAP_END }; @@ -1096,10 +1096,10 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSourceQueryAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSourceQueryAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME }, + { XML_NAMESPACE_TABLE, XML_DATABASE_NAME, XML_TOK_SOURCE_QUERY_ATTR_DATABASE_NAME }, { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_SOURCE_QUERY_ATTR_HREF }, { XML_NAMESPACE_TABLE, XML_CONNECTION_RESOURCE, XML_TOK_SOURCE_QUERY_ATTR_CONNECTION_RESSOURCE }, - { XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME }, + { XML_NAMESPACE_TABLE, XML_QUERY_NAME, XML_TOK_SOURCE_QUERY_ATTR_QUERY_NAME }, XML_TOKEN_MAP_END }; @@ -1115,9 +1115,9 @@ const SvXMLTokenMap& ScXMLImport::GetFilterElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aFilterTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND }, - { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR }, - { XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, XML_TOK_FILTER_CONDITION }, + { XML_NAMESPACE_TABLE, XML_FILTER_AND, XML_TOK_FILTER_AND }, + { XML_NAMESPACE_TABLE, XML_FILTER_OR, XML_TOK_FILTER_OR }, + { XML_NAMESPACE_TABLE, XML_FILTER_CONDITION, XML_TOK_FILTER_CONDITION }, XML_TOKEN_MAP_END }; @@ -1133,10 +1133,10 @@ const SvXMLTokenMap& ScXMLImport::GetFilterAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aFilterAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE, XML_TOK_FILTER_ATTR_CONDITION_SOURCE }, - { XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES }, + { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_TARGET_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE_RANGE_ADDRESS, XML_TOK_FILTER_ATTR_CONDITION_SOURCE_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_CONDITION_SOURCE, XML_TOK_FILTER_ATTR_CONDITION_SOURCE }, + { XML_NAMESPACE_TABLE, XML_DISPLAY_DUPLICATES, XML_TOK_FILTER_ATTR_DISPLAY_DUPLICATES }, XML_TOKEN_MAP_END }; @@ -1152,11 +1152,11 @@ const SvXMLTokenMap& ScXMLImport::GetFilterConditionAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aFilterConditionAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER }, - { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE }, - { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_CONDITION_ATTR_DATA_TYPE }, - { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_CONDITION_ATTR_VALUE }, - { XML_NAMESPACE_TABLE, XML_OPERATOR, XML_TOK_CONDITION_ATTR_OPERATOR }, + { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_CONDITION_ATTR_FIELD_NUMBER }, + { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_CONDITION_ATTR_CASE_SENSITIVE }, + { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_CONDITION_ATTR_DATA_TYPE }, + { XML_NAMESPACE_TABLE, XML_VALUE, XML_TOK_CONDITION_ATTR_VALUE }, + { XML_NAMESPACE_TABLE, XML_OPERATOR, XML_TOK_CONDITION_ATTR_OPERATOR }, XML_TOKEN_MAP_END }; @@ -1172,7 +1172,7 @@ const SvXMLTokenMap& ScXMLImport::GetSortElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSortTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY }, + { XML_NAMESPACE_TABLE, XML_SORT_BY, XML_TOK_SORT_SORT_BY }, XML_TOKEN_MAP_END }; @@ -1188,12 +1188,12 @@ const SvXMLTokenMap& ScXMLImport::GetSortAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSortAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT }, - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SORT_ATTR_CASE_SENSITIVE }, - { XML_NAMESPACE_TABLE, XML_LANGUAGE, XML_TOK_SORT_ATTR_LANGUAGE }, - { XML_NAMESPACE_TABLE, XML_COUNTRY, XML_TOK_SORT_ATTR_COUNTRY }, - { XML_NAMESPACE_TABLE, XML_ALGORITHM, XML_TOK_SORT_ATTR_ALGORITHM }, + { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SORT_ATTR_BIND_STYLES_TO_CONTENT }, + { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_SORT_ATTR_TARGET_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SORT_ATTR_CASE_SENSITIVE }, + { XML_NAMESPACE_TABLE, XML_LANGUAGE, XML_TOK_SORT_ATTR_LANGUAGE }, + { XML_NAMESPACE_TABLE, XML_COUNTRY, XML_TOK_SORT_ATTR_COUNTRY }, + { XML_NAMESPACE_TABLE, XML_ALGORITHM, XML_TOK_SORT_ATTR_ALGORITHM }, XML_TOKEN_MAP_END }; @@ -1209,9 +1209,9 @@ const SvXMLTokenMap& ScXMLImport::GetSortSortByAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSortSortByAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER }, - { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE }, - { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_BY_ATTR_ORDER }, + { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SORT_BY_ATTR_FIELD_NUMBER }, + { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_BY_ATTR_DATA_TYPE }, + { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_BY_ATTR_ORDER }, XML_TOKEN_MAP_END }; @@ -1227,8 +1227,8 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS }, - { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE }, + { XML_NAMESPACE_TABLE, XML_SORT_GROUPS, XML_TOK_SUBTOTAL_RULES_SORT_GROUPS }, + { XML_NAMESPACE_TABLE, XML_SUBTOTAL_RULE, XML_TOK_SUBTOTAL_RULES_SUBTOTAL_RULE }, XML_TOKEN_MAP_END }; @@ -1244,9 +1244,9 @@ const SvXMLTokenMap& ScXMLImport::GetDatabaseRangeSubTotalRulesAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDatabaseRangeSubTotalRulesAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT }, - { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE }, - { XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TOK_SUBTOTAL_RULES_ATTR_PAGE_BREAKS_ON_GROUP_CHANGE }, + { XML_NAMESPACE_TABLE, XML_BIND_STYLES_TO_CONTENT, XML_TOK_SUBTOTAL_RULES_ATTR_BIND_STYLES_TO_CONTENT }, + { XML_NAMESPACE_TABLE, XML_CASE_SENSITIVE, XML_TOK_SUBTOTAL_RULES_ATTR_CASE_SENSITIVE }, + { XML_NAMESPACE_TABLE, XML_PAGE_BREAKS_ON_GROUP_CHANGE, XML_TOK_SUBTOTAL_RULES_ATTR_PAGE_BREAKS_ON_GROUP_CHANGE }, XML_TOKEN_MAP_END }; @@ -1262,8 +1262,8 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSortGroupsAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSortGroupsAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE }, - { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER }, + { XML_NAMESPACE_TABLE, XML_DATA_TYPE, XML_TOK_SORT_GROUPS_ATTR_DATA_TYPE }, + { XML_NAMESPACE_TABLE, XML_ORDER, XML_TOK_SORT_GROUPS_ATTR_ORDER }, XML_TOKEN_MAP_END }; @@ -1279,7 +1279,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD }, + { XML_NAMESPACE_TABLE, XML_SUBTOTAL_FIELD, XML_TOK_SUBTOTAL_RULE_SUBTOTAL_FIELD }, XML_TOKEN_MAP_END }; @@ -1295,7 +1295,7 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRulesSubTotalRuleAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSubTotalRulesSubTotalRuleAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER }, + { XML_NAMESPACE_TABLE, XML_GROUP_BY_FIELD_NUMBER, XML_TOK_SUBTOTAL_RULE_ATTR_GROUP_BY_FIELD_NUMBER }, XML_TOKEN_MAP_END }; @@ -1311,8 +1311,8 @@ const SvXMLTokenMap& ScXMLImport::GetSubTotalRuleSubTotalFieldAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aSubTotalRuleSubTotalFieldAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER }, - { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION }, + { XML_NAMESPACE_TABLE, XML_FIELD_NUMBER, XML_TOK_SUBTOTAL_FIELD_ATTR_FIELD_NUMBER }, + { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_SUBTOTAL_FIELD_ATTR_FUNCTION }, XML_TOKEN_MAP_END }; @@ -1328,7 +1328,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTablesElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTablesElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_TABLE, XML_TOK_DATA_PILOT_TABLE }, XML_TOKEN_MAP_END }; @@ -1344,15 +1344,15 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_TABLE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA }, - { XML_NAMESPACE_TABLE, XML_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL }, - { XML_NAMESPACE_TABLE, XML_IGNORE_EMPTY_ROWS, XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS }, - { XML_NAMESPACE_TABLE, XML_IDENTIFY_CATEGORIES, XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES }, - { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_BUTTONS, XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS }, - { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON }, - { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_DATA_PILOT_TABLE_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_APPLICATION_DATA, XML_TOK_DATA_PILOT_TABLE_ATTR_APPLICATION_DATA }, + { XML_NAMESPACE_TABLE, XML_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ATTR_GRAND_TOTAL }, + { XML_NAMESPACE_TABLE, XML_IGNORE_EMPTY_ROWS, XML_TOK_DATA_PILOT_TABLE_ATTR_IGNORE_EMPTY_ROWS }, + { XML_NAMESPACE_TABLE, XML_IDENTIFY_CATEGORIES, XML_TOK_DATA_PILOT_TABLE_ATTR_IDENTIFY_CATEGORIES }, + { XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, XML_TOK_DATA_PILOT_TABLE_ATTR_TARGET_RANGE_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_BUTTONS, XML_TOK_DATA_PILOT_TABLE_ATTR_BUTTONS }, + { XML_NAMESPACE_TABLE, XML_SHOW_FILTER_BUTTON, XML_TOK_DATA_PILOT_TABLE_ATTR_SHOW_FILTER_BUTTON }, + { XML_NAMESPACE_TABLE, XML_DRILL_DOWN_ON_DOUBLE_CLICK, XML_TOK_DATA_PILOT_TABLE_ATTR_DRILL_DOWN }, { XML_NAMESPACE_TABLE, XML_HEADER_GRID_LAYOUT, XML_TOK_DATA_PILOT_TABLE_ATTR_HEADER_GRID_LAYOUT }, XML_TOKEN_MAP_END }; @@ -1369,13 +1369,13 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_SQL, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SQL }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_TABLE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_TABLE }, { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GRAND_TOTAL, XML_TOK_DATA_PILOT_TABLE_ELEM_GRAND_TOTAL }, - { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY }, - { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE }, - { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD }, + { XML_NAMESPACE_TABLE, XML_DATABASE_SOURCE_QUERY, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_QUERY }, + { XML_NAMESPACE_TABLE, XML_SOURCE_SERVICE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_SERVICE }, + { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE, XML_TOK_DATA_PILOT_TABLE_ELEM_SOURCE_CELL_RANGE }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD, XML_TOK_DATA_PILOT_TABLE_ELEM_DATA_PILOT_FIELD }, XML_TOKEN_MAP_END }; @@ -1391,10 +1391,10 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceServiceAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceServiceAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_SERVICE_ATTR_NAME }, - { XML_NAMESPACE_TABLE, XML_SOURCE_NAME, XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME }, - { XML_NAMESPACE_TABLE, XML_OBJECT_NAME, XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME }, - { XML_NAMESPACE_TABLE, XML_USER_NAME, XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME }, + { XML_NAMESPACE_TABLE, XML_NAME, XML_TOK_SOURCE_SERVICE_ATTR_NAME }, + { XML_NAMESPACE_TABLE, XML_SOURCE_NAME, XML_TOK_SOURCE_SERVICE_ATTR_SOURCE_NAME }, + { XML_NAMESPACE_TABLE, XML_OBJECT_NAME, XML_TOK_SOURCE_SERVICE_ATTR_OBJECT_NAME }, + { XML_NAMESPACE_TABLE, XML_USER_NAME, XML_TOK_SOURCE_SERVICE_ATTR_USER_NAME }, { XML_NAMESPACE_TABLE, XML_PASSWORD, XML_TOK_SOURCE_SERVICE_ATTR_PASSWORD }, XML_TOKEN_MAP_END }; @@ -1430,7 +1430,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS}, + { XML_NAMESPACE_TABLE, XML_CELL_RANGE_ADDRESS, XML_TOK_SOURCE_CELL_RANGE_ATTR_CELL_RANGE_ADDRESS}, XML_TOKEN_MAP_END }; @@ -1446,7 +1446,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotTableSourceCellRangeElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotTableSourceCellRangeElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER}, + { XML_NAMESPACE_TABLE, XML_FILTER, XML_TOK_SOURCE_CELL_RANGE_ELEM_FILTER}, XML_TOKEN_MAP_END }; @@ -1485,7 +1485,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotFieldElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotFieldElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LEVEL, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LEVEL }, { XML_NAMESPACE_TABLE, XML_DATA_PILOT_FIELD_REFERENCE, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_REFERENCE }, { XML_NAMESPACE_TABLE, XML_DATA_PILOT_GROUPS, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_GROUPS }, XML_TOKEN_MAP_END @@ -1503,7 +1503,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY }, + { XML_NAMESPACE_TABLE, XML_SHOW_EMPTY, XML_TOK_DATA_PILOT_LEVEL_ATTR_SHOW_EMPTY }, XML_TOKEN_MAP_END }; @@ -1519,11 +1519,11 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotLevelElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotLevelElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO }, - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTALS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_SUBTOTALS }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBERS, XML_TOK_DATA_PILOT_LEVEL_ELEM_DATA_PILOT_MEMBERS }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_DISPLAY_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_DISPLAY_INFO }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SORT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_SORT_INFO }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_LAYOUT_INFO, XML_TOK_DATA_PILOT_FIELD_ELEM_DATA_PILOT_LAYOUT_INFO }, XML_TOKEN_MAP_END }; @@ -1539,7 +1539,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotSubTotalsElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotSubTotalsElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_SUBTOTAL, XML_TOK_DATA_PILOT_SUBTOTALS_ELEM_DATA_PILOT_SUBTOTAL }, XML_TOKEN_MAP_END }; @@ -1573,7 +1573,7 @@ const SvXMLTokenMap& ScXMLImport::GetDataPilotMembersElemTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aDataPilotMembersElemTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER }, + { XML_NAMESPACE_TABLE, XML_DATA_PILOT_MEMBER, XML_TOK_DATA_PILOT_MEMBERS_ELEM_DATA_PILOT_MEMBER }, XML_TOKEN_MAP_END }; @@ -1609,11 +1609,11 @@ const SvXMLTokenMap& ScXMLImport::GetConsolidationAttrTokenMap() { static __FAR_DATA SvXMLTokenMapEntry aConsolidationAttrTokenMap[] = { - { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_CONSOLIDATION_ATTR_FUNCTION }, - { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES }, - { XML_NAMESPACE_TABLE, XML_TARGET_CELL_ADDRESS, XML_TOK_CONSOLIDATION_ATTR_TARGET_ADDRESS }, - { XML_NAMESPACE_TABLE, XML_USE_LABEL, XML_TOK_CONSOLIDATION_ATTR_USE_LABEL }, - { XML_NAMESPACE_TABLE, XML_LINK_TO_SOURCE_DATA, XML_TOK_CONSOLIDATION_ATTR_LINK_TO_SOURCE }, + { XML_NAMESPACE_TABLE, XML_FUNCTION, XML_TOK_CONSOLIDATION_ATTR_FUNCTION }, + { XML_NAMESPACE_TABLE, XML_SOURCE_CELL_RANGE_ADDRESSES, XML_TOK_CONSOLIDATION_ATTR_SOURCE_RANGES }, + { XML_NAMESPACE_TABLE, XML_TARGET_CELL_ADDRESS, XML_TOK_CONSOLIDATION_ATTR_TARGET_ADDRESS }, + { XML_NAMESPACE_TABLE, XML_USE_LABEL, XML_TOK_CONSOLIDATION_ATTR_USE_LABEL }, + { XML_NAMESPACE_TABLE, XML_LINK_TO_SOURCE_DATA, XML_TOK_CONSOLIDATION_ATTR_LINK_TO_SOURCE }, XML_TOKEN_MAP_END }; @@ -1661,7 +1661,7 @@ SvXMLImportContext *ScXMLImport::CreateContext( USHORT nPrefix, ScXMLImport::ScXMLImport( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > xServiceFactory, const sal_uInt16 nImportFlag) -: SvXMLImport( xServiceFactory, nImportFlag ), +: SvXMLImport( xServiceFactory, nImportFlag ), pDoc( NULL ), pChangeTrackingImportHelper(NULL), pStylesImportHelper(NULL), @@ -1670,9 +1670,9 @@ ScXMLImport::ScXMLImport( sCellStyle(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_CELLSTYL)), sStandardFormat(RTL_CONSTASCII_USTRINGPARAM(SC_STANDARDFORMAT)), sType(RTL_CONSTASCII_USTRINGPARAM(SC_UNONAME_TYPE)), -// pScAutoStylePool(new SvXMLAutoStylePoolP), -// pParaItemMapper( 0 ), -// pI18NMap( new SvI18NMap ), +// pScAutoStylePool(new SvXMLAutoStylePoolP), +// pParaItemMapper( 0 ), +// pI18NMap( new SvI18NMap ), pDocElemTokenMap( 0 ), pStylesElemTokenMap( 0 ), pStylesAttrTokenMap( 0 ), @@ -1797,7 +1797,7 @@ ScXMLImport::ScXMLImport( ScXMLImport::~ScXMLImport() throw() { - // delete pI18NMap; + // delete pI18NMap; delete pDocElemTokenMap; delete pStylesElemTokenMap; delete pStylesAttrTokenMap; @@ -1865,8 +1865,8 @@ ScXMLImport::~ScXMLImport() throw() delete pDataPilotMemberAttrTokenMap; delete pConsolidationAttrTokenMap; - // if (pScAutoStylePool) - // delete pScAutoStylePool; + // if (pScAutoStylePool) + // delete pScAutoStylePool; if (pChangeTrackingImportHelper) delete pChangeTrackingImportHelper; if (pNumberFormatAttributesExportHelper) @@ -2275,19 +2275,19 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa uno::Type aType = aConfigProps[i].Value.getValueType(); uno::Reference<beans::XPropertySet> xImportInfo = getImportInfo(); - + if (xImportInfo.is() && - (aType.equals(getCppuType( + (aType.equals(getCppuType( (uno::Reference<container::XNameContainer> *)0 ) ) || - aType.equals(getCppuType( + aType.equals(getCppuType( (uno::Reference<container::XNameAccess> *)0 ) ) ) ) { - uno::Reference< beans::XPropertySetInfo > xPropertySetInfo = + uno::Reference< beans::XPropertySetInfo > xPropertySetInfo = xImportInfo->getPropertySetInfo(); - if (xPropertySetInfo.is() && + if (xPropertySetInfo.is() && xPropertySetInfo->hasPropertyByName(sSCName) ) { - xImportInfo->setPropertyValue(sSCName, + xImportInfo->setPropertyValue(sSCName, aConfigProps[i].Value ); } } diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 49e89406d8eb..9c4bf644da9a 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -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 @@ -248,7 +248,7 @@ enum ScXMLTableRowAttrTokens XML_TOK_TABLE_ROW_ATTR_VISIBILITY, XML_TOK_TABLE_ROW_ATTR_REPEATED, XML_TOK_TABLE_ROW_ATTR_DEFAULT_CELL_STYLE_NAME -// XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT +// XML_TOK_TABLE_ROW_ATTR_USE_OPTIMAL_HEIGHT }; enum ScXMLTableRowCellTokens @@ -643,134 +643,134 @@ typedef std::list<const ScMyLabelRange*> ScMyLabelRanges; struct ScMyImportValidation { - rtl::OUString sName; - rtl::OUString sImputTitle; - rtl::OUString sImputMessage; - rtl::OUString sErrorTitle; - rtl::OUString sErrorMessage; - rtl::OUString sFormula1; - rtl::OUString sFormula2; + rtl::OUString sName; + rtl::OUString sImputTitle; + rtl::OUString sImputMessage; + rtl::OUString sErrorTitle; + rtl::OUString sErrorMessage; + rtl::OUString sFormula1; + rtl::OUString sFormula2; rtl::OUString sFormulaNmsp1; rtl::OUString sFormulaNmsp2; rtl::OUString sBaseCellAddress; // #b4974740# string is used directly - com::sun::star::sheet::ValidationAlertStyle aAlertStyle; - com::sun::star::sheet::ValidationType aValidationType; - com::sun::star::sheet::ConditionOperator aOperator; + com::sun::star::sheet::ValidationAlertStyle aAlertStyle; + com::sun::star::sheet::ValidationType aValidationType; + com::sun::star::sheet::ConditionOperator aOperator; formula::FormulaGrammar::Grammar eGrammar1; formula::FormulaGrammar::Grammar eGrammar2; sal_Int16 nShowList; - sal_Bool bShowErrorMessage; - sal_Bool bShowImputMessage; - sal_Bool bIgnoreBlanks; + sal_Bool bShowErrorMessage; + sal_Bool bShowImputMessage; + sal_Bool bIgnoreBlanks; }; -typedef std::vector<ScMyImportValidation> ScMyImportValidations; -typedef std::list<SvXMLImportContext*> ScMyViewContextList; +typedef std::vector<ScMyImportValidation> ScMyImportValidations; +typedef std::list<SvXMLImportContext*> ScMyViewContextList; class ScMyStylesImportHelper; class ScXMLImport: public SvXMLImport { - typedef ::std::hash_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; - CellTypeMap aCellTypeMap; - - ScDocument* pDoc; - ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; - ScMyViewContextList aViewContextList; - ScMyStylesImportHelper* pStylesImportHelper; - rtl::OUString sNumberFormat; - rtl::OUString sLocale; - rtl::OUString sCellStyle; - rtl::OUString sStandardFormat; - rtl::OUString sType; - -// SvXMLAutoStylePoolP *pScAutoStylePool; - UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; - UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper; - UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper; -// SvXMLImportContextRef xStyles; -// SvXMLImportContextRef xAutoStyles; - -// SvXMLImportItemMapper *pParaItemMapper;// paragraph item import -// SvI18NMap *pI18NMap; // name mapping for I18N - SvXMLTokenMap *pDocElemTokenMap; - SvXMLTokenMap *pStylesElemTokenMap; - SvXMLTokenMap *pStylesAttrTokenMap; - SvXMLTokenMap *pStyleElemTokenMap; - SvXMLTokenMap *pBodyElemTokenMap; - SvXMLTokenMap *pContentValidationsElemTokenMap; - SvXMLTokenMap *pContentValidationElemTokenMap; - SvXMLTokenMap *pContentValidationAttrTokenMap; - SvXMLTokenMap *pContentValidationMessageElemTokenMap; - SvXMLTokenMap *pContentValidationHelpMessageAttrTokenMap; - SvXMLTokenMap *pContentValidationErrorMessageAttrTokenMap; - SvXMLTokenMap *pContentValidationErrorMacroAttrTokenMap; - SvXMLTokenMap *pLabelRangesElemTokenMap; - SvXMLTokenMap *pLabelRangeAttrTokenMap; - SvXMLTokenMap *pTableElemTokenMap; + typedef ::std::hash_map< ::rtl::OUString, sal_Int16, ::rtl::OUStringHash > CellTypeMap; + CellTypeMap aCellTypeMap; + + ScDocument* pDoc; + ScXMLChangeTrackingImportHelper* pChangeTrackingImportHelper; + ScMyViewContextList aViewContextList; + ScMyStylesImportHelper* pStylesImportHelper; + rtl::OUString sNumberFormat; + rtl::OUString sLocale; + rtl::OUString sCellStyle; + rtl::OUString sStandardFormat; + rtl::OUString sType; + +// SvXMLAutoStylePoolP *pScAutoStylePool; + UniReference < XMLPropertyHandlerFactory > xScPropHdlFactory; + UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xColumnStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xRowStylesPropertySetMapper; + UniReference < XMLPropertySetMapper > xTableStylesPropertySetMapper; +// SvXMLImportContextRef xStyles; +// SvXMLImportContextRef xAutoStyles; + +// SvXMLImportItemMapper *pParaItemMapper;// paragraph item import +// SvI18NMap *pI18NMap; // name mapping for I18N + SvXMLTokenMap *pDocElemTokenMap; + SvXMLTokenMap *pStylesElemTokenMap; + SvXMLTokenMap *pStylesAttrTokenMap; + SvXMLTokenMap *pStyleElemTokenMap; + SvXMLTokenMap *pBodyElemTokenMap; + SvXMLTokenMap *pContentValidationsElemTokenMap; + SvXMLTokenMap *pContentValidationElemTokenMap; + SvXMLTokenMap *pContentValidationAttrTokenMap; + SvXMLTokenMap *pContentValidationMessageElemTokenMap; + SvXMLTokenMap *pContentValidationHelpMessageAttrTokenMap; + SvXMLTokenMap *pContentValidationErrorMessageAttrTokenMap; + SvXMLTokenMap *pContentValidationErrorMacroAttrTokenMap; + SvXMLTokenMap *pLabelRangesElemTokenMap; + SvXMLTokenMap *pLabelRangeAttrTokenMap; + SvXMLTokenMap *pTableElemTokenMap; SvXMLTokenMap *pTableProtectionElemTokenMap; - SvXMLTokenMap *pTableRowsElemTokenMap; - SvXMLTokenMap *pTableColsElemTokenMap; - SvXMLTokenMap *pTableScenarioAttrTokenMap; - SvXMLTokenMap *pTableAttrTokenMap; - SvXMLTokenMap *pTableColAttrTokenMap; - SvXMLTokenMap *pTableRowElemTokenMap; - SvXMLTokenMap *pTableRowAttrTokenMap; - SvXMLTokenMap *pTableRowCellElemTokenMap; - SvXMLTokenMap *pTableRowCellAttrTokenMap; - SvXMLTokenMap *pTableAnnotationAttrTokenMap; - SvXMLTokenMap *pDetectiveElemTokenMap; - SvXMLTokenMap *pDetectiveHighlightedAttrTokenMap; - SvXMLTokenMap *pDetectiveOperationAttrTokenMap; - SvXMLTokenMap *pTableCellRangeSourceAttrTokenMap; - SvXMLTokenMap *pNamedExpressionsElemTokenMap; - SvXMLTokenMap *pNamedRangeAttrTokenMap; - SvXMLTokenMap *pNamedExpressionAttrTokenMap; - SvXMLTokenMap *pDatabaseRangesElemTokenMap; - SvXMLTokenMap *pDatabaseRangeElemTokenMap; - SvXMLTokenMap *pDatabaseRangeAttrTokenMap; - SvXMLTokenMap *pDatabaseRangeSourceSQLAttrTokenMap; - SvXMLTokenMap *pDatabaseRangeSourceTableAttrTokenMap; - SvXMLTokenMap *pDatabaseRangeSourceQueryAttrTokenMap; - SvXMLTokenMap *pFilterElemTokenMap; - SvXMLTokenMap *pFilterAttrTokenMap; - SvXMLTokenMap *pFilterConditionAttrTokenMap; - SvXMLTokenMap *pSortElemTokenMap; - SvXMLTokenMap *pSortAttrTokenMap; - SvXMLTokenMap *pSortSortByAttrTokenMap; - SvXMLTokenMap *pDatabaseRangeSubTotalRulesElemTokenMap; - SvXMLTokenMap *pDatabaseRangeSubTotalRulesAttrTokenMap; - SvXMLTokenMap *pSubTotalRulesSortGroupsAttrTokenMap; - SvXMLTokenMap *pSubTotalRulesSubTotalRuleElemTokenMap; - SvXMLTokenMap *pSubTotalRulesSubTotalRuleAttrTokenMap; - SvXMLTokenMap *pSubTotalRuleSubTotalFieldAttrTokenMap; - SvXMLTokenMap *pDataPilotTablesElemTokenMap; - SvXMLTokenMap *pDataPilotTableAttrTokenMap; - SvXMLTokenMap *pDataPilotTableElemTokenMap; - SvXMLTokenMap *pDataPilotTableSourceServiceAttrTokenMap; + SvXMLTokenMap *pTableRowsElemTokenMap; + SvXMLTokenMap *pTableColsElemTokenMap; + SvXMLTokenMap *pTableScenarioAttrTokenMap; + SvXMLTokenMap *pTableAttrTokenMap; + SvXMLTokenMap *pTableColAttrTokenMap; + SvXMLTokenMap *pTableRowElemTokenMap; + SvXMLTokenMap *pTableRowAttrTokenMap; + SvXMLTokenMap *pTableRowCellElemTokenMap; + SvXMLTokenMap *pTableRowCellAttrTokenMap; + SvXMLTokenMap *pTableAnnotationAttrTokenMap; + SvXMLTokenMap *pDetectiveElemTokenMap; + SvXMLTokenMap *pDetectiveHighlightedAttrTokenMap; + SvXMLTokenMap *pDetectiveOperationAttrTokenMap; + SvXMLTokenMap *pTableCellRangeSourceAttrTokenMap; + SvXMLTokenMap *pNamedExpressionsElemTokenMap; + SvXMLTokenMap *pNamedRangeAttrTokenMap; + SvXMLTokenMap *pNamedExpressionAttrTokenMap; + SvXMLTokenMap *pDatabaseRangesElemTokenMap; + SvXMLTokenMap *pDatabaseRangeElemTokenMap; + SvXMLTokenMap *pDatabaseRangeAttrTokenMap; + SvXMLTokenMap *pDatabaseRangeSourceSQLAttrTokenMap; + SvXMLTokenMap *pDatabaseRangeSourceTableAttrTokenMap; + SvXMLTokenMap *pDatabaseRangeSourceQueryAttrTokenMap; + SvXMLTokenMap *pFilterElemTokenMap; + SvXMLTokenMap *pFilterAttrTokenMap; + SvXMLTokenMap *pFilterConditionAttrTokenMap; + SvXMLTokenMap *pSortElemTokenMap; + SvXMLTokenMap *pSortAttrTokenMap; + SvXMLTokenMap *pSortSortByAttrTokenMap; + SvXMLTokenMap *pDatabaseRangeSubTotalRulesElemTokenMap; + SvXMLTokenMap *pDatabaseRangeSubTotalRulesAttrTokenMap; + SvXMLTokenMap *pSubTotalRulesSortGroupsAttrTokenMap; + SvXMLTokenMap *pSubTotalRulesSubTotalRuleElemTokenMap; + SvXMLTokenMap *pSubTotalRulesSubTotalRuleAttrTokenMap; + SvXMLTokenMap *pSubTotalRuleSubTotalFieldAttrTokenMap; + SvXMLTokenMap *pDataPilotTablesElemTokenMap; + SvXMLTokenMap *pDataPilotTableAttrTokenMap; + SvXMLTokenMap *pDataPilotTableElemTokenMap; + SvXMLTokenMap *pDataPilotTableSourceServiceAttrTokenMap; SvXMLTokenMap *pDataPilotGrandTotalAttrTokenMap; - SvXMLTokenMap *pDataPilotTableSourceCellRangeElemTokenMap; - SvXMLTokenMap *pDataPilotTableSourceCellRangeAttrTokenMap; - SvXMLTokenMap *pDataPilotFieldAttrTokenMap; - SvXMLTokenMap *pDataPilotFieldElemTokenMap; - SvXMLTokenMap *pDataPilotLevelAttrTokenMap; - SvXMLTokenMap *pDataPilotLevelElemTokenMap; - SvXMLTokenMap *pDataPilotSubTotalsElemTokenMap; - SvXMLTokenMap *pDataPilotSubTotalAttrTokenMap; - SvXMLTokenMap *pDataPilotMembersElemTokenMap; - SvXMLTokenMap *pDataPilotMemberAttrTokenMap; - SvXMLTokenMap *pConsolidationAttrTokenMap; - - ScMyTables aTables; - - ScMyNamedExpressions* pMyNamedExpressions; + SvXMLTokenMap *pDataPilotTableSourceCellRangeElemTokenMap; + SvXMLTokenMap *pDataPilotTableSourceCellRangeAttrTokenMap; + SvXMLTokenMap *pDataPilotFieldAttrTokenMap; + SvXMLTokenMap *pDataPilotFieldElemTokenMap; + SvXMLTokenMap *pDataPilotLevelAttrTokenMap; + SvXMLTokenMap *pDataPilotLevelElemTokenMap; + SvXMLTokenMap *pDataPilotSubTotalsElemTokenMap; + SvXMLTokenMap *pDataPilotSubTotalAttrTokenMap; + SvXMLTokenMap *pDataPilotMembersElemTokenMap; + SvXMLTokenMap *pDataPilotMemberAttrTokenMap; + SvXMLTokenMap *pConsolidationAttrTokenMap; + + ScMyTables aTables; + + ScMyNamedExpressions* pMyNamedExpressions; ScMyLabelRanges* pMyLabelRanges; - ScMyImportValidations* pValidations; - ScMyImpDetectiveOpArray* pDetectiveOpArray; + ScMyImportValidations* pValidations; + ScMyImpDetectiveOpArray* pDetectiveOpArray; SolarMutexGuard* pSolarMutexGuard; - std::vector<rtl::OUString> aTableStyles; + std::vector<rtl::OUString> aTableStyles; XMLNumberFormatAttributesExportHelper* pNumberFormatAttributesExportHelper; ScMyStyleNumberFormats* pStyleNumberFormats; com::sun::star::uno::Reference <com::sun::star::util::XNumberFormats> xNumberFormats; @@ -778,16 +778,16 @@ class ScXMLImport: public SvXMLImport com::sun::star::uno::Reference <com::sun::star::sheet::XSheetCellRangeContainer> xSheetCellRanges; - rtl::OUString sEmpty; - rtl::OUString sPrevStyleName; - rtl::OUString sPrevCurrency; - sal_uInt32 nSolarMutexLocked; + rtl::OUString sEmpty; + rtl::OUString sPrevStyleName; + rtl::OUString sPrevCurrency; + sal_uInt32 nSolarMutexLocked; sal_Int32 nProgressCount; - sal_uInt16 nStyleFamilyMask;// Mask of styles to load - sal_Int16 nPrevCellType; - sal_Bool bLoadDoc; // Load doc or styles only - sal_Bool bRemoveLastChar; - sal_Bool bNullDateSetted; + sal_uInt16 nStyleFamilyMask;// Mask of styles to load + sal_Int16 nPrevCellType; + sal_Bool bLoadDoc; // Load doc or styles only + sal_Bool bRemoveLastChar; + sal_Bool bNullDateSetted; sal_Bool bSelfImportingXMLSet; sal_Bool bLatinDefaultStyle; // latin-only number format in default style? sal_Bool bFromWrapper; // called from ScDocShell / ScXMLImportWrapper? @@ -822,8 +822,8 @@ public: const ::rtl::OUString& rLocalName ); SvXMLImportContext *CreateStylesContext(const ::rtl::OUString& rLocalName, const com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList, sal_Bool bAutoStyles ); -// SvXMLImportContext *CreateUseStylesContext(const ::rtl::OUString& rLocalName , -// const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); +// SvXMLImportContext *CreateUseStylesContext(const ::rtl::OUString& rLocalName , +// const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList); SvXMLImportContext *CreateBodyContext( const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList>& xAttrList ); @@ -831,8 +831,8 @@ public: virtual void SetStatistics( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue> & i_rStats); - inline ScDocument* GetDocument() { return pDoc; } - inline const ScDocument* GetDocument() const { return pDoc; } + inline ScDocument* GetDocument() { return pDoc; } + inline const ScDocument* GetDocument() const { return pDoc; } ScMyTables& GetTables() { return aTables; } @@ -843,21 +843,21 @@ public: sal_Int16 GetCellType(const ::rtl::OUString& rStrValue) const; -// SvI18NMap& GetI18NMap() { return *pI18NMap; } +// SvI18NMap& GetI18NMap() { return *pI18NMap; } -// inline const SvXMLImportItemMapper& GetParaItemMapper() const; -// SvXMLImportContext *CreateParaItemImportContext( USHORT nPrefix, -// const ::rtl::OUString& rLocalName, -// const ::com::sun::star::uno::Reference< -// ::com::sun::star::xml::sax::XAttributeList& xAttrList, -// SfxItemSet& rItemSet ); +// inline const SvXMLImportItemMapper& GetParaItemMapper() const; +// SvXMLImportContext *CreateParaItemImportContext( USHORT nPrefix, +// const ::rtl::OUString& rLocalName, +// const ::com::sun::star::uno::Reference< +// ::com::sun::star::xml::sax::XAttributeList& xAttrList, +// SfxItemSet& rItemSet ); UniReference < XMLPropertySetMapper > GetCellStylesPropertySetMapper() const { return xCellStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetColumnStylesPropertySetMapper() const { return xColumnStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetRowStylesPropertySetMapper() const { return xRowStylesPropertySetMapper; } UniReference < XMLPropertySetMapper > GetTableStylesPropertySetMapper() const { return xTableStylesPropertySetMapper; } -// SvXMLImportContextRef GetAutoStyles() const { return xAutoStyles; } -// SvXMLImportContextRef GetStyles() const { return xStyles; } +// SvXMLImportContextRef GetAutoStyles() const { return xAutoStyles; } +// SvXMLImportContextRef GetStyles() const { return xStyles; } const SvXMLTokenMap& GetDocElemTokenMap(); const SvXMLTokenMap& GetBodyElemTokenMap(); @@ -923,13 +923,13 @@ public: const SvXMLTokenMap& GetDataPilotMembersElemTokenMap(); const SvXMLTokenMap& GetDataPilotMemberAttrTokenMap(); const SvXMLTokenMap& GetConsolidationAttrTokenMap(); -// const SvXMLTokenMap& GetTextPElemTokenMap(); -// const SvXMLTokenMap& GetTextPAttrTokenMap(); -// const SvXMLTokenMap& GetStyleStylesElemTokenMap(); -// const SvXMLTokenMap& GetTextListBlockAttrTokenMap(); -// const SvXMLTokenMap& GetTextListBlockElemTokenMap(); +// const SvXMLTokenMap& GetTextPElemTokenMap(); +// const SvXMLTokenMap& GetTextPAttrTokenMap(); +// const SvXMLTokenMap& GetStyleStylesElemTokenMap(); +// const SvXMLTokenMap& GetTextListBlockAttrTokenMap(); +// const SvXMLTokenMap& GetTextListBlockElemTokenMap(); - void AddNamedExpression(const ScMyNamedExpression* pMyNamedExpression) { + void AddNamedExpression(const ScMyNamedExpression* pMyNamedExpression) { if (!pMyNamedExpressions) pMyNamedExpressions = new ScMyNamedExpressions(); pMyNamedExpressions->push_back(pMyNamedExpression); } @@ -947,7 +947,7 @@ public: pValidations->push_back(rValidation); } sal_Bool GetValidation(const rtl::OUString& sName, ScMyImportValidation& aValidation); - inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { + inline ScMyImpDetectiveOpArray* GetDetectiveOpArray() { if (!pDetectiveOpArray) pDetectiveOpArray = new ScMyImpDetectiveOpArray(); return pDetectiveOpArray; } @@ -1010,7 +1010,7 @@ public: void SetRangeOverflowType(sal_uInt32 nType); - sal_Int32 GetRangeType(const rtl::OUString sRangeType) const; + sal_Int32 GetRangeType(const rtl::OUString sRangeType) const; void SetNamedRanges(); void SetLabelRanges(); void AddDefaultNote( const com::sun::star::table::CellAddress& aCell ); diff --git a/sc/source/filter/xml/xmllabri.cxx b/sc/source/filter/xml/xmllabri.cxx index 777190445f6e..0c2e87e9dc46 100644 --- a/sc/source/filter/xml/xmllabri.cxx +++ b/sc/source/filter/xml/xmllabri.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 @@ -63,8 +63,8 @@ SvXMLImportContext* ScXMLLabelRangesContext::CreateChildContext( const OUString& rLName, const uno::Reference< xml::sax::XAttributeList >& xAttrList ) { - SvXMLImportContext* pContext(NULL); - const SvXMLTokenMap& rTokenMap(GetScImport().GetLabelRangesElemTokenMap()); + SvXMLImportContext* pContext(NULL); + const SvXMLTokenMap& rTokenMap(GetScImport().GetLabelRangesElemTokenMap()); switch( rTokenMap.Get( nPrefix, rLName ) ) { @@ -93,15 +93,15 @@ ScXMLLabelRangeContext::ScXMLLabelRangeContext( SvXMLImportContext( rImport, nPrfx, rLName ), bColumnOrientation( sal_False ) { - sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); - const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetLabelRangeAttrTokenMap()); + sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); + const SvXMLTokenMap& rAttrTokenMap(GetScImport().GetLabelRangeAttrTokenMap()); for( sal_Int16 nIndex = 0; nIndex < nAttrCount; ++nIndex ) { - const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); - const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); - OUString aLocalName; - USHORT nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); + const rtl::OUString& sAttrName (xAttrList->getNameByIndex( nIndex )); + const rtl::OUString& sValue (xAttrList->getValueByIndex( nIndex )); + OUString aLocalName; + USHORT nPrefix (GetScImport().GetNamespaceMap().GetKeyByAttrName( sAttrName, &aLocalName )); switch( rAttrTokenMap.Get( nPrefix, aLocalName ) ) { diff --git a/sc/source/filter/xml/xmllabri.hxx b/sc/source/filter/xml/xmllabri.hxx index 2876da98b871..3da2d2c0721d 100644 --- a/sc/source/filter/xml/xmllabri.hxx +++ b/sc/source/filter/xml/xmllabri.hxx @@ -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 @@ -38,8 +38,8 @@ class ScXMLImport; class ScXMLLabelRangesContext : public SvXMLImportContext { private: - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLLabelRangesContext( @@ -48,14 +48,14 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual ~ScXMLLabelRangesContext(); + virtual ~ScXMLLabelRangesContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; @@ -64,12 +64,12 @@ public: class ScXMLLabelRangeContext : public SvXMLImportContext { private: - ::rtl::OUString sLabelRangeStr; - ::rtl::OUString sDataRangeStr; - sal_Bool bColumnOrientation; + ::rtl::OUString sLabelRangeStr; + ::rtl::OUString sDataRangeStr; + sal_Bool bColumnOrientation; - const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } - ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } + const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } + ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } public: ScXMLLabelRangeContext( @@ -78,14 +78,14 @@ public: const ::rtl::OUString& rLName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual ~ScXMLLabelRangeContext(); + virtual ~ScXMLLabelRangeContext(); - virtual SvXMLImportContext* CreateChildContext( + virtual SvXMLImportContext* CreateChildContext( USHORT nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& xAttrList ); - virtual void EndElement(); + virtual void EndElement(); }; #endif diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx index 4d81085bcdfd..4bd8139937ba 100644 --- a/sc/source/filter/xml/xmlnexpi.cxx +++ b/sc/source/filter/xml/xmlnexpi.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,7 +56,7 @@ ScXMLNamedExpressionsContext::ScXMLNamedExpressionsContext( ScXMLImport& rImport ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) : SvXMLImportContext( rImport, nPrfx, rLName ) { -/* sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; +/* sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for( sal_Int16 i=0; i < nAttrCount; ++i ) { const rtl::OUString& sAttrName(xAttrList->getNameByIndex( i )); @@ -175,7 +175,7 @@ SvXMLImportContext *ScXMLNamedRangeContext::CreateChildContext( USHORT nPrefix, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { -/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap(); +/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) { }*/ @@ -238,7 +238,7 @@ SvXMLImportContext *ScXMLNamedExpressionContext::CreateChildContext( USHORT nPre const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList>& /* xAttrList */ ) { -/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap(); +/* const SvXMLTokenMap& rTokenMap = GetScImport().GetTableElemTokenMap(); switch( rTokenMap.Get( nPrefix, rLName ) ) { }*/ diff --git a/sc/source/filter/xml/xmlnexpi.hxx b/sc/source/filter/xml/xmlnexpi.hxx index 2e66030d44c5..2d6bc01a5fff 100644 --- a/sc/source/filter/xml/xmlnexpi.hxx +++ b/sc/source/filter/xml/xmlnexpi.hxx @@ -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/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx index 4d1b2042a607..91bf4dd19fd3 100644 --- a/sc/source/filter/xml/xmlrowi.cxx +++ b/sc/source/filter/xml/xmlrowi.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 @@ -133,7 +133,7 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( USHORT nPrefix, switch( rTokenMap.Get( nPrefix, rLName ) ) { case XML_TOK_TABLE_ROW_CELL: -// if( IsInsertCellPossible() ) +// if( IsInsertCellPossible() ) { bHasCell = sal_True; pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, @@ -143,7 +143,7 @@ SvXMLImportContext *ScXMLTableRowContext::CreateChildContext( USHORT nPrefix, } break; case XML_TOK_TABLE_ROW_COVERED_CELL: -// if( IsInsertCellPossible() ) +// if( IsInsertCellPossible() ) { bHasCell = sal_True; pContext = new ScXMLTableRowCellContext( GetScImport(), nPrefix, @@ -172,7 +172,6 @@ void ScXMLTableRowContext::EndElement() sal_Int32 nSheet = rXMLImport.GetTables().GetCurrentSheet(); sal_Int32 nCurrentRow(rXMLImport.GetTables().GetCurrentRow()); uno::Reference<sheet::XSpreadsheet> xSheet(rXMLImport.GetTables().GetCurrentXSheet()); - ScDocument* pDoc = rXMLImport.GetDocument(); if(xSheet.is()) { sal_Int32 nFirstRow(nCurrentRow - nRepeatedRows + 1); @@ -220,18 +219,10 @@ void ScXMLTableRowContext::EndElement() bVisible = sal_False; bFiltered = sal_True; } - - // #i116164# call SetRowHidden/SetRowFiltered directly, so the tree doesn't have to be rebuilt - // to compare with existing hidden flags. - if (!bVisible && pDoc) - pDoc->SetRowHidden((SCROW)nFirstRow, (SCROW)nCurrentRow, (SCTAB)nSheet, true); - if (bFiltered && pDoc) - pDoc->SetRowFiltered((SCROW)nFirstRow, (SCROW)nCurrentRow, (SCTAB)nSheet, true); - - //if (!bVisible) - // xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); - //if (bFiltered) - // xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); + if (!bVisible) + xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISVISIBLE)), uno::makeAny(bVisible)); + if (bFiltered) + xRowProperties->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_ISFILTERED)), uno::makeAny(bFiltered)); } } } diff --git a/sc/source/filter/xml/xmlrowi.hxx b/sc/source/filter/xml/xmlrowi.hxx index f72618d0e9ef..d02141b05f13 100644 --- a/sc/source/filter/xml/xmlrowi.hxx +++ b/sc/source/filter/xml/xmlrowi.hxx @@ -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/xml/xmlsceni.cxx b/sc/source/filter/xml/xmlsceni.cxx index 3235941af5b2..5e2d19b470d2 100644 --- a/sc/source/filter/xml/xmlsceni.cxx +++ b/sc/source/filter/xml/xmlsceni.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 @@ -147,7 +147,7 @@ SvXMLImportContext *ScXMLTableScenarioContext::CreateChildContext( void ScXMLTableScenarioContext::EndElement() { SCTAB nCurrTable( sal::static_int_cast<SCTAB>( GetScImport().GetTables().GetCurrentSheet() ) ); - ScDocument* pDoc(GetScImport().GetDocument()); + ScDocument* pDoc(GetScImport().GetDocument()); if (pDoc) { pDoc->SetScenario( nCurrTable, TRUE ); diff --git a/sc/source/filter/xml/xmlsceni.hxx b/sc/source/filter/xml/xmlsceni.hxx index bec95988d72d..84844a7e06d7 100644 --- a/sc/source/filter/xml/xmlsceni.hxx +++ b/sc/source/filter/xml/xmlsceni.hxx @@ -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 @@ -38,14 +38,14 @@ class ScXMLImport; class ScXMLTableScenarioContext : public SvXMLImportContext { private: - rtl::OUString sComment; - Color aBorderColor; - ScRangeList aScenarioRanges; - sal_Bool bDisplayBorder; - sal_Bool bCopyBack; - sal_Bool bCopyStyles; - sal_Bool bCopyFormulas; - sal_Bool bIsActive; + rtl::OUString sComment; + Color aBorderColor; + ScRangeList aScenarioRanges; + sal_Bool bDisplayBorder; + sal_Bool bCopyBack; + sal_Bool bCopyStyles; + sal_Bool bCopyFormulas; + sal_Bool bIsActive; sal_Bool bProtected; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlsorti.cxx b/sc/source/filter/xml/xmlsorti.cxx index bf1f0427854d..ceb4550852aa 100644 --- a/sc/source/filter/xml/xmlsorti.cxx +++ b/sc/source/filter/xml/xmlsorti.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/xml/xmlsorti.hxx b/sc/source/filter/xml/xmlsorti.hxx index 27ec77c89226..455e15fb0a6f 100644 --- a/sc/source/filter/xml/xmlsorti.hxx +++ b/sc/source/filter/xml/xmlsorti.hxx @@ -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,14 +43,14 @@ class ScXMLSortContext : public SvXMLImportContext com::sun::star::uno::Sequence <com::sun::star::util::SortField> aSortFields; com::sun::star::table::CellAddress aOutputPosition; - rtl::OUString sCountry; - rtl::OUString sLanguage; - rtl::OUString sAlgorithm; - sal_Int16 nUserListIndex; - sal_Bool bCopyOutputData; - sal_Bool bBindFormatsToContent; - sal_Bool bIsCaseSensitive; - sal_Bool bEnabledUserList; + rtl::OUString sCountry; + rtl::OUString sLanguage; + rtl::OUString sAlgorithm; + sal_Int16 nUserListIndex; + sal_Bool bCopyOutputData; + sal_Bool bBindFormatsToContent; + sal_Bool bIsCaseSensitive; + sal_Bool bEnabledUserList; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -79,9 +79,9 @@ class ScXMLSortByContext : public SvXMLImportContext { ScXMLSortContext* pSortContext; - rtl::OUString sFieldNumber; - rtl::OUString sDataType; - rtl::OUString sOrder; + rtl::OUString sFieldNumber; + rtl::OUString sDataType; + rtl::OUString sOrder; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx index f686ed36bf9b..25dcd6e1f30f 100644 --- a/sc/source/filter/xml/xmlstyle.cxx +++ b/sc/source/filter/xml/xmlstyle.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 @@ -71,7 +71,7 @@ using ::rtl::OUString; #define MAP(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_010 } #define MAP_EXT(name,prefix,token,type,context) { name, sizeof(name)-1, prefix, token, type, context, SvtSaveOptions::ODFVER_LATEST } -#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 } +#define MAP_END() { NULL, 0, 0, XML_TOKEN_INVALID, 0, 0, SvtSaveOptions::ODFVER_010 } const XMLPropertyMapEntry aXMLScCellStylesProperties[] = { @@ -105,7 +105,7 @@ const XMLPropertyMapEntry aXMLScCellStylesProperties[] = MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_ALLPADDING ), MAP( "ParaBottomMargin", XML_NAMESPACE_FO, XML_PADDING_BOTTOM, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_BOTTOMPADDING ), MAP( "ParaIndent", XML_NAMESPACE_FO, XML_MARGIN_LEFT, XML_TYPE_PROP_PARAGRAPH|XML_TYPE_MEASURE16, 0 ), -// MAP( "ParaIsHyphenation", XML_NAMESPACE_FO, XML_HYPHENATE, XML_TYPE_PROP_TEXT|XML_TYPE_BOOL, 0 ), +// MAP( "ParaIsHyphenation", XML_NAMESPACE_FO, XML_HYPHENATE, XML_TYPE_PROP_TEXT|XML_TYPE_BOOL, 0 ), MAP( "ParaLeftMargin", XML_NAMESPACE_FO, XML_PADDING_LEFT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_LEFTPADDING ), MAP( "ParaRightMargin", XML_NAMESPACE_FO, XML_PADDING_RIGHT, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_RIGHTPADDING ), MAP( "ParaTopMargin", XML_NAMESPACE_FO, XML_PADDING_TOP, XML_TYPE_PROP_TABLE_CELL|XML_TYPE_MEASURE, CTF_SC_TOPPADDING ), @@ -132,7 +132,7 @@ const XMLPropertyMapEntry aXMLScColumnStylesProperties[] = MAP( "IsManualPageBreak", XML_NAMESPACE_FO, XML_BREAK_BEFORE, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_BREAKBEFORE, 0), MAP( "IsVisible", XML_NAMESPACE_TABLE, XML_DISPLAY, XML_TYPE_PROP_TABLE_COLUMN|XML_SC_TYPE_EQUAL|MID_FLAG_SPECIAL_ITEM, CTF_SC_ISVISIBLE ), MAP( "Width", XML_NAMESPACE_STYLE, XML_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_MEASURE, 0 ), -// MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), +// MAP( "OptimalWidth", XML_NAMESPACE_STYLE, XML_USE_OPTIMAL_COLUMN_WIDTH, XML_TYPE_PROP_TABLE_COLUMN|XML_TYPE_BOOL, 0), MAP_END() }; @@ -252,31 +252,31 @@ void ScXMLCellExportPropertyMapper::ContextFilter( { switch( getPropertySetMapper()->GetEntryContextId( propertie->mnIndex ) ) { - case CTF_SC_ALLPADDING: pPadding = propertie; break; - case CTF_SC_BOTTOMPADDING: pPadding_Bottom = propertie; break; - case CTF_SC_LEFTPADDING: pPadding_Left = propertie; break; - case CTF_SC_RIGHTPADDING: pPadding_Right = propertie; break; - case CTF_SC_TOPPADDING: pPadding_Top = propertie; break; - case CTF_SC_ALLBORDER: pBorder = propertie; break; - case CTF_SC_LEFTBORDER: pBorder_Left = propertie; break; - case CTF_SC_RIGHTBORDER: pBorder_Right = propertie; break; - case CTF_SC_BOTTOMBORDER: pBorder_Bottom = propertie; break; - case CTF_SC_TOPBORDER: pBorder_Top = propertie; break; - case CTF_SC_ALLBORDERWIDTH: pAllBorderWidthState = propertie; break; - case CTF_SC_LEFTBORDERWIDTH: pLeftBorderWidthState = propertie; break; - case CTF_SC_RIGHTBORDERWIDTH: pRightBorderWidthState = propertie; break; - case CTF_SC_TOPBORDERWIDTH: pTopBorderWidthState = propertie; break; - case CTF_SC_BOTTOMBORDERWIDTH: pBottomBorderWidthState = propertie; break; - case CTF_ALLBORDER: pSWBorder = propertie; break; - case CTF_LEFTBORDER: pSWBorder_Left = propertie; break; - case CTF_RIGHTBORDER: pSWBorder_Right = propertie; break; - case CTF_BOTTOMBORDER: pSWBorder_Bottom = propertie; break; - case CTF_TOPBORDER: pSWBorder_Top = propertie; break; - case CTF_ALLBORDERWIDTH: pSWAllBorderWidthState = propertie; break; - case CTF_LEFTBORDERWIDTH: pSWLeftBorderWidthState = propertie; break; - case CTF_RIGHTBORDERWIDTH: pSWRightBorderWidthState = propertie; break; - case CTF_TOPBORDERWIDTH: pSWTopBorderWidthState = propertie; break; - case CTF_BOTTOMBORDERWIDTH: pSWBottomBorderWidthState = propertie; break; + case CTF_SC_ALLPADDING: pPadding = propertie; break; + case CTF_SC_BOTTOMPADDING: pPadding_Bottom = propertie; break; + case CTF_SC_LEFTPADDING: pPadding_Left = propertie; break; + case CTF_SC_RIGHTPADDING: pPadding_Right = propertie; break; + case CTF_SC_TOPPADDING: pPadding_Top = propertie; break; + case CTF_SC_ALLBORDER: pBorder = propertie; break; + case CTF_SC_LEFTBORDER: pBorder_Left = propertie; break; + case CTF_SC_RIGHTBORDER: pBorder_Right = propertie; break; + case CTF_SC_BOTTOMBORDER: pBorder_Bottom = propertie; break; + case CTF_SC_TOPBORDER: pBorder_Top = propertie; break; + case CTF_SC_ALLBORDERWIDTH: pAllBorderWidthState = propertie; break; + case CTF_SC_LEFTBORDERWIDTH: pLeftBorderWidthState = propertie; break; + case CTF_SC_RIGHTBORDERWIDTH: pRightBorderWidthState = propertie; break; + case CTF_SC_TOPBORDERWIDTH: pTopBorderWidthState = propertie; break; + case CTF_SC_BOTTOMBORDERWIDTH: pBottomBorderWidthState = propertie; break; + case CTF_ALLBORDER: pSWBorder = propertie; break; + case CTF_LEFTBORDER: pSWBorder_Left = propertie; break; + case CTF_RIGHTBORDER: pSWBorder_Right = propertie; break; + case CTF_BOTTOMBORDER: pSWBorder_Bottom = propertie; break; + case CTF_TOPBORDER: pSWBorder_Top = propertie; break; + case CTF_ALLBORDERWIDTH: pSWAllBorderWidthState = propertie; break; + case CTF_LEFTBORDERWIDTH: pSWLeftBorderWidthState = propertie; break; + case CTF_RIGHTBORDERWIDTH: pSWRightBorderWidthState = propertie; break; + case CTF_TOPBORDERWIDTH: pSWTopBorderWidthState = propertie; break; + case CTF_BOTTOMBORDERWIDTH: pSWBottomBorderWidthState = propertie; break; case CTF_SC_DIAGONALTLBR: pDiagonalTLBR = propertie; break; case CTF_SC_DIAGONALTLBRWIDTH: pDiagonalTLBRWidthState = propertie; break; case CTF_SC_DIAGONALBLTR: pDiagonalBLTR = propertie; break; @@ -546,7 +546,7 @@ void ScXMLRowExportPropertyMapper::ContextFilter( { //#108550#; don't filter the height, so other applications know the calculated height -/* XMLPropertyState* pHeight = NULL; +/* XMLPropertyState* pHeight = NULL; XMLPropertyState* pOptimalHeight = NULL; for( ::std::vector< XMLPropertyState >::iterator propertie = rProperties.begin(); @@ -555,8 +555,8 @@ void ScXMLRowExportPropertyMapper::ContextFilter( { switch( getPropertySetMapper()->GetEntryContextId( propertie->mnIndex ) ) { - case CTF_SC_ROWHEIGHT: pHeight = propertie; break; - case CTF_SC_ROWOPTIMALHEIGHT: pOptimalHeight = propertie; break; + case CTF_SC_ROWHEIGHT: pHeight = propertie; break; + case CTF_SC_ROWOPTIMALHEIGHT: pOptimalHeight = propertie; break; } } if ((pHeight && pOptimalHeight && ::cppu::any2bool( pOptimalHeight->maValue )) || diff --git a/sc/source/filter/xml/xmlstyle.hxx b/sc/source/filter/xml/xmlstyle.hxx index 07a4d307a2c3..aa7c9dc2e45c 100644 --- a/sc/source/filter/xml/xmlstyle.hxx +++ b/sc/source/filter/xml/xmlstyle.hxx @@ -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 @@ -46,9 +46,9 @@ extern const XMLPropertyMapEntry aXMLScTableStylesProperties[]; extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[]; //CellStyles -#define XML_SC_TYPE_CELLPROTECTION (XML_SC_TYPES_START + 1) -#define XML_SC_TYPE_PRINTCONTENT (XML_SC_TYPES_START + 2) -#define XML_SC_TYPE_HORIJUSTIFY (XML_SC_TYPES_START + 3) +#define XML_SC_TYPE_CELLPROTECTION (XML_SC_TYPES_START + 1) +#define XML_SC_TYPE_PRINTCONTENT (XML_SC_TYPES_START + 2) +#define XML_SC_TYPE_HORIJUSTIFY (XML_SC_TYPES_START + 3) #define XML_SC_TYPE_HORIJUSTIFY_METHOD (XML_SC_TYPES_START + 4) #define XML_SC_TYPE_HORIJUSTIFYSOURCE (XML_SC_TYPES_START + 5) #define XML_SC_TYPE_HORIJUSTIFYREPEAT (XML_SC_TYPES_START + 6) @@ -65,46 +65,46 @@ extern const XMLPropertyMapEntry aXMLScTableStylesImportProperties[]; #define XML_SC_TYPE_EQUAL (XML_SC_TYPES_START + 17) #define XML_SC_TYPE_VERTICAL (XML_SC_TYPES_START + 18) -#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1) -#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2) -#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3) -#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4) -#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5) -#define CTF_SC_RIGHTPADDING (XML_SC_CTF_START + 6) -#define CTF_SC_TOPPADDING (XML_SC_CTF_START + 7) -#define CTF_SC_ALLBORDER (XML_SC_CTF_START + 8) -#define CTF_SC_LEFTBORDER (XML_SC_CTF_START + 9) -#define CTF_SC_RIGHTBORDER (XML_SC_CTF_START + 10) -#define CTF_SC_TOPBORDER (XML_SC_CTF_START + 11) -#define CTF_SC_BOTTOMBORDER (XML_SC_CTF_START + 12) -#define CTF_SC_ALLBORDERWIDTH (XML_SC_CTF_START + 13) -#define CTF_SC_LEFTBORDERWIDTH (XML_SC_CTF_START + 14) -#define CTF_SC_RIGHTBORDERWIDTH (XML_SC_CTF_START + 15) -#define CTF_SC_TOPBORDERWIDTH (XML_SC_CTF_START + 16) -#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17) -#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18) -#define CTF_SC_MAP (XML_SC_CTF_START + 19) -#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20) -#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21) -#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22) -#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23) -#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24) -#define CTF_SC_DIAGONALTLBR (XML_SC_CTF_START + 25) -#define CTF_SC_DIAGONALTLBRWIDTH (XML_SC_CTF_START + 26) -#define CTF_SC_DIAGONALBLTR (XML_SC_CTF_START + 27) -#define CTF_SC_DIAGONALBLTRWIDTH (XML_SC_CTF_START + 28) +#define CTF_SC_HORIJUSTIFY (XML_SC_CTF_START + 1) +#define CTF_SC_HORIJUSTIFY_SOURCE (XML_SC_CTF_START + 2) +#define CTF_SC_ALLPADDING (XML_SC_CTF_START + 3) +#define CTF_SC_BOTTOMPADDING (XML_SC_CTF_START + 4) +#define CTF_SC_LEFTPADDING (XML_SC_CTF_START + 5) +#define CTF_SC_RIGHTPADDING (XML_SC_CTF_START + 6) +#define CTF_SC_TOPPADDING (XML_SC_CTF_START + 7) +#define CTF_SC_ALLBORDER (XML_SC_CTF_START + 8) +#define CTF_SC_LEFTBORDER (XML_SC_CTF_START + 9) +#define CTF_SC_RIGHTBORDER (XML_SC_CTF_START + 10) +#define CTF_SC_TOPBORDER (XML_SC_CTF_START + 11) +#define CTF_SC_BOTTOMBORDER (XML_SC_CTF_START + 12) +#define CTF_SC_ALLBORDERWIDTH (XML_SC_CTF_START + 13) +#define CTF_SC_LEFTBORDERWIDTH (XML_SC_CTF_START + 14) +#define CTF_SC_RIGHTBORDERWIDTH (XML_SC_CTF_START + 15) +#define CTF_SC_TOPBORDERWIDTH (XML_SC_CTF_START + 16) +#define CTF_SC_BOTTOMBORDERWIDTH (XML_SC_CTF_START + 17) +#define CTF_SC_NUMBERFORMAT (XML_SC_CTF_START + 18) +#define CTF_SC_MAP (XML_SC_CTF_START + 19) +#define CTF_SC_PARAINDENT (XML_SC_CTF_START + 20) +#define CTF_SC_OLDTEXTBACKGROUND (XML_SC_CTF_START + 21) +#define CTF_SC_IMPORT_MAP (XML_SC_CTF_START + 22) +#define CTF_SC_CELLSTYLE (XML_SC_CTF_START + 23) +#define CTF_SC_VALIDATION (XML_SC_CTF_START + 24) +#define CTF_SC_DIAGONALTLBR (XML_SC_CTF_START + 25) +#define CTF_SC_DIAGONALTLBRWIDTH (XML_SC_CTF_START + 26) +#define CTF_SC_DIAGONALBLTR (XML_SC_CTF_START + 27) +#define CTF_SC_DIAGONALBLTRWIDTH (XML_SC_CTF_START + 28) #define CTF_SC_DIAGONALTLBRWIDTHS (XML_SC_CTF_START + 29) #define CTF_SC_DIAGONALBLTRWIDTHS (XML_SC_CTF_START + 30) -#define CTF_SC_ROWHEIGHT (XML_SC_CTF_START + 50) -#define CTF_SC_ROWOPTIMALHEIGHT (XML_SC_CTF_START + 51) -#define CTF_SC_ROWBREAKBEFORE (XML_SC_CTF_START + 52) -#define CTF_SC_ISVISIBLE (XML_SC_CTF_START + 53) +#define CTF_SC_ROWHEIGHT (XML_SC_CTF_START + 50) +#define CTF_SC_ROWOPTIMALHEIGHT (XML_SC_CTF_START + 51) +#define CTF_SC_ROWBREAKBEFORE (XML_SC_CTF_START + 52) +#define CTF_SC_ISVISIBLE (XML_SC_CTF_START + 53) -#define CTF_SC_MASTERPAGENAME (XML_SC_CTF_START + 53) +#define CTF_SC_MASTERPAGENAME (XML_SC_CTF_START + 53) //ColumnStyles -#define XML_SC_TYPE_BREAKBEFORE (XML_SC_TYPES_START + 50) +#define XML_SC_TYPE_BREAKBEFORE (XML_SC_TYPES_START + 50) class ScXMLExport; class ScXMLImport; diff --git a/sc/source/filter/xml/xmlstyli.cxx b/sc/source/filter/xml/xmlstyli.cxx index ffecefb2d653..4e1bd93b462e 100644 --- a/sc/source/filter/xml/xmlstyli.cxx +++ b/sc/source/filter/xml/xmlstyli.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 @@ -250,9 +250,9 @@ void ScXMLRowImportPropertyMapper::finished(::std::vector< XMLPropertyState >& r sal_Int16 nContextID = getPropertySetMapper()->GetEntryContextId(property->mnIndex); switch (nContextID) { - case CTF_SC_ROWHEIGHT : pHeight = property; break; - case CTF_SC_ROWOPTIMALHEIGHT : pOptimalHeight = property; break; - case CTF_SC_ROWBREAKBEFORE : pPageBreak = property; break; + case CTF_SC_ROWHEIGHT : pHeight = property; break; + case CTF_SC_ROWOPTIMALHEIGHT : pOptimalHeight = property; break; + case CTF_SC_ROWBREAKBEFORE : pPageBreak = property; break; } } } @@ -302,7 +302,7 @@ public: }; ScXMLMapContext::ScXMLMapContext(SvXMLImport& rImport, sal_uInt16 nPrfx, - const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) + const OUString& rLName, const uno::Reference< xml::sax::XAttributeList > & xAttrList ) : SvXMLImportContext( rImport, nPrfx, rLName ) { sal_Int16 nAttrCount(xAttrList.is() ? xAttrList->getLength() : 0); diff --git a/sc/source/filter/xml/xmlstyli.hxx b/sc/source/filter/xml/xmlstyli.hxx index f483e7734f25..7ab9bd66b827 100644 --- a/sc/source/filter/xml/xmlstyli.hxx +++ b/sc/source/filter/xml/xmlstyli.hxx @@ -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,7 +56,7 @@ public: virtual ~ScXMLCellImportPropertyMapper(); /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_IMPORT flag set */ -/* virtual sal_Bool handleSpecialItem( +/* virtual sal_Bool handleSpecialItem( XMLPropertyState& rProperty, ::std::vector< XMLPropertyState >& rProperties, const ::rtl::OUString& rValue, @@ -64,7 +64,7 @@ public: const SvXMLNamespaceMap& rNamespaceMap ) const;*/ /** this method is called for every item that has the MID_FLAG_NO_ITEM_IMPORT flag set */ -/* virtual sal_Bool handleNoItem( +/* virtual sal_Bool handleNoItem( sal_Int32 nIndex, ::std::vector< XMLPropertyState >& rProperties, const ::rtl::OUString& rValue, @@ -95,16 +95,16 @@ struct ScXMLMapContent; class XMLTableStyleContext : public XMLPropStyleContext { - ::rtl::OUString sDataStyleName; - rtl::OUString sPageStyle; - const rtl::OUString sNumberFormat; - SvXMLStylesContext* pStyles; - std::vector<ScXMLMapContent> aMaps; - com::sun::star::uno::Any aConditionalFormat; - sal_Int32 nNumberFormat; + ::rtl::OUString sDataStyleName; + rtl::OUString sPageStyle; + const rtl::OUString sNumberFormat; + SvXMLStylesContext* pStyles; + std::vector<ScXMLMapContent> aMaps; + com::sun::star::uno::Any aConditionalFormat; + sal_Int32 nNumberFormat; sal_Int32 nLastSheet; - sal_Bool bConditionalFormatCreated; - sal_Bool bParentSet; + sal_Bool bConditionalFormatCreated; + sal_Bool bParentSet; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } ScXMLImport& GetScImport() { return (ScXMLImport&)GetImport(); } @@ -210,7 +210,7 @@ protected: const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList ); -// virtual SvXMLImportPropertyMapper *GetImpPropMapper(); +// virtual SvXMLImportPropertyMapper *GetImpPropMapper(); public: @@ -221,7 +221,7 @@ public: virtual ~XMLTableStylesContext(); // Create child element. -/* virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, +/* virtual SvXMLImportContext *CreateChildContext( sal_uInt16 nPrefix, const ::rtl::OUString& rLocalName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList );*/ @@ -272,9 +272,9 @@ namespace com { namespace sun { namespace star { class ScMasterPageContext : public XMLTextMasterPageContext { com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet> xPropSet; - const rtl::OUString sEmpty; - sal_Bool bContainsRightHeader; - sal_Bool bContainsRightFooter; + const rtl::OUString sEmpty; + sal_Bool bContainsRightHeader; + sal_Bool bContainsRightFooter; void ClearContent(const rtl::OUString& rContent); public: diff --git a/sc/source/filter/xml/xmlsubti.cxx b/sc/source/filter/xml/xmlsubti.cxx index d3e949acabd0..ebd7b4308391 100644 --- a/sc/source/filter/xml/xmlsubti.cxx +++ b/sc/source/filter/xml/xmlsubti.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 @@ -69,7 +69,7 @@ using ::std::auto_ptr; using namespace com::sun::star; ScMyTableData::ScMyTableData(sal_Int32 nSheet, sal_Int32 nCol, sal_Int32 nRow) - : nColsPerCol(nDefaultColCount, 1), + : nColsPerCol(nDefaultColCount, 1), nRealCols(nDefaultColCount + 1, 0), nRowsPerRow(nDefaultRowCount, 1), nRealRows(nDefaultRowCount + 1, 0), @@ -465,7 +465,7 @@ void ScMyTables::InsertColumn() //insert Cell sheet::CellInsertMode aCellInsertMode(sheet::CellInsertMode_RIGHT); - uno::Reference <sheet::XCellRangeMovement> xCellRangeMovement (xCurrentSheet, uno::UNO_QUERY); + uno::Reference <sheet::XCellRangeMovement> xCellRangeMovement (xCurrentSheet, uno::UNO_QUERY); xCellRangeMovement->insertCells(aTempCellAddress, aCellInsertMode); //merge @@ -493,7 +493,7 @@ void ScMyTables::NewColumn(sal_Bool bIsCovered) { sal_Int32 FirstColsSpanned(nSpannedCols / nColCount); sal_Int32 LastColSpanned(FirstColsSpanned - + (nSpannedCols % nColCount)); + + (nSpannedCols % nColCount)); for (sal_Int32 i = 0; i < nColCount - 1; ++i) { aTableVec[nTableCount - 1]->SetColsPerCol(i, FirstColsSpanned); @@ -537,7 +537,7 @@ void ScMyTables::AddColumn(sal_Bool bIsCovered) else { NewColumn(bIsCovered); - // if (!bIsCovered) + // if (!bIsCovered) aTableVec[nTableCount - 1]->SetRealCols(aTableVec[nTableCount - 1]->GetColumn() + 1, aTableVec[nTableCount - 1]->GetRealCols(aTableVec[nTableCount - 1]->GetColumn()) + aTableVec[nTableCount - 1]->GetColsPerCol(aTableVec[nTableCount - 1]->GetColumn())); @@ -690,7 +690,7 @@ void ScMyTables::DeleteTable() rImport.GetDocument()->RenameTab( static_cast<SCTAB>(nCurrentSheet), sCurrentSheetName, sal_False, sal_True); -/* rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Could not create a table with the name ")); +/* rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Could not create a table with the name ")); sErrorMessage += sCurrentSheetName; sErrorMessage += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(". The new name is ")); sErrorMessage += sCurrentName; diff --git a/sc/source/filter/xml/xmlsubti.hxx b/sc/source/filter/xml/xmlsubti.hxx index 6268a874d357..580a53bd542a 100644 --- a/sc/source/filter/xml/xmlsubti.hxx +++ b/sc/source/filter/xml/xmlsubti.hxx @@ -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 @@ -55,40 +55,40 @@ const ScMysalIntVec::size_type nDefaultTabCount = 10; class ScMyTableData { private: - com::sun::star::table::CellAddress aTableCellPos; - ScMysalIntVec nColsPerCol; - ScMysalIntVec nRealCols; - ScMysalIntVec nRowsPerRow; - ScMysalIntVec nRealRows; - sal_Int32 nSpannedCols; - sal_Int32 nColCount; - sal_Int32 nSubTableSpanned; - ScMysalIntList nChangedCols; + com::sun::star::table::CellAddress aTableCellPos; + ScMysalIntVec nColsPerCol; + ScMysalIntVec nRealCols; + ScMysalIntVec nRowsPerRow; + ScMysalIntVec nRealRows; + sal_Int32 nSpannedCols; + sal_Int32 nColCount; + sal_Int32 nSubTableSpanned; + ScMysalIntList nChangedCols; public: ScMyTableData(sal_Int32 nSheet = -1, sal_Int32 nCol = -1, sal_Int32 nRow = -1); ~ScMyTableData(); - com::sun::star::table::CellAddress GetCellPos() const { return aTableCellPos; } - sal_Int32 GetRow() const { return aTableCellPos.Row; } - sal_Int32 GetColumn() const { return aTableCellPos.Column; } - void AddRow(); - void AddColumn(); - void SetFirstColumn() { aTableCellPos.Column = -1; } + com::sun::star::table::CellAddress GetCellPos() const { return aTableCellPos; } + sal_Int32 GetRow() const { return aTableCellPos.Row; } + sal_Int32 GetColumn() const { return aTableCellPos.Column; } + void AddRow(); + void AddColumn(); + void SetFirstColumn() { aTableCellPos.Column = -1; } sal_Int32 GetColsPerCol(const sal_Int32 nIndex) const { return nColsPerCol[nIndex]; } - void SetColsPerCol(const sal_Int32 nIndex, sal_Int32 nValue = 1) { nColsPerCol[nIndex] = nValue; } - sal_Int32 GetRealCols(const sal_Int32 nIndex, const sal_Bool bIsNormal = sal_True) const; - void SetRealCols(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealCols[nIndex] = nValue; } - sal_Int32 GetRowsPerRow(const sal_Int32 nIndex) const { return nRowsPerRow[nIndex]; } - void SetRowsPerRow(const sal_Int32 nIndex, const sal_Int32 nValue = 1) { nRowsPerRow[nIndex] = nValue; } - sal_Int32 GetRealRows(const sal_Int32 nIndex) const { return nIndex < 0 ? 0 : nRealRows[nIndex]; } - void SetRealRows(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealRows[nIndex] = nValue; } - sal_Int32 GetSpannedCols() const { return nSpannedCols; } - void SetSpannedCols(const sal_Int32 nTempSpannedCols) { nSpannedCols = nTempSpannedCols; } - sal_Int32 GetColCount() const { return nColCount; } - void SetColCount(const sal_Int32 nTempColCount) { nColCount = nTempColCount; } - sal_Int32 GetSubTableSpanned() const { return nSubTableSpanned; } - void SetSubTableSpanned(const sal_Int32 nValue) { nSubTableSpanned = nValue; } - sal_Int32 GetChangedCols(const sal_Int32 nFromIndex, const sal_Int32 nToIndex) const; - void SetChangedCols(const sal_Int32 nValue); + void SetColsPerCol(const sal_Int32 nIndex, sal_Int32 nValue = 1) { nColsPerCol[nIndex] = nValue; } + sal_Int32 GetRealCols(const sal_Int32 nIndex, const sal_Bool bIsNormal = sal_True) const; + void SetRealCols(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealCols[nIndex] = nValue; } + sal_Int32 GetRowsPerRow(const sal_Int32 nIndex) const { return nRowsPerRow[nIndex]; } + void SetRowsPerRow(const sal_Int32 nIndex, const sal_Int32 nValue = 1) { nRowsPerRow[nIndex] = nValue; } + sal_Int32 GetRealRows(const sal_Int32 nIndex) const { return nIndex < 0 ? 0 : nRealRows[nIndex]; } + void SetRealRows(const sal_Int32 nIndex, const sal_Int32 nValue) { nRealRows[nIndex] = nValue; } + sal_Int32 GetSpannedCols() const { return nSpannedCols; } + void SetSpannedCols(const sal_Int32 nTempSpannedCols) { nSpannedCols = nTempSpannedCols; } + sal_Int32 GetColCount() const { return nColCount; } + void SetColCount(const sal_Int32 nTempColCount) { nColCount = nTempColCount; } + sal_Int32 GetSubTableSpanned() const { return nSubTableSpanned; } + void SetSubTableSpanned(const sal_Int32 nValue) { nSubTableSpanned = nValue; } + sal_Int32 GetChangedCols(const sal_Int32 nFromIndex, const sal_Int32 nToIndex) const; + void SetChangedCols(const sal_Int32 nValue); }; //******************************************************************************************************************************* @@ -125,7 +125,7 @@ class ScMyTables private: typedef std::list<ScMatrixRange> ScMyMatrixRangeList; - ScXMLImport& rImport; + ScXMLImport& rImport; ScMyShapeResizer aResizeShapes; @@ -133,57 +133,57 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > xCurrentCellRange; ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > xDrawPage; ::com::sun::star::uno::Reference < ::com::sun::star::drawing::XShapes > xShapes; - rtl::OUString sCurrentSheetName; - std::vector<ScMyTableData*> aTableVec; + rtl::OUString sCurrentSheetName; + std::vector<ScMyTableData*> aTableVec; ScXMLTabProtectionData maProtectionData; ScMyMatrixRangeList aMatrixRangeList; - com::sun::star::table::CellAddress aRealCellPos; - sal_Int32 nCurrentColStylePos; - sal_Int16 nCurrentDrawPage; - sal_Int16 nCurrentXShapes; - sal_Int32 nTableCount; - sal_Int32 nCurrentSheet; - - sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, + com::sun::star::table::CellAddress aRealCellPos; + sal_Int32 nCurrentColStylePos; + sal_Int16 nCurrentDrawPage; + sal_Int16 nCurrentXShapes; + sal_Int32 nTableCount; + sal_Int32 nCurrentSheet; + + sal_Bool IsMerged (const com::sun::star::uno::Reference <com::sun::star::table::XCellRange>& xCellRange, const sal_Int32 nCol, const sal_Int32 nRow, com::sun::star::table::CellRangeAddress& aCellAddress) const; - void UnMerge(); - void DoMerge(sal_Int32 nCount = -1); - void InsertRow(); - void NewRow(); - void InsertColumn(); - void NewColumn(sal_Bool bIsCovered); + void UnMerge(); + void DoMerge(sal_Int32 nCount = -1); + void InsertRow(); + void NewRow(); + void InsertColumn(); + void NewColumn(sal_Bool bIsCovered); public: ScMyTables(ScXMLImport& rImport); ~ScMyTables(); - void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, + void NewSheet(const rtl::OUString& sTableName, const rtl::OUString& sStyleName, const ScXMLTabProtectionData& rProtectData); - void AddRow(); - void SetRowStyle(const rtl::OUString& rCellStyleName); - void AddColumn(sal_Bool bIsCovered); - void NewTable(sal_Int32 nTempSpannedCols); - void UpdateRowHeights(); - void ResizeShapes() { aResizeShapes.ResizeShapes(); } - void DeleteTable(); - com::sun::star::table::CellAddress GetRealCellPos(); - void AddColCount(sal_Int32 nTempColCount); - void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); + void AddRow(); + void SetRowStyle(const rtl::OUString& rCellStyleName); + void AddColumn(sal_Bool bIsCovered); + void NewTable(sal_Int32 nTempSpannedCols); + void UpdateRowHeights(); + void ResizeShapes() { aResizeShapes.ResizeShapes(); } + void DeleteTable(); + com::sun::star::table::CellAddress GetRealCellPos(); + void AddColCount(sal_Int32 nTempColCount); + void AddColStyle(const sal_Int32 nRepeat, const rtl::OUString& rCellStyleName); ScXMLTabProtectionData& GetCurrentProtectionData() { return maProtectionData; } - rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } - sal_Int32 GetCurrentSheet() const { return nCurrentSheet; } - sal_Int32 GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); } - sal_Int32 GetCurrentRow() const { return aTableVec[nTableCount - 1]->GetRow(); } + rtl::OUString GetCurrentSheetName() const { return sCurrentSheetName; } + sal_Int32 GetCurrentSheet() const { return nCurrentSheet; } + sal_Int32 GetCurrentColumn() const { return aTableVec[nTableCount - 1]->GetColCount(); } + sal_Int32 GetCurrentRow() const { return aTableVec[nTableCount - 1]->GetRow(); } ::com::sun::star::uno::Reference< ::com::sun::star::sheet::XSpreadsheet > - GetCurrentXSheet() { return xCurrentSheet; } + GetCurrentXSheet() { return xCurrentSheet; } ::com::sun::star::uno::Reference< ::com::sun::star::table::XCellRange > - GetCurrentXCellRange() { return xCurrentCellRange; } + GetCurrentXCellRange() { return xCurrentCellRange; } ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > GetCurrentXDrawPage(); ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > GetCurrentXShapes(); - sal_Bool HasDrawPage(); - sal_Bool HasXShapes(); - void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, + sal_Bool HasDrawPage(); + sal_Bool HasXShapes(); + void AddShape(com::sun::star::uno::Reference <com::sun::star::drawing::XShape>& rShape, rtl::OUString* pRangeList, com::sun::star::table::CellAddress& rStartAddress, com::sun::star::table::CellAddress& rEndAddress, diff --git a/sc/source/filter/xml/xmltabi.cxx b/sc/source/filter/xml/xmltabi.cxx index 01e613b1ea74..f229beafa769 100644 --- a/sc/source/filter/xml/xmltabi.cxx +++ b/sc/source/filter/xml/xmltabi.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 @@ -68,17 +68,17 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::xml::sax::XAttributeList; using ::rtl::OUString; -/** - * Determine whether this table is an external reference cache from its +/** + * Determine whether this table is an external reference cache from its * name. There is currently no way of determining whether a table is a - * regular table or an external reference cache other than examining the - * name itself. We should probably introduce a new boolean value for - * table:table element and use it instead of doing this, to make it more - * reliable and future-proof. - * - * @param rName + * regular table or an external reference cache other than examining the + * name itself. We should probably introduce a new boolean value for + * table:table element and use it instead of doing this, to make it more + * reliable and future-proof. * - * @return + * @param rName + * + * @return */ static bool lcl_isExternalRefCache(const rtl::OUString& rName, rtl::OUString& rUrl, rtl::OUString& rExtTabName) { @@ -250,7 +250,7 @@ SvXMLImportContext *ScXMLTableContext::CreateChildContext( USHORT nPrefix, sal_uInt16 nToken = rTokenMap.Get(nPrefix, rLName); if (pExternalRefInfo.get()) { - // We only care about the table-row and table-source elements for + // We only care about the table-row and table-source elements for // external cache data. switch (nToken) { diff --git a/sc/source/filter/xml/xmltabi.hxx b/sc/source/filter/xml/xmltabi.hxx index db60f90c0c33..3cdd0b9883c4 100644 --- a/sc/source/filter/xml/xmltabi.hxx +++ b/sc/source/filter/xml/xmltabi.hxx @@ -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,10 +48,10 @@ struct ScXMLExternalTabData class ScXMLTableContext : public SvXMLImportContext { - rtl::OUString sPrintRanges; + rtl::OUString sPrintRanges; ::std::auto_ptr<ScXMLExternalTabData> pExternalRefInfo; sal_Int32 nStartOffset; - sal_Bool bStartFormPage; + sal_Bool bStartFormPage; sal_Bool bPrintEntireSheet; const ScXMLImport& GetScImport() const { return (const ScXMLImport&)GetImport(); } diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx index e61cdb4927ef..de75372d9740 100644 --- a/sc/source/filter/xml/xmlwrap.cxx +++ b/sc/source/filter/xml/xmlwrap.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 @@ -128,8 +128,8 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe // Get data source ... -// uno::Reference< uno::XInterface > xPipe; -// uno::Reference< io::XActiveDataSource > xSource; +// uno::Reference< uno::XInterface > xPipe; +// uno::Reference< io::XActiveDataSource > xSource; sal_Bool bEncrypted = sal_False; rtl::OUString sStream(sDocName); @@ -168,7 +168,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe } } // #99667#; no longer necessary -/* else if ( pMedium ) +/* else if ( pMedium ) { // if there is a medium and if this medium has a load environment, // we get an active data source from the medium. @@ -225,7 +225,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe xParser->setDocumentHandler( xDocHandler ); // parse -/* if( xSource.is() ) +/* if( xSource.is() ) { uno::Reference<io::XActiveDataControl> xSourceControl( xSource, uno::UNO_QUERY ); if( xSourceControl.is() ) @@ -507,8 +507,8 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError) sal_uInt32 nSettingsRetval(0); if (!bStylesOnly) { - // Settings must be loaded first because of the printer setting, - // which is needed in the page styles (paper tray). + // Settings must be loaded first because of the printer setting, + // which is needed in the page styles (paper tray). uno::Sequence<uno::Any> aSettingsArgs(1); uno::Any* pSettingsArgs = aSettingsArgs.getArray(); @@ -678,7 +678,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic xOut = xStream->getOutputStream(); } // #99667#; no longer necessary -/* else if ( pMedium ) +/* else if ( pMedium ) { xOut = pMedium->GetDataSink(); }*/ @@ -818,7 +818,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly) if ( pObjSh && xStorage.is() ) { - pObjSh->UpdateDocInfoForSave(); // update information + pObjSh->UpdateDocInfoForSave(); // update information uno::Reference<frame::XModel> xModel(pObjSh->GetModel()); uno::Reference<task::XStatusIndicator> xStatusIndicator(GetStatusIndicator()); |