diff options
Diffstat (limited to 'sc/source/core')
145 files changed, 5635 insertions, 5776 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index e9793ae4d722..e18921cbcd1c 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.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 @@ -139,10 +139,10 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern, BOOL bAlloc ) { if (pData) { - ScDocumentPool* pDocPool = pDocument->GetPool(); + ScDocumentPool* pDocPool = pDocument->GetPool(); const ScPatternAttr* pOldPattern; - ScAddress aAdrStart( nCol, 0, nTab ); - ScAddress aAdrEnd ( nCol, 0, nTab ); + ScAddress aAdrStart( nCol, 0, nTab ); + ScAddress aAdrEnd ( nCol, 0, nTab ); for (SCSIZE i=0; i<nCount; i++) { @@ -234,12 +234,12 @@ BOOL ScAttrArray::Concat(SCSIZE nPos) BOOL ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const { - long nLo = 0; - long nHi = static_cast<long>(nCount) - 1; - long nStartRow = 0; - long nEndRow = 0; - long i = 0; - BOOL bFound = (nCount == 1); + long nLo = 0; + long nHi = static_cast<long>(nCount) - 1; + long nStartRow = 0; + long nEndRow = 0; + long i = 0; + BOOL bFound = (nCount == 1); if (pData) { while ( !bFound && nLo <= nHi ) @@ -629,7 +629,7 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, do { - const ScPatternAttr* pOldPattern = pData[nPos].pPattern; + const ScPatternAttr* pOldPattern = pData[nPos].pPattern; const SfxItemSet& rOldSet = pOldPattern->GetItemSet(); const SfxPoolItem* pBoxItem = 0; SfxItemState eState = rOldSet.GetItemState( ATTR_BORDER, TRUE, &pBoxItem ); @@ -640,10 +640,10 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, if ( (SFX_ITEM_SET == eState) || (SFX_ITEM_SET == eTLBRState) || (SFX_ITEM_SET == eBLTRState) ) { - ScPatternAttr* pNewPattern = new ScPatternAttr(*pOldPattern); + ScPatternAttr* pNewPattern = new ScPatternAttr(*pOldPattern); SfxItemSet& rNewSet = pNewPattern->GetItemSet(); - SCROW nY1 = nStart; - SCROW nY2 = pData[nPos].nRow; + SCROW nY1 = nStart; + SCROW nY2 = pData[nPos].nRow; SvxBoxItem* pNewBoxItem = pBoxItem ? (SvxBoxItem*)pBoxItem->Clone() : 0; SvxLineItem* pNewTLBRItem = pTLBRItem ? (SvxLineItem*)pTLBRItem->Clone() : 0; @@ -819,7 +819,7 @@ void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCac else { //!!!!!!!!!!!!!!!!!! mit diesem Remove gibt es Abstuerze (Calc1 Import) -//! pDocument->GetPool()->Remove(*pNewPattern); +//! pDocument->GetPool()->Remove(*pNewPattern); nStart = pData[nPos].nRow + 1; ++nPos; } @@ -857,7 +857,7 @@ void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) const SfxPoolItem* pOldItem; for (USHORT nId=ATTR_PATTERN_START; nId<=ATTR_PATTERN_END; nId++) { - // pMergeSet has no parent + // pMergeSet has no parent SfxItemState eOldState = rMergeSet.GetItemState( nId, FALSE, &pOldItem ); if ( eOldState == SFX_ITEM_DEFAULT ) @@ -869,15 +869,15 @@ void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) rMergeSet.InvalidateItem( nId ); } } - else if ( eOldState == SFX_ITEM_SET ) // Item gesetzt + else if ( eOldState == SFX_ITEM_SET ) // Item gesetzt { SfxItemState eNewState = rSource.GetItemState( nId, TRUE, &pNewItem ); if ( eNewState == SFX_ITEM_SET ) { - if ( pNewItem != pOldItem ) // beide gepuhlt + if ( pNewItem != pOldItem ) // beide gepuhlt rMergeSet.InvalidateItem( nId ); } - else // Default + else // Default { if ( *pOldItem != rSource.GetPool()->GetDefaultItem(nId) ) rMergeSet.InvalidateItem( nId ); @@ -982,9 +982,9 @@ void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, nDistBottom = 0; const SvxBoxItem* pCellFrame = (SvxBoxItem*) &pPattern->GetItemSet().Get( ATTR_BORDER ); - const SvxBorderLine* pLeftAttr = pCellFrame->GetLeft(); - const SvxBorderLine* pRightAttr = pCellFrame->GetRight(); - const SvxBorderLine* pTopAttr = pCellFrame->GetTop(); + const SvxBorderLine* pLeftAttr = pCellFrame->GetLeft(); + const SvxBorderLine* pRightAttr = pCellFrame->GetRight(); + const SvxBorderLine* pTopAttr = pCellFrame->GetTop(); const SvxBorderLine* pBottomAttr = pCellFrame->GetBottom(); const SvxBorderLine* pNew; @@ -1074,7 +1074,7 @@ void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLine // ApplyFrame - on an entry into the array -BOOL ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, +BOOL ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, const SvxBoxInfoItem* pBoxInfoItem, SCROW nStartRow, SCROW nEndRow, BOOL bLeft, SCCOL nDistRight, BOOL bTop, SCROW nDistBottom ) @@ -1389,8 +1389,8 @@ BOOL ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, { pPattern = pData[i].pPattern; pItem = (const ScMergeAttr*) &pPattern->GetItem( ATTR_MERGE ); - SCsCOL nCountX = pItem->GetColMerge(); - SCsROW nCountY = pItem->GetRowMerge(); + SCsCOL nCountX = pItem->GetColMerge(); + SCsROW nCountY = pItem->GetRowMerge(); if (nCountX>1 || nCountY>1) { SCROW nThisRow = (i>0) ? pData[i-1].nRow+1 : 0; @@ -1458,8 +1458,8 @@ BOOL ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow) pPattern = pData[nIndex].pPattern; pItem = (const ScMergeAttr*) &pPattern->GetItem( ATTR_MERGE ); - SCsCOL nCountX = pItem->GetColMerge(); - SCsROW nCountY = pItem->GetRowMerge(); + SCsCOL nCountX = pItem->GetColMerge(); + SCsROW nCountY = pItem->GetRowMerge(); if (nCountX>1 || nCountY>1) { const ScMergeAttr* pAttr = (const ScMergeAttr*) @@ -1509,20 +1509,20 @@ void ScAttrArray::DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow) void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pWantedPattern, BOOL bDefault ) { - const ScPatternAttr* pOldPattern; - const ScMergeFlagAttr* pItem; + const ScPatternAttr* pOldPattern; + const ScMergeFlagAttr* pItem; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; - BOOL bFirstUse = TRUE; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; + BOOL bFirstUse = TRUE; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; while ( nThisRow <= nEndRow ) { pOldPattern = pData[nIndex].pPattern; - if (pOldPattern != pWantedPattern) //! else-Zweig ? + if (pOldPattern != pWantedPattern) //! else-Zweig ? { if (nThisRow < nStartRow) nThisRow = nStartRow; nRow = pData[nIndex].nRow; @@ -1531,12 +1531,12 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, if (pItem->IsOverlapped() || pItem->HasAutoFilter()) { - // #108045# default-constructing a ScPatternAttr for DeleteArea doesn't work - // because it would have no cell style information. - // Instead, the document's GetDefPattern is copied. Since it is passed as - // pWantedPattern, no special treatment of default is needed here anymore. - ScPatternAttr* pNewPattern = new ScPatternAttr( *pWantedPattern ); - SfxItemSet* pSet = &pNewPattern->GetItemSet(); + // #108045# default-constructing a ScPatternAttr for DeleteArea doesn't work + // because it would have no cell style information. + // Instead, the document's GetDefPattern is copied. Since it is passed as + // pWantedPattern, no special treatment of default is needed here anymore. + ScPatternAttr* pNewPattern = new ScPatternAttr( *pWantedPattern ); + SfxItemSet* pSet = &pNewPattern->GetItemSet(); pSet->Put( *pItem ); SetPatternArea( nThisRow, nAttrRow, pNewPattern, TRUE ); delete pNewPattern; @@ -1567,11 +1567,11 @@ BOOL ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ) { const ScPatternAttr* pOldPattern; - INT16 nOldValue; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; - BOOL bChanged = FALSE; + INT16 nOldValue; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; + BOOL bChanged = FALSE; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; @@ -1604,11 +1604,11 @@ BOOL ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, INT16 nFlags ) { const ScPatternAttr* pOldPattern; - INT16 nOldValue; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; - BOOL bChanged = FALSE; + INT16 nOldValue; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; + BOOL bChanged = FALSE; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; @@ -1641,9 +1641,9 @@ void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const USHORT* pWhi { const ScPatternAttr* pOldPattern; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; @@ -1797,8 +1797,8 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo BOOL ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle, BOOL bGatherAllStyles ) const { - BOOL bIsUsed = FALSE; - SCSIZE nPos = 0; + BOOL bIsUsed = FALSE; + SCSIZE nPos = 0; while ( nPos < nCount ) { @@ -1847,7 +1847,7 @@ BOOL ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const SCSIZE nVisStart = 1; while ( nVisStart < nCount && pData[nVisStart].pPattern->IsVisibleEqual(*pData[nVisStart-1].pPattern) ) ++nVisStart; - if ( nVisStart >= nCount || pData[nVisStart-1].nRow > 0 ) // more than 1 row? + if ( nVisStart >= nCount || pData[nVisStart-1].nRow > 0 ) // more than 1 row? nStart = nVisStart; while ( nStart < nCount && !bFound ) @@ -2044,7 +2044,7 @@ BOOL ScAttrArray::TestInsertRow( SCSIZE nSize ) const if (pData) { - // MAXROW + 1 - nSize = 1st row pushed out + // MAXROW + 1 - nSize = 1st row pushed out SCSIZE nFirstLost = nCount-1; while ( nFirstLost && pData[nFirstLost-1].nRow >= sal::static_int_cast<SCROW>(MAXROW + 1 - nSize) ) @@ -2186,9 +2186,9 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) const ScPatternAttr* pDefPattern = pDocument->GetDefPattern(); const ScPatternAttr* pOldPattern; - SCSIZE nIndex; - SCROW nRow; - SCROW nThisRow; + SCSIZE nIndex; + SCROW nRow; + SCROW nThisRow; Search( nStartRow, nIndex ); nThisRow = (nIndex>0) ? pData[nIndex-1].nRow+1 : 0; diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 7924b4e2612f..6e11a8dfdfc7 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.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,30 +54,30 @@ #include "sc.hrc" #include "globstr.hrc" -#include "textuno.hxx" // ScHeaderFooterContentObj +#include "textuno.hxx" // ScHeaderFooterContentObj using namespace com::sun::star; //------------------------------------------------------------------------ -TYPEINIT1(ScMergeAttr, SfxPoolItem); +TYPEINIT1(ScMergeAttr, SfxPoolItem); TYPEINIT1_AUTOFACTORY(ScProtectionAttr, SfxPoolItem); -TYPEINIT1(ScRangeItem, SfxPoolItem); -TYPEINIT1(ScTableListItem, SfxPoolItem); -TYPEINIT1(ScPageHFItem, SfxPoolItem); +TYPEINIT1(ScRangeItem, SfxPoolItem); +TYPEINIT1(ScTableListItem, SfxPoolItem); +TYPEINIT1(ScPageHFItem, SfxPoolItem); TYPEINIT1(ScViewObjectModeItem, SfxEnumItem); -TYPEINIT1(ScDoubleItem, SfxPoolItem); +TYPEINIT1(ScDoubleItem, SfxPoolItem); TYPEINIT1(ScPageScaleToItem, SfxPoolItem); //------------------------------------------------------------------------ // -// allgemeine Hilfsfunktionen +// allgemeine Hilfsfunktionen // BOOL ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) { -// DBG_ASSERT( pThis || pOther, "LineAttr == 0" ); +// DBG_ASSERT( pThis || pOther, "LineAttr == 0" ); if (!pThis) return FALSE; @@ -99,14 +99,14 @@ BOOL ScHasPriority( const SvxBorderLine* pThis, const SvxBorderLine* pOther ) return FALSE; else { - return TRUE; //! ??? + return TRUE; //! ??? } } } // -// Item - Implementierungen +// Item - Implementierungen // //------------------------------------------------------------------------ @@ -173,8 +173,8 @@ SfxPoolItem* ScMergeAttr::Clone( SfxItemPool * ) const SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, USHORT /* nVer */ ) const { - INT16 nCol; - INT16 nRow; + INT16 nCol; + INT16 nRow; rStream >> nCol; rStream >> nRow; return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow)); @@ -232,8 +232,8 @@ ScProtectionAttr::ScProtectionAttr(const ScProtectionAttr& rItem): { bProtection = rItem.bProtection; bHideFormula = rItem.bHideFormula; - bHideCell = rItem.bHideCell; - bHidePrint = rItem.bHidePrint; + bHideCell = rItem.bHideCell; + bHidePrint = rItem.bHidePrint; } ScProtectionAttr::~ScProtectionAttr() @@ -321,11 +321,11 @@ String ScProtectionAttr::GetValueText() const String aStrNo ( ScGlobal::GetRscString(STR_NO) ); sal_Unicode cDelim = ','; - aValue = '('; - aValue += (bProtection ? aStrYes : aStrNo); aValue += cDelim; - aValue += (bHideFormula ? aStrYes : aStrNo); aValue += cDelim; - aValue += (bHideCell ? aStrYes : aStrNo); aValue += cDelim; - aValue += (bHidePrint ? aStrYes : aStrNo); + aValue = '('; + aValue += (bProtection ? aStrYes : aStrNo); aValue += cDelim; + aValue += (bHideFormula ? aStrYes : aStrNo); aValue += cDelim; + aValue += (bHideCell ? aStrYes : aStrNo); aValue += cDelim; + aValue += (bHidePrint ? aStrYes : aStrNo); aValue += ')'; return aValue; @@ -342,9 +342,9 @@ SfxItemPresentation ScProtectionAttr::GetPresentation const IntlWrapper* /* pIntl */ ) const { - String aStrYes ( ScGlobal::GetRscString(STR_YES) ); - String aStrNo ( ScGlobal::GetRscString(STR_NO) ); - String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); + String aStrYes ( ScGlobal::GetRscString(STR_YES) ); + String aStrNo ( ScGlobal::GetRscString(STR_NO) ); + String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); String aStrDelim = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( ", " )); switch ( ePres ) @@ -359,12 +359,12 @@ SfxItemPresentation ScProtectionAttr::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_PROTECTION); rText += aStrSep; - rText += (bProtection ? aStrYes : aStrNo); rText += aStrDelim; - rText += ScGlobal::GetRscString(STR_FORMULAS); rText += aStrSep; - rText += (!bHideFormula ? aStrYes : aStrNo); rText += aStrDelim; - rText += ScGlobal::GetRscString(STR_HIDE); rText += aStrSep; - rText += (bHideCell ? aStrYes : aStrNo); rText += aStrDelim; - rText += ScGlobal::GetRscString(STR_PRINT); rText += aStrSep; + rText += (bProtection ? aStrYes : aStrNo); rText += aStrDelim; + rText += ScGlobal::GetRscString(STR_FORMULAS); rText += aStrSep; + rText += (!bHideFormula ? aStrYes : aStrNo); rText += aStrDelim; + rText += ScGlobal::GetRscString(STR_HIDE); rText += aStrSep; + rText += (bHideCell ? aStrYes : aStrNo); rText += aStrDelim; + rText += ScGlobal::GetRscString(STR_PRINT); rText += aStrSep; rText += (!bHidePrint ? aStrYes : aStrNo); break; @@ -444,7 +444,7 @@ BOOL ScProtectionAttr::SetHidePrint( BOOL bHPrint) } // ----------------------------------------------------------------------- -// ScRangeItem - Tabellenbereich +// ScRangeItem - Tabellenbereich // ----------------------------------------------------------------------- int ScRangeItem::operator==( const SfxPoolItem& rAttr ) const @@ -468,7 +468,7 @@ SfxItemPresentation ScRangeItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /* eCoreUnit */, SfxMapUnit /* ePresUnit */, - String& rText, + String& rText, const IntlWrapper* /* pIntl */ ) const { @@ -479,7 +479,7 @@ SfxItemPresentation ScRangeItem::GetPresentation case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_AREA); rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( ": " )); -// break;// Durchfallen !!! +// break;// Durchfallen !!! case SFX_ITEM_PRESENTATION_NAMELESS: { @@ -500,12 +500,12 @@ SfxItemPresentation ScRangeItem::GetPresentation } // ----------------------------------------------------------------------- -// ScTableListItem - Liste von Tabellen(-nummern) +// ScTableListItem - Liste von Tabellen(-nummern) // ----------------------------------------------------------------------- ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) - : SfxPoolItem ( rCpy.Which() ), - nCount ( rCpy.nCount ) + : SfxPoolItem ( rCpy.Which() ), + nCount ( rCpy.nCount ) { if ( nCount > 0 ) { @@ -552,12 +552,12 @@ int ScTableListItem::operator==( const SfxPoolItem& rAttr ) const { DBG_ASSERT( SfxPoolItem::operator==(rAttr), "unequal types" ); - ScTableListItem& rCmp = (ScTableListItem&)rAttr; - BOOL bEqual = (nCount == rCmp.nCount); + ScTableListItem& rCmp = (ScTableListItem&)rAttr; + BOOL bEqual = (nCount == rCmp.nCount); if ( nCount > 0 ) { - USHORT i=0; + USHORT i=0; bEqual = ( pTabArr && rCmp.pTabArr ); @@ -582,9 +582,9 @@ SfxPoolItem* ScTableListItem::Clone( SfxItemPool* ) const SfxItemPresentation ScTableListItem::GetPresentation ( SfxItemPresentation ePres, - SfxMapUnit /* eCoreUnit */, - SfxMapUnit /* ePresUnit */, - String& rText, + SfxMapUnit /* eCoreUnit */, + SfxMapUnit /* ePresUnit */, + String& rText, const IntlWrapper* /* pIntl */ ) const { @@ -630,19 +630,19 @@ SfxItemPresentation ScTableListItem::GetPresentation ScPageHFItem::ScPageHFItem( USHORT nWhichP ) : SfxPoolItem ( nWhichP ), - pLeftArea ( NULL ), + pLeftArea ( NULL ), pCenterArea ( NULL ), - pRightArea ( NULL ) + pRightArea ( NULL ) { } //------------------------------------------------------------------------ ScPageHFItem::ScPageHFItem( const ScPageHFItem& rItem ) - : SfxPoolItem ( rItem ), - pLeftArea ( NULL ), + : SfxPoolItem ( rItem ), + pLeftArea ( NULL ), pCenterArea ( NULL ), - pRightArea ( NULL ) + pRightArea ( NULL ) { if ( rItem.pLeftArea ) pLeftArea = rItem.pLeftArea->Clone(); @@ -734,7 +734,7 @@ int ScPageHFItem::operator==( const SfxPoolItem& rItem ) const { DBG_ASSERT( SfxPoolItem::operator==( rItem ), "unequal Which or Type" ); - const ScPageHFItem& r = (const ScPageHFItem&)rItem; + const ScPageHFItem& r = (const ScPageHFItem&)rItem; return ScGlobal::EETextObjEqual(pLeftArea, r.pLeftArea) && ScGlobal::EETextObjEqual(pCenterArea, r.pCenterArea) @@ -808,13 +808,13 @@ BOOL lcl_ConvertFields(EditEngine& rEng, const String* pCommands) return bChange; } -#define SC_FIELD_COUNT 6 +#define SC_FIELD_COUNT 6 SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const { - EditTextObject* pLeft = EditTextObject::Create(rStream); + EditTextObject* pLeft = EditTextObject::Create(rStream); EditTextObject* pCenter = EditTextObject::Create(rStream); - EditTextObject* pRight = EditTextObject::Create(rStream); + EditTextObject* pRight = EditTextObject::Create(rStream); DBG_ASSERT( pLeft && pCenter && pRight, "Error reading ScPageHFItem" ); @@ -822,9 +822,9 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const pCenter == NULL || pCenter->GetParagraphCount() == 0 || pRight == NULL || pRight->GetParagraphCount() == 0 ) { - // If successfully loaded, each object contains at least one paragraph. - // Excel import in 5.1 created broken TextObjects (#67442#) that are - // corrected here to avoid saving wrong files again (#90487#). + // If successfully loaded, each object contains at least one paragraph. + // Excel import in 5.1 created broken TextObjects (#67442#) that are + // corrected here to avoid saving wrong files again (#90487#). ScEditEngineDefaulter aEngine( EditEngine::CreatePool(), TRUE ); if ( pLeft == NULL || pLeft->GetParagraphCount() == 0 ) @@ -844,7 +844,7 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const } } - if ( nVer < 1 ) // alte Feldbefehle umsetzen + if ( nVer < 1 ) // alte Feldbefehle umsetzen { USHORT i; const String& rDel = ScGlobal::GetRscString( STR_HFCMD_DELIMITER ); @@ -881,11 +881,11 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, USHORT nVer ) const } } else if ( nVer < 2 ) - { // nichts tun, SvxFileField nicht gegen SvxExtFileField austauschen + { // nichts tun, SvxFileField nicht gegen SvxExtFileField austauschen } ScPageHFItem* pItem = new ScPageHFItem( Which() ); - pItem->SetArea( pLeft, SC_HF_LEFTAREA ); + pItem->SetArea( pLeft, SC_HF_LEFTAREA ); pItem->SetArea( pCenter, SC_HF_CENTERAREA ); pItem->SetArea( pRight, SC_HF_RIGHTAREA ); @@ -921,16 +921,16 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea ) { switch ( nArea ) { - case SC_HF_LEFTAREA: delete pLeftArea; pLeftArea = pNew; break; + case SC_HF_LEFTAREA: delete pLeftArea; pLeftArea = pNew; break; case SC_HF_CENTERAREA: delete pCenterArea; pCenterArea = pNew; break; - case SC_HF_RIGHTAREA: delete pRightArea; pRightArea = pNew; break; + case SC_HF_RIGHTAREA: delete pRightArea; pRightArea = pNew; break; default: DBG_ERROR( "New Area?" ); } } //----------------------------------------------------------------------- -// ScViewObjectModeItem - Darstellungsmodus von ViewObjekten +// ScViewObjectModeItem - Darstellungsmodus von ViewObjekten //----------------------------------------------------------------------- ScViewObjectModeItem::ScViewObjectModeItem( USHORT nWhichP ) @@ -958,11 +958,11 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation SfxItemPresentation ePres, SfxMapUnit /* eCoreUnit */, SfxMapUnit /* ePresUnit */, - String& rText, + String& rText, const IntlWrapper* /* pIntl */ -) const +) const { - String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": ")); + String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": ")); rText.Erase(); switch ( ePres ) @@ -989,7 +989,7 @@ SfxItemPresentation ScViewObjectModeItem::GetPresentation ePres = SFX_ITEM_PRESENTATION_NAMELESS;//das geht immer! break; } -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ScGlobal::GetRscString(STR_VOBJ_MODE_SHOW+GetValue()); @@ -1037,8 +1037,8 @@ USHORT ScViewObjectModeItem::GetVersion( USHORT /* nFileVersion */ ) const //------------------------------------------------------------------------ SfxPoolItem* ScViewObjectModeItem::Create( - SvStream& rStream, - USHORT nVersion ) const + SvStream& rStream, + USHORT nVersion ) const { if ( nVersion == 0 ) { @@ -1058,19 +1058,19 @@ SfxPoolItem* ScViewObjectModeItem::Create( } // ----------------------------------------------------------------------- -// double +// double // ----------------------------------------------------------------------- ScDoubleItem::ScDoubleItem( USHORT nWhichP, double nVal ) : SfxPoolItem ( nWhichP ), - nValue ( nVal ) + nValue ( nVal ) { } //------------------------------------------------------------------------ ScDoubleItem::ScDoubleItem( const ScDoubleItem& rItem ) - : SfxPoolItem ( rItem ) + : SfxPoolItem ( rItem ) { nValue = rItem.nValue; } diff --git a/sc/source/core/data/autonamecache.cxx b/sc/source/core/data/autonamecache.cxx index 0b97623b7efb..5ca98137ba80 100644 --- a/sc/source/core/data/autonamecache.cxx +++ b/sc/source/core/data/autonamecache.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/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index abd6f055b716..36d50f8ccf0b 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.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,9 +93,9 @@ static SCSIZE nBcaSlotsRow = BCA_SLOTS_ROW; static SCSIZE nBcaSlots = BCA_SLOTS_DEFINE; #else // Logarithmic or any other distribution. -// Upper sheet part usually is more populated and referenced and gets fine +// Upper sheet part usually is more populated and referenced and gets fine // grained resolution, larger data in larger hunks. -// Could be further enhanced by also applying a different distribution of +// Could be further enhanced by also applying a different distribution of // column slots. static SCSIZE initSlotDistribution( ScSlotDistribution & rSD, SCSIZE & rBSR ) { @@ -185,9 +185,9 @@ bool ScBroadcastAreaSlot::StartListeningArea( const ScRange& rRange, return false; if ( !rpArea ) { - // Even if most times the area doesn't exist yet and immediately trying - // to new and insert it would save an attempt to find it, on mass - // operations like identical large [HV]LOOKUP() areas the new/delete + // Even if most times the area doesn't exist yet and immediately trying + // to new and insert it would save an attempt to find it, on mass + // operations like identical large [HV]LOOKUP() areas the new/delete // would add quite some penalty for all but the first formula cell. ScBroadcastAreas::const_iterator aIter( FindBroadcastArea( rRange)); if (aIter != aBroadcastAreaTbl.end()) @@ -285,7 +285,7 @@ BOOL ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) const return FALSE; BOOL bIsBroadcasted = FALSE; const ScAddress& rAddress = rHint.GetAddress(); - for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); + for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); aIter != aBroadcastAreaTbl.end(); /* increment in body */ ) { ScBroadcastArea* pArea = *aIter; @@ -313,7 +313,7 @@ BOOL ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, if (aBroadcastAreaTbl.empty()) return FALSE; BOOL bIsBroadcasted = FALSE; - for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); + for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()); aIter != aBroadcastAreaTbl.end(); /* increment in body */ ) { ScBroadcastArea* pArea = *aIter; @@ -422,7 +422,7 @@ void ScBroadcastAreaSlot::UpdateRemoveArea( ScBroadcastArea* pArea ) void ScBroadcastAreaSlot::UpdateInsert( ScBroadcastArea* pArea ) { - ::std::pair< ScBroadcastAreas::iterator, bool > aPair = + ::std::pair< ScBroadcastAreas::iterator, bool > aPair = aBroadcastAreaTbl.insert( pArea ); if (aPair.second) pArea->IncRef(); @@ -573,9 +573,9 @@ void ScBroadcastAreaSlotMachine::StartListeningArea( const ScRange& rRange, *pp = new ScBroadcastAreaSlot( pDoc, this ); if (!pArea) { - // If the call to StartListeningArea didn't create the - // ScBroadcastArea, listeners were added to an already - // existing identical area that doesn't need to be inserted + // If the call to StartListeningArea didn't create the + // ScBroadcastArea, listeners were added to an already + // existing identical area that doesn't need to be inserted // to slots again. if (!(*pp)->StartListeningArea( rRange, pListener, pArea)) bDone = true; @@ -621,7 +621,7 @@ void ScBroadcastAreaSlotMachine::EndListeningArea( const ScRange& rRange, ScBroadcastArea* pArea = NULL; if (nOff == 0 && nEnd == nBcaSlots-1) { - // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they + // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they // happen for insertion and deletion of sheets. ScBroadcastAreaSlot** const pStop = ppSlots + nEnd; do @@ -662,7 +662,7 @@ BOOL ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const TableSlotsMap::const_iterator iTab( aTableSlotsMap.find( rAddress.Tab())); if (iTab == aTableSlotsMap.end()) return FALSE; - ScBroadcastAreaSlot* pSlot = (*iTab).second->getAreaSlot( + ScBroadcastAreaSlot* pSlot = (*iTab).second->getAreaSlot( ComputeSlotOffset( rAddress)); if ( pSlot ) return pSlot->AreaBroadcast( rHint ); @@ -712,7 +712,7 @@ void ScBroadcastAreaSlotMachine::DelBroadcastAreasInRange( ScBroadcastAreaSlot** pp = ppSlots + nOff; if (nOff == 0 && nEnd == nBcaSlots-1) { - // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they + // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they // happen for insertion and deletion of sheets. ScBroadcastAreaSlot** const pStop = ppSlots + nEnd; do @@ -752,7 +752,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( ScBroadcastAreaSlot** pp = ppSlots + nOff; if (nOff == 0 && nEnd == nBcaSlots-1) { - // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they + // Slightly optimized for 0,0,MAXCOL,MAXROW calls as they // happen for insertion and deletion of sheets. ScBroadcastAreaSlot** const pStop = ppSlots + nEnd; do @@ -772,7 +772,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( } } - // Updating an area's range will modify the hash key, remove areas from all + // Updating an area's range will modify the hash key, remove areas from all // affected slots. Will be reinserted later with the updated range. ScBroadcastArea* pChain = pUpdateChain; while (pChain) @@ -802,7 +802,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( ComputeNextSlot( nOff, nBreak, pp, nStart, ppSlots, nRowBreak); } } - + } // shift sheets @@ -901,7 +901,7 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( pArea->SetUpdateChainNext( NULL ); pArea->SetInUpdateChain( FALSE ); - // Delete if not inserted to any slot. RemoveBulkArea(pArea) was + // Delete if not inserted to any slot. RemoveBulkArea(pArea) was // already executed in UpdateRemove(). if (!pArea->GetRef()) delete pArea; diff --git a/sc/source/core/data/cell.cxx b/sc/source/core/data/cell.cxx index 49676e29525d..d437593fe1c2 100644 --- a/sc/source/core/data/cell.cxx +++ b/sc/source/core/data/cell.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 @@ -79,7 +79,7 @@ const USHORT nMemPoolNoteCell = (0x1000 - 64) / sizeof(ScNoteCell); IMPL_FIXEDMEMPOOL_NEWDEL( ScValueCell, nMemPoolValueCell, nMemPoolValueCell ) IMPL_FIXEDMEMPOOL_NEWDEL( ScFormulaCell, nMemPoolFormulaCell, nMemPoolFormulaCell ) IMPL_FIXEDMEMPOOL_NEWDEL( ScStringCell, nMemPoolStringCell, nMemPoolStringCell ) -IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell, nMemPoolNoteCell, nMemPoolNoteCell ) +IMPL_FIXEDMEMPOOL_NEWDEL( ScNoteCell, nMemPoolNoteCell, nMemPoolNoteCell ) #endif // ============================================================================ @@ -242,7 +242,7 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc ) && !((ScFormulaCell*)this)->IsInChangeTrack() ) { - pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert... + pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert... ScFormulaCell* pFormCell = (ScFormulaCell*)this; ScTokenArray* pArr = pFormCell->GetCode(); @@ -275,9 +275,9 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc ) if ( rRef1.Valid() && rRef2.Valid() ) { if ( t->GetOpCode() == ocColRowNameAuto ) - { // automagically + { // automagically if ( rRef1.IsColRel() ) - { // ColName + { // ColName pDoc->StartListeningArea( ScRange ( rRef1.nCol, rRef1.nRow, @@ -287,7 +287,7 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc ) rRef2.nTab ), pFormCell ); } else - { // RowName + { // RowName pDoc->StartListeningArea( ScRange ( rRef1.nCol, rRef1.nRow, @@ -318,7 +318,7 @@ void ScBaseCell::StartListeningTo( ScDocument* pDoc ) } } -// pArr gesetzt -> Referenzen von anderer Zelle nehmen +// pArr gesetzt -> Referenzen von anderer Zelle nehmen // dann muss auch aPos uebergeben werden! void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr, @@ -328,7 +328,7 @@ void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr, && !((ScFormulaCell*)this)->IsInChangeTrack() ) { - pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert... + pDoc->SetDetectiveDirty(TRUE); // es hat sich was geaendert... ScFormulaCell* pFormCell = (ScFormulaCell*)this; if( pFormCell->GetCode()->IsRecalcModeAlways() ) @@ -365,9 +365,9 @@ void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr, if ( rRef1.Valid() && rRef2.Valid() ) { if ( t->GetOpCode() == ocColRowNameAuto ) - { // automagically + { // automagically if ( rRef1.IsColRel() ) - { // ColName + { // ColName pDoc->EndListeningArea( ScRange ( rRef1.nCol, rRef1.nRow, @@ -377,7 +377,7 @@ void ScBaseCell::EndListeningTo( ScDocument* pDoc, ScTokenArray* pArr, rRef2.nTab ), pFormCell ); } else - { // RowName + { // RowName pDoc->EndListeningArea( ScRange ( rRef1.nCol, rRef1.nRow, @@ -474,13 +474,13 @@ String ScBaseCell::GetStringData() const ((const ScEditCell*)this)->GetString( aStr ); break; case CELLTYPE_FORMULA: - ((ScFormulaCell*)this)->GetString( aStr ); // an der Formelzelle nicht-const + ((ScFormulaCell*)this)->GetString( aStr ); // an der Formelzelle nicht-const break; } return aStr; } -// static +// static BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ) { CellType eType1 = CELLTYPE_NONE; @@ -504,14 +504,14 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ) if ( eType1 != eType2 ) return FALSE; - switch ( eType1 ) // beide Typen gleich + switch ( eType1 ) // beide Typen gleich { - case CELLTYPE_NONE: // beide leer + case CELLTYPE_NONE: // beide leer return TRUE; - case CELLTYPE_VALUE: // wirklich Value-Zellen + case CELLTYPE_VALUE: // wirklich Value-Zellen return ( ((const ScValueCell*)pCell1)->GetValue() == ((const ScValueCell*)pCell2)->GetValue() ); - case CELLTYPE_STRING: // String oder Edit + case CELLTYPE_STRING: // String oder Edit { String aText1; if ( pCell1->GetCellType() == CELLTYPE_STRING ) @@ -527,14 +527,14 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ) } case CELLTYPE_FORMULA: { - //! eingefuegte Zeilen / Spalten beruecksichtigen !!!!! - //! Vergleichsfunktion an der Formelzelle ??? - //! Abfrage mit ScColumn::SwapRow zusammenfassen! + //! eingefuegte Zeilen / Spalten beruecksichtigen !!!!! + //! Vergleichsfunktion an der Formelzelle ??? + //! Abfrage mit ScColumn::SwapRow zusammenfassen! ScTokenArray* pCode1 = ((ScFormulaCell*)pCell1)->GetCode(); ScTokenArray* pCode2 = ((ScFormulaCell*)pCell2)->GetCode(); - if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN + if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN { BOOL bEqual = TRUE; USHORT nLen = pCode1->GetLen(); @@ -551,7 +551,7 @@ BOOL ScBaseCell::CellEqual( const ScBaseCell* pCell1, const ScBaseCell* pCell2 ) return TRUE; } - return FALSE; // unterschiedlich lang oder unterschiedliche Tokens + return FALSE; // unterschiedlich lang oder unterschiedliche Tokens } default: DBG_ERROR("huch, was fuer Zellen???"); @@ -625,7 +625,7 @@ ScStringCell::~ScStringCell() // ============================================================================ // -// ScFormulaCell +// ScFormulaCell // ScFormulaCell::ScFormulaCell() : @@ -762,8 +762,8 @@ ScFormulaCell::ScFormulaCell( const ScFormulaCell& rCell, ScDocument& rDoc, cons pCode->ReadjustRelative3DReferences( rCell.aPos, aPos ); // evtl. Fehler zuruecksetzen und neu kompilieren - // nicht im Clipboard - da muss das Fehlerflag erhalten bleiben - // Spezialfall Laenge=0: als Fehlerzelle erzeugt, dann auch Fehler behalten + // nicht im Clipboard - da muss das Fehlerflag erhalten bleiben + // Spezialfall Laenge=0: als Fehlerzelle erzeugt, dann auch Fehler behalten if ( pCode->GetCodeError() && !pDocument->IsClipboard() && pCode->GetLen() ) { pCode->SetCodeError( 0 ); @@ -942,7 +942,7 @@ void ScFormulaCell::Compile( const String& rFormula, BOOL bNoListening, if( !pCode->GetCodeError() ) { if ( !pCode->GetLen() && aResult.GetHybridFormula().Len() && rFormula == aResult.GetHybridFormula() ) - { // #65994# nicht rekursiv CompileTokenArray/Compile/CompileTokenArray + { // #65994# nicht rekursiv CompileTokenArray/Compile/CompileTokenArray if ( rFormula.GetChar(0) == '=' ) pCode->AddBad( rFormula.GetBuffer() + 1 ); else @@ -1005,7 +1005,7 @@ void ScFormulaCell::CompileTokenArray( BOOL bNoListening ) void ScFormulaCell::CompileXML( ScProgress& rProgress ) { if ( cMatrixFlag == MM_REFERENCE ) - { // is already token code via ScDocFunc::EnterMatrix, ScDocument::InsertMatrixFormula + { // is already token code via ScDocFunc::EnterMatrix, ScDocument::InsertMatrixFormula // just establish listeners StartListeningTo( pDocument ); return ; @@ -1052,8 +1052,8 @@ void ScFormulaCell::CompileXML( ScProgress& rProgress ) SetScriptType( SC_SCRIPTTYPE_UNKNOWN ); } - // Same as in Load: after loading, it must be known if ocMacro is in any formula - // (for macro warning, CompileXML is called at the end of loading XML file) + // Same as in Load: after loading, it must be known if ocMacro is in any formula + // (for macro warning, CompileXML is called at the end of loading XML file) if ( !pDocument->GetHasMacroFunc() && pCode->HasOpCodeRPN( ocMacro ) ) pDocument->SetHasMacroFunc( TRUE ); } @@ -1115,7 +1115,7 @@ void ScFormulaCell::CalcAfterLoad() bDirty = TRUE; } if ( pCode->IsRecalcModeAlways() ) - { // zufall(), heute(), jetzt() bleiben immer im FormulaTree, damit sie + { // zufall(), heute(), jetzt() bleiben immer im FormulaTree, damit sie // auch bei jedem F9 berechnet werden. bDirty = TRUE; } @@ -1228,9 +1228,9 @@ void ScFormulaCell::Interpret() if (!IsDirtyOrInTableOpDirty() || pDocument->GetRecursionHelper().IsInReturn()) return; // no double/triple processing - //! HACK: - // Wenn der Aufruf aus einem Reschedule im DdeLink-Update kommt, dirty stehenlassen - // Besser: Dde-Link Update ohne Reschedule oder ganz asynchron !!! + //! HACK: + // Wenn der Aufruf aus einem Reschedule im DdeLink-Update kommt, dirty stehenlassen + // Besser: Dde-Link Update ohne Reschedule oder ganz asynchron !!! if ( pDocument->IsInDdeLinkUpdate() ) return; @@ -1831,9 +1831,9 @@ ULONG ScFormulaCell::GetStandardFormat( SvNumberFormatter& rFormatter, ULONG nFo return nFormatIndex; //! not ScFormulaCell::IsValue(), that could reinterpret the formula again. if ( aResult.IsValue() ) - return ScGlobal::GetStandardFormat( aResult.GetDouble(), rFormatter, nFormat, nFormatType ); + return ScGlobal::GetStandardFormat( aResult.GetDouble(), rFormatter, nFormat, nFormatType ); else - return ScGlobal::GetStandardFormat( rFormatter, nFormat, nFormatType ); + return ScGlobal::GetStandardFormat( rFormatter, nFormat, nFormatType ); } @@ -1961,7 +1961,7 @@ void ScFormulaCell::AddRecalcMode( ScRecalcMode nBits ) if ( (nBits & RECALCMODE_EMASK) != RECALCMODE_NORMAL ) bDirty = TRUE; if ( nBits & RECALCMODE_ONLOAD_ONCE ) - { // OnLoadOnce nur zum Dirty setzen nach Filter-Import + { // OnLoadOnce nur zum Dirty setzen nach Filter-Import nBits = (nBits & ~RECALCMODE_EMASK) | RECALCMODE_NORMAL; } pCode->AddRecalcMode( nBits ); diff --git a/sc/source/core/data/cell2.cxx b/sc/source/core/data/cell2.cxx index 4e1823b97b6a..7471fdb92a33 100644 --- a/sc/source/core/data/cell2.cxx +++ b/sc/source/core/data/cell2.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 @@ -320,7 +320,7 @@ lcl_checkRangeDimensions( const bool bSameCols(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetCol)); const bool bSameRows(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetRow)); const bool bSameTabs(lcl_checkRangeDimension(rRef1, rRef2, lcl_GetTab)); - + // Test if exactly two dimensions are equal if (!(bSameCols ^ bSameRows ^ bSameTabs) && (bSameCols || bSameRows || bSameTabs)) @@ -765,9 +765,9 @@ ScFormulaCell::HasRefListExpressibleAsOneReference(ScRange& rRange) const intersection must be empty set. */ - // Detect the simple case of exactly one reference in advance without all + // Detect the simple case of exactly one reference in advance without all // overhead. - // #i107741# Doing so actually makes outlines using SUBTOTAL(x;reference) + // #i107741# Doing so actually makes outlines using SUBTOTAL(x;reference) // work again, where the function does not have only references. if (HasOneReference( rRange)) return true; diff --git a/sc/source/core/data/clipparam.cxx b/sc/source/core/data/clipparam.cxx index 6cae3916fc47..aa080efab024 100644 --- a/sc/source/core/data/clipparam.cxx +++ b/sc/source/core/data/clipparam.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/core/data/column.cxx b/sc/source/core/data/column.cxx index 27dce7c8f414..0ae30f5e9057 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.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,18 +50,18 @@ #include "compiler.hxx" #include "brdcst.hxx" #include "markdata.hxx" -#include "detfunc.hxx" // for Notes in Sort/Swap +#include "detfunc.hxx" // for Notes in Sort/Swap #include "postit.hxx" //#pragma optimize ( "", off ) -// nur Search ohne Optimierung! +// nur Search ohne Optimierung! // STATIC DATA ----------------------------------------------------------- using namespace formula; inline BOOL IsAmbiguousScriptNonZero( BYTE nScript ) { - //! move to a header file + //! move to a header file return ( nScript != SCRIPTTYPE_LATIN && nScript != SCRIPTTYPE_ASIAN && nScript != SCRIPTTYPE_COMPLEX && @@ -153,24 +153,24 @@ USHORT ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, USHORT nMask ) c if ( nEdges ) { if ( nEdges & 8 ) - bOpen = TRUE; // obere Kante oeffnet, weitersehen + bOpen = TRUE; // obere Kante oeffnet, weitersehen else if ( !bOpen ) - return nEdges | 32; // es gibt was, was nicht geoeffnet wurde + return nEdges | 32; // es gibt was, was nicht geoeffnet wurde else if ( nEdges & 1 ) - return nEdges; // mittendrin + return nEdges; // mittendrin // (nMask & 16 und (4 und nicht 16)) oder // (nMask & 4 und (16 und nicht 4)) if ( ((nMask & 16) && (nEdges & 4) && !(nEdges & 16)) || ((nMask & 4) && (nEdges & 16) && !(nEdges & 4)) ) - return nEdges; // nur linke/rechte Kante + return nEdges; // nur linke/rechte Kante if ( nEdges & 2 ) - bOpen = FALSE; // untere Kante schliesst + bOpen = FALSE; // untere Kante schliesst } } nIndex++; } if ( bOpen ) - nEdges |= 32; // es geht noch weiter + nEdges |= 32; // es geht noch weiter return nEdges; } } @@ -202,21 +202,21 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const if ( nEdges ) { if ( nEdges & 8 ) - bOpen = TRUE; // obere Kante oeffnet, weitersehen + bOpen = TRUE; // obere Kante oeffnet, weitersehen else if ( !bOpen ) - return TRUE; // es gibt was, was nicht geoeffnet wurde + return TRUE; // es gibt was, was nicht geoeffnet wurde else if ( nEdges & 1 ) - bFound = TRUE; // mittendrin, alles selektiert? + bFound = TRUE; // mittendrin, alles selektiert? // (4 und nicht 16) oder (16 und nicht 4) if ( (((nEdges & 4) | 16) ^ ((nEdges & 16) | 4)) ) - bFound = TRUE; // nur linke/rechte Kante, alles selektiert? + bFound = TRUE; // nur linke/rechte Kante, alles selektiert? if ( nEdges & 2 ) - bOpen = FALSE; // untere Kante schliesst + bOpen = FALSE; // untere Kante schliesst if ( bFound ) - { // alles selektiert? + { // alles selektiert? if ( aCurOrg != aOrg ) - { // neue Matrix zu pruefen? + { // neue Matrix zu pruefen? aCurOrg = aOrg; ScFormulaCell* pFCell; if ( ((ScFormulaCell*)pCell)->GetMatrixFlag() @@ -234,7 +234,7 @@ BOOL ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const bFound = FALSE; } else - bFound = FALSE; // war schon + bFound = FALSE; // war schon } } } @@ -457,7 +457,7 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ) const ScPatternAttr* pPattern = pAttrArray->GetPattern( nRow ); - // TRUE = alten Eintrag behalten + // TRUE = alten Eintrag behalten ScPatternAttr* pNewPattern = (ScPatternAttr*) &aCache.ApplyTo( *pPattern, TRUE ); ScDocumentPool::CheckRef( *pPattern ); @@ -593,7 +593,7 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL& pNewStyle = pPattern->GetStyleSheet(); rFound = TRUE; if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } } @@ -602,7 +602,7 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, BOOL& } -const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const +const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRow2 ) const { rFound = FALSE; @@ -620,7 +620,7 @@ const ScStyleSheet* ScColumn::GetAreaStyle( BOOL& rFound, SCROW nRow1, SCROW nRo pNewStyle = pPattern->GetStyleSheet(); rFound = TRUE; if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } @@ -671,8 +671,8 @@ void ScColumn::SetPatternArea( SCROW nStartRow, SCROW nEndRow, void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) { - // um nur ein neues SetItem zu erzeugen, brauchen wir keinen SfxItemPoolCache. - //! Achtung: der SfxItemPoolCache scheint zuviele Refs fuer das neue SetItem zu erzeugen ?? + // um nur ein neues SetItem zu erzeugen, brauchen wir keinen SfxItemPoolCache. + //! Achtung: der SfxItemPoolCache scheint zuviele Refs fuer das neue SetItem zu erzeugen ?? ScDocumentPool* pDocPool = pDocument->GetPool(); @@ -684,7 +684,7 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) if ( pNewPattern != pOldPattern ) pAttrArray->SetPattern( nRow, pNewPattern ); else - pDocPool->Remove( *pNewPattern ); // ausser Spesen nichts gewesen + pDocPool->Remove( *pNewPattern ); // ausser Spesen nichts gewesen delete pTemp; @@ -725,25 +725,25 @@ BOOL ScColumn::Search( SCROW nRow, SCSIZE& nIndex ) const } long nOldLo, nOldHi; - long nLo = nOldLo = 0; - long nHi = nOldHi = Min(static_cast<long>(nCount)-1, static_cast<long>(nRow) ); - long i = 0; - BOOL bFound = FALSE; + long nLo = nOldLo = 0; + long nHi = nOldHi = Min(static_cast<long>(nCount)-1, static_cast<long>(nRow) ); + long i = 0; + BOOL bFound = FALSE; // quite continuous distribution? => interpolating search - BOOL bInterpol = (static_cast<SCSIZE>(nMaxRow - nMinRow) < nCount * 2); - SCROW nR; + BOOL bInterpol = (static_cast<SCSIZE>(nMaxRow - nMinRow) < nCount * 2); + SCROW nR; while ( !bFound && nLo <= nHi ) { if ( !bInterpol || nHi - nLo < 3 ) - i = (nLo+nHi) / 2; // no effort, no division by zero + i = (nLo+nHi) / 2; // no effort, no division by zero else - { // interpolating search - long nLoRow = pItems[nLo].nRow; // no unsigned underflow upon substraction + { // interpolating search + long nLoRow = pItems[nLo].nRow; // no unsigned underflow upon substraction i = nLo + (long)((long)(nRow - nLoRow) * (nHi - nLo) / (pItems[nHi].nRow - nLoRow)); if ( i < 0 || static_cast<SCSIZE>(i) >= nCount ) - { // oops ... + { // oops ... i = (nLo+nHi) / 2; bInterpol = FALSE; } @@ -827,7 +827,7 @@ void ScColumn::Resize( SCSIZE nSize ) pItems = pNewItems; } -// SwapRow zum Sortieren +// SwapRow zum Sortieren namespace { @@ -942,7 +942,7 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2) ScTokenArray* pCode1 = pFmlaCell1->GetCode(); ScTokenArray* pCode2 = pFmlaCell2->GetCode(); - if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN + if (pCode1->GetLen() == pCode2->GetLen()) // nicht-UPN { BOOL bEqual = TRUE; USHORT nLen = pCode1->GetLen(); @@ -969,8 +969,8 @@ void ScColumn::SwapRow(SCROW nRow1, SCROW nRow2) } } - // hier kein UpdateReference wegen #30529# - mitsortiert werden nur noch relative Referenzen -// long dy = (long)nRow2 - (long)nRow1; + // hier kein UpdateReference wegen #30529# - mitsortiert werden nur noch relative Referenzen +// long dy = (long)nRow2 - (long)nRow1; /* Create clone of pCell1 at position of pCell2 (pCell1 exists always, see variable swapping above). Do not clone the note, but move pointer of @@ -1086,12 +1086,12 @@ BOOL ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const bTest = (pItems[i].nRow < nStartRow) || (pItems[i].nRow > nEndRow) || pItems[i].pCell->IsBlank(); - // AttrArray testet nur zusammengefasste + // AttrArray testet nur zusammengefasste if ((bTest) && (pAttrArray)) bTest = pAttrArray->TestInsertCol(nStartRow, nEndRow); - //! rausgeschobene Attribute bei Undo beruecksichtigen + //! rausgeschobene Attribute bei Undo beruecksichtigen return bTest; } @@ -1116,7 +1116,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize ) { pAttrArray->InsertRow( nStartRow, nSize ); - //! Search + //! Search if ( !pItems || !nCount ) return; @@ -1127,7 +1127,7 @@ void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize ) return ; BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SCSIZE nNewCount = nCount; BOOL bCountChanged = FALSE; @@ -1235,8 +1235,8 @@ void ScColumn::CopyToClip(SCROW nRow1, SCROW nRow2, ScColumn& rColumn, BOOL bKee nEndIndex = i; ++nBlockCount; - // im Clipboard muessen interpretierte Zellen stehen, um andere Formate - // (Text, Grafik...) erzueugen zu koennen + // im Clipboard muessen interpretierte Zellen stehen, um andere Formate + // (Text, Grafik...) erzueugen zu koennen if ( pItems[i].pCell->GetCellType() == CELLTYPE_FORMULA ) { @@ -1290,7 +1290,7 @@ void ScColumn::CopyToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke if ( (nFlags & IDF_ATTRIB) != 0 ) { if ( (nFlags & IDF_STYLES) != IDF_STYLES ) - { // StyleSheets im Zieldokument bleiben erhalten + { // StyleSheets im Zieldokument bleiben erhalten // z.B. DIF und RTF Clipboard-Import for ( SCROW nRow = nRow1; nRow <= nRow2; nRow++ ) { @@ -1364,7 +1364,7 @@ void ScColumn::UndoToColumn(SCROW nRow1, SCROW nRow2, USHORT nFlags, BOOL bMarke if (nRow1 > 0) CopyToColumn( 0, nRow1-1, IDF_FORMULA, FALSE, rColumn ); - CopyToColumn( nRow1, nRow2, nFlags, bMarked, rColumn, pMarkData ); //! bMarked ???? + CopyToColumn( nRow1, nRow2, nFlags, bMarked, rColumn, pMarkData ); //! bMarked ???? if (nRow2 < MAXROW) CopyToColumn( nRow2+1, MAXROW, IDF_FORMULA, FALSE, rColumn ); @@ -1390,14 +1390,14 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const } } - // Dummy: - // CopyToColumn( 0,MAXROW, IDF_FORMULA, FALSE, rDestCol, NULL, FALSE ); + // Dummy: + // CopyToColumn( 0,MAXROW, IDF_FORMULA, FALSE, rDestCol, NULL, FALSE ); } void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) { - // Dies ist die Szenario-Tabelle, die Daten werden hineinkopiert + // Dies ist die Szenario-Tabelle, die Daten werden hineinkopiert ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW ); SCROW nStart = -1, nEnd = -1; @@ -1410,7 +1410,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) ((ScColumn&)rSrcCol). CopyToColumn( nStart, nEnd, IDF_CONTENTS, FALSE, *this ); - // UpdateUsed nicht noetig, schon in TestCopyScenario passiert + // UpdateUsed nicht noetig, schon in TestCopyScenario passiert SCsTAB nDz = nTab - rSrcCol.nTab; UpdateReference(URM_COPY, nCol, nStart, nTab, @@ -1419,7 +1419,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) UpdateCompile(); } - //! CopyToColumn "const" machen !!! + //! CopyToColumn "const" machen !!! pPattern = aAttrIter.Next( nStart, nEnd ); } @@ -1428,7 +1428,7 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const { - // Dies ist die Szenario-Tabelle, die Daten werden in die andere kopiert + // Dies ist die Szenario-Tabelle, die Daten werden in die andere kopiert ScAttrIterator aAttrIter( pAttrArray, 0, MAXROW ); SCROW nStart = -1, nEnd = -1; @@ -1441,7 +1441,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const ((ScColumn*)this)-> CopyToColumn( nStart, nEnd, IDF_CONTENTS, FALSE, rDestCol ); - // UpdateUsed nicht noetig, schon in TestCopyScenario passiert + // UpdateUsed nicht noetig, schon in TestCopyScenario passiert SCsTAB nDz = rDestCol.nTab - nTab; rDestCol.UpdateReference(URM_COPY, rDestCol.nCol, nStart, rDestCol.nTab, @@ -1450,7 +1450,7 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const rDestCol.UpdateCompile(); } - //! CopyToColumn "const" machen !!! + //! CopyToColumn "const" machen !!! pPattern = aAttrIter.Next( nStart, nEnd ); } @@ -1595,7 +1595,7 @@ void ScColumn::MoveTo(SCROW nStartRow, SCROW nEndRow, ScColumn& rCol) ScAddress aAdr( nCol, 0, nTab ); ScHint aHint( SC_HINT_DYING, aAdr, NULL ); // areas only ScAddress& rAddress = aHint.GetAddress(); - ScNoteCell* pNoteCell = new ScNoteCell; // Dummy like in DeleteRange + ScNoteCell* pNoteCell = new ScNoteCell; // Dummy like in DeleteRange // #121990# must iterate backwards, because indexes of following cells become invalid for (EntryPosPairs::reverse_iterator it( aEntries.rbegin()); @@ -1631,13 +1631,13 @@ void ScColumn::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW ScRange aRange( ScAddress( nCol1, nRow1, nTab1 ), ScAddress( nCol2, nRow2, nTab2 ) ); if ( eUpdateRefMode == URM_COPY && nRow1 == nRow2 ) - { // z.B. eine einzelne Zelle aus dem Clipboard eingefuegt + { // z.B. eine einzelne Zelle aus dem Clipboard eingefuegt SCSIZE nIndex; if ( Search( nRow1, nIndex ) ) { ScFormulaCell* pCell = (ScFormulaCell*) pItems[nIndex].pCell; if( pCell->GetCellType() == CELLTYPE_FORMULA) - pCell->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, pUndoDoc ); + pCell->UpdateReference( eUpdateRefMode, aRange, nDx, nDy, nDz, pUndoDoc ); } } else @@ -1699,7 +1699,7 @@ void ScColumn::UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, SCROW nRow = pItems[i].nRow; ((ScFormulaCell*)pCell)->UpdateTranspose( rSource, rDest, pUndoDoc ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1716,7 +1716,7 @@ void ScColumn::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) SCROW nRow = pItems[i].nRow; ((ScFormulaCell*)pCell)->UpdateGrow( rArea, nGrowX, nGrowY ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1742,7 +1742,7 @@ void ScColumn::UpdateInsertTabOnlyCells( SCTAB nTable) SCROW nRow = pItems[i].nRow; pCell->UpdateInsertTab(nTable); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1759,7 +1759,7 @@ void ScColumn::UpdateInsertTabAbs(SCTAB nTable) SCROW nRow = pItems[i].nRow; pCell->UpdateInsertTabAbs(nTable); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1783,7 +1783,7 @@ void ScColumn::UpdateDeleteTab( SCTAB nTable, BOOL bIsMove, ScColumn* pRefUndo ) BOOL bChanged = pOld->UpdateDeleteTab(nTable, bIsMove); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? if (pRefUndo) { @@ -1809,7 +1809,7 @@ void ScColumn::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos, SCTAB nTabNo ) SCROW nRow = pItems[i].nRow; pCell->UpdateMoveTab( nOldPos, nNewPos, nTabNo ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1826,7 +1826,7 @@ void ScColumn::UpdateCompile( BOOL bForceIfNameInUse ) SCROW nRow = pItems[i].nRow; p->UpdateCompile( bForceIfNameInUse ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -1901,7 +1901,7 @@ void ScColumn::SetDirty() { // wird nur dokumentweit verwendet, kein FormulaTrack BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCSIZE i=0; i<nCount; i++) { ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell; @@ -1917,11 +1917,11 @@ void ScColumn::SetDirty() void ScColumn::SetDirty( const ScRange& rRange ) -{ // broadcastet alles innerhalb eines Range, mit FormulaTrack +{ // broadcastet alles innerhalb eines Range, mit FormulaTrack if ( !pItems || !nCount ) return ; BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SCROW nRow2 = rRange.aEnd.Row(); ScAddress aPos( nCol, 0, nTab ); ScHint aHint( SC_HINT_DATACHANGED, aPos, NULL ); @@ -1950,7 +1950,7 @@ void ScColumn::SetTableOpDirty( const ScRange& rRange ) if ( !pItems || !nCount ) return ; BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // no multiple recalculation + pDocument->SetAutoCalc( FALSE ); // no multiple recalculation SCROW nRow2 = rRange.aEnd.Row(); ScAddress aPos( nCol, 0, nTab ); ScHint aHint( SC_HINT_TABLEOPDIRTY, aPos, NULL ); @@ -1977,7 +1977,7 @@ void ScColumn::SetTableOpDirty( const ScRange& rRange ) void ScColumn::SetDirtyAfterLoad() { BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCSIZE i=0; i<nCount; i++) { ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell; @@ -2010,7 +2010,7 @@ void ScColumn::SetDirtyAfterLoad() void ScColumn::SetRelNameDirty() { BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCSIZE i=0; i<nCount; i++) { ScFormulaCell* p = (ScFormulaCell*) pItems[i].pCell; @@ -2040,7 +2040,7 @@ void ScColumn::CalcAll() if ( pFCell->GetCode()->IsRecalcModeNormal() ) nNewVal = pFCell->GetValue(); else - nNewVal = nOldVal; // random(), jetzt() etc. + nNewVal = nOldVal; // random(), jetzt() etc. DBG_ASSERT( nOldVal==nNewVal, "CalcAll: nOldVal != nNewVal" ); #endif } @@ -2063,7 +2063,7 @@ void ScColumn::CompileAll() ((ScFormulaCell*)pCell)->SetCompile( TRUE ); ((ScFormulaCell*)pCell)->CompileTokenArray(); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -2080,7 +2080,7 @@ void ScColumn::CompileXML( ScProgress& rProgress ) SCROW nRow = pItems[i].nRow; ((ScFormulaCell*)pCell)->CompileXML( rProgress ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener geloescht/eingefuegt? + Search( nRow, i ); // Listener geloescht/eingefuegt? } } } @@ -2117,7 +2117,7 @@ void ScColumn::ResetChanged( SCROW nStartRow, SCROW nEndRow ) BOOL ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) const { - // used in GetOptimalHeight - ambiguous script type counts as edit cell + // used in GetOptimalHeight - ambiguous script type counts as edit cell SCROW nRow = 0; SCSIZE nIndex; @@ -2147,7 +2147,7 @@ SCsROW ScColumn::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, { if (rMark.IsMultiMarked()) return pAttrArray->SearchStyle( nRow, pSearchStyle, bUp, - (ScMarkArray*) rMark.GetArray()+nCol ); //! const + (ScMarkArray*) rMark.GetArray()+nCol ); //! const else return -1; } @@ -2163,7 +2163,7 @@ BOOL ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleShe { if (rMark.IsMultiMarked()) return pAttrArray->SearchStyleRange( rRow, rEndRow, pSearchStyle, bUp, - (ScMarkArray*) rMark.GetArray()+nCol ); //! const + (ScMarkArray*) rMark.GetArray()+nCol ); //! const else return FALSE; } diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 9fc09c2addc6..00e8b1130d3c 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.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 @@ -65,7 +65,7 @@ #include "editutil.hxx" #include "subtotal.hxx" #include "markdata.hxx" -#include "compiler.hxx" // ScTokenArray GetCodeLen +#include "compiler.hxx" // ScTokenArray GetCodeLen #include "dbcolect.hxx" #include "fillinfo.hxx" #include "segmenttree.hxx" @@ -76,13 +76,13 @@ // ----------------------------------------------------------------------- // factor from font size to optimal cell height (text width) -#define SC_ROT_BREAK_FACTOR 6 +#define SC_ROT_BREAK_FACTOR 6 // ----------------------------------------------------------------------- inline BOOL IsAmbiguousScript( BYTE nScript ) { - //! move to a header file + //! move to a header file return ( nScript != SCRIPTTYPE_LATIN && nScript != SCRIPTTYPE_ASIAN && nScript != SCRIPTTYPE_COMPLEX ); @@ -91,7 +91,7 @@ inline BOOL IsAmbiguousScript( BYTE nScript ) // ----------------------------------------------------------------------------------------- // -// Datei-Operationen +// Datei-Operationen // // ----------------------------------------------------------------------------------------- @@ -112,11 +112,11 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if (!pPattern) pPattern = pAttrArray->GetPattern( nRow ); - // zusammengefasst? - // Merge nicht in bedingter Formatierung + // zusammengefasst? + // Merge nicht in bedingter Formatierung - const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); - const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); + const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); + const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); if ( bWidth ) { @@ -133,12 +133,12 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, return 0; } - // bedingte Formatierung + // bedingte Formatierung const SfxItemSet* pCondSet = NULL; if ( ((const SfxUInt32Item&)pPattern->GetItem(ATTR_CONDITIONAL)).GetValue() ) pCondSet = pDocument->GetCondResult( nCol, nRow, nTab ); - // Zeilenumbruch? + // Zeilenumbruch? const SfxPoolItem* pCondItem; SvxCellHorJustify eHorJust; @@ -161,7 +161,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, // Cell has a value. Disable line break. bBreak = false; - // get other attributes from pattern and conditional formatting + // get other attributes from pattern and conditional formatting SvxCellOrientation eOrient = pPattern->GetCellOrientation( pCondSet ); BOOL bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED && @@ -169,7 +169,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if ( bAsianVertical ) bBreak = false; - if ( bWidth && bBreak ) // after determining bAsianVertical (bBreak may be reset) + if ( bWidth && bBreak ) // after determining bAsianVertical (bBreak may be reset) return 0; long nRotate = 0; @@ -191,7 +191,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, pPattern->GetItem(ATTR_ROTATE_MODE)).GetValue(); if ( nRotate == 18000 ) - eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf + eRotMode = SVX_ROTATE_MODE_STANDARD; // keinen Ueberlauf } } @@ -222,8 +222,8 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, BYTE nScript = pDocument->GetScriptType( nCol, nRow, nTab, pCell ); if (nScript == 0) nScript = ScGlobal::GetDefaultScriptType(); - // also call SetFont for edit cells, because bGetFont may be set only once - // bGetFont is set also if script type changes + // also call SetFont for edit cells, because bGetFont may be set only once + // bGetFont is set also if script type changes if (rOptions.bGetFont) { Fraction aFontZoom = ( eOrient == SVX_ORIENTATION_STANDARD ) ? rZoomX : rZoomY; @@ -241,7 +241,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, IsAmbiguousScript( nScript ) || ((eCellType == CELLTYPE_FORMULA) && ((ScFormulaCell*)pCell)->IsMultilineResult()) ); - if (!bEditEngine) // direkte Ausgabe + if (!bEditEngine) // direkte Ausgabe { String aValStr; Color* pColor; @@ -252,7 +252,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, TRUE, rOptions.bFormula, ftCheck ); if (aValStr.Len()) { - // SetFont ist nach oben verschoben + // SetFont ist nach oben verschoben Size aSize( pDev->GetTextWidth( aValStr ), pDev->GetTextHeight() ); if ( eOrient != SVX_ORIENTATION_STANDARD ) @@ -263,9 +263,9 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, } else if ( nRotate ) { - //! unterschiedliche Skalierung X/Y beruecksichtigen + //! unterschiedliche Skalierung X/Y beruecksichtigen - double nRealOrient = nRotate * F_PI18000; // nRotate sind 1/100 Grad + double nRealOrient = nRotate * F_PI18000; // nRotate sind 1/100 Grad double nCosAbs = fabs( cos( nRealOrient ) ); double nSinAbs = fabs( sin( nRealOrient ) ); long nHeight = (long)( aSize.Height() * nCosAbs + aSize.Width() * nSinAbs ); @@ -276,18 +276,18 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, { nWidth = (long) ( pDocument->GetColWidth( nCol,nTab ) * nPPT ); bAddMargin = FALSE; - // nur nach rechts: - //! unterscheiden nach Ausrichtung oben/unten (nur Text/ganze Hoehe) + // nur nach rechts: + //! unterscheiden nach Ausrichtung oben/unten (nur Text/ganze Hoehe) if ( pPattern->GetRotateDir( pCondSet ) == SC_ROTDIR_RIGHT ) nWidth += (long)( pDocument->GetRowHeight( nRow,nTab ) * nPPT * nCosAbs / nSinAbs ); } else - nWidth = (long)( aSize.Height() / nSinAbs ); //! begrenzen? + nWidth = (long)( aSize.Height() / nSinAbs ); //! begrenzen? if ( bBreak && !rOptions.bTotalSize ) { - // #47744# limit size for line break + // #47744# limit size for line break long nCmp = pDev->GetFont().GetSize().Height() * SC_ROT_BREAK_FACTOR; if ( nHeight > nCmp ) nHeight = nCmp; @@ -311,18 +311,18 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, (long) ( pMargin->GetBottomMargin() * nPPT ); } - // Zeilenumbruch ausgefuehrt ? + // Zeilenumbruch ausgefuehrt ? if ( bBreak && !bWidth ) { - // Test mit EditEngine zur Sicherheit schon bei 90% - // (wegen Rundungsfehlern und weil EditEngine teilweise anders formatiert) + // Test mit EditEngine zur Sicherheit schon bei 90% + // (wegen Rundungsfehlern und weil EditEngine teilweise anders formatiert) long nDocPixel = (long) ( ( pDocument->GetColWidth( nCol,nTab ) - pMargin->GetLeftMargin() - pMargin->GetRightMargin() - nIndent ) * nPPT ); - nDocPixel = (nDocPixel * 9) / 10; // zur Sicherheit + nDocPixel = (nDocPixel * 9) / 10; // zur Sicherheit if ( aSize.Width() > nDocPixel ) bEditEngine = TRUE; } @@ -331,7 +331,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if (bEditEngine) { - // der Font wird bei !bEditEngine nicht jedesmal neu gesetzt + // der Font wird bei !bEditEngine nicht jedesmal neu gesetzt Font aOldFont = pDev->GetFont(); MapMode aHMMMode( MAP_100TH_MM, Point(), rZoomX, rZoomY ); @@ -349,8 +349,8 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, SfxItemSet* pSet = new SfxItemSet( pEngine->GetEmptyItemSet() ); pPattern->FillEditItemSet( pSet, pCondSet ); -// no longer needed, are setted with the text (is faster) -// pEngine->SetDefaults( pSet ); +// no longer needed, are setted with the text (is faster) +// pEngine->SetDefaults( pSet ); if ( ((const SfxBoolItem&)pSet->Get(EE_PARA_HYPHENATE)).GetValue() ) { @@ -367,9 +367,9 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, BOOL bTextWysiwyg = ( pDev->GetOutDevType() == OUTDEV_PRINTER ); if ( bTextWysiwyg ) { - // #95593# if text is formatted for printer, don't use PixelToLogic, - // to ensure the exact same paper width (and same line breaks) as in - // ScEditUtil::GetEditArea, used for output. + // #95593# if text is formatted for printer, don't use PixelToLogic, + // to ensure the exact same paper width (and same line breaks) as in + // ScEditUtil::GetEditArea, used for output. fWidthFactor = HMM_PER_TWIPS; } @@ -382,7 +382,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, nDocWidth += (long) ( pDocument->GetColWidth(nCol+nColAdd,nTab) * fWidthFactor ); nDocWidth -= (long) ( pMargin->GetLeftMargin() * fWidthFactor ) + (long) ( pMargin->GetRightMargin() * fWidthFactor ) - + 1; // Ausgabebereich ist Breite-1 Pixel (wegen Gitterlinien) + + 1; // Ausgabebereich ist Breite-1 Pixel (wegen Gitterlinien) if ( nIndent ) nDocWidth -= (long) ( nIndent * fWidthFactor ); @@ -427,10 +427,10 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, bEdWidth = !bEdWidth; if ( nRotate ) { - //! unterschiedliche Skalierung X/Y beruecksichtigen + //! unterschiedliche Skalierung X/Y beruecksichtigen Size aSize( pEngine->CalcTextWidth(), pEngine->GetTextHeight() ); - double nRealOrient = nRotate * F_PI18000; // nRotate sind 1/100 Grad + double nRealOrient = nRotate * F_PI18000; // nRotate sind 1/100 Grad double nCosAbs = fabs( cos( nRealOrient ) ); double nSinAbs = fabs( sin( nRealOrient ) ); long nHeight = (long)( aSize.Height() * nCosAbs + aSize.Width() * nSinAbs ); @@ -446,7 +446,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, nPPT * nCosAbs / nSinAbs ); } else - nWidth = (long)( aSize.Height() / nSinAbs ); //! begrenzen? + nWidth = (long)( aSize.Height() / nSinAbs ); //! begrenzen? aSize = Size( nWidth, nHeight ); Size aPixSize = pDev->LogicToPixel( aSize, aHMMMode ); @@ -458,7 +458,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if ( bBreak && !rOptions.bTotalSize ) { - // #47744# limit size for line break + // #47744# limit size for line break long nCmp = aOldFont.GetSize().Height() * SC_ROT_BREAK_FACTOR; if ( nValue > nCmp ) nValue = nCmp; @@ -473,7 +473,7 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, nValue = pDev->LogicToPixel(Size( pEngine->CalcTextWidth(), 0 ), aHMMMode).Width(); } - else // Hoehe + else // Hoehe { nValue = pDev->LogicToPixel(Size( 0, pEngine->GetTextHeight() ), aHMMMode).Height(); @@ -495,13 +495,13 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if ( bAsianVertical && pDev->GetOutDevType() != OUTDEV_PRINTER ) { - // add 1pt extra (default margin value) for line breaks with SetVertical + // add 1pt extra (default margin value) for line breaks with SetVertical nValue += (long) ( 20 * nPPT ); } } } - // EditEngine is cached and re-used, so the old vertical flag must be restored + // EditEngine is cached and re-used, so the old vertical flag must be restored pEngine->SetVertical( bEngineVertical ); pDocument->DisposeFieldEditEngine(pEngine); @@ -512,9 +512,9 @@ long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, if (bWidth) { - // Platz fuer Autofilter-Button - // 20 * nZoom/100 - // bedingte Formatierung hier nicht interessant + // Platz fuer Autofilter-Button + // 20 * nZoom/100 + // bedingte Formatierung hier nicht interessant INT16 nFlags = ((const ScMergeFlagAttr&)pPattern->GetItem(ATTR_MERGE_FLAG)).GetValue(); if (nFlags & SC_MF_AUTO) @@ -559,13 +559,13 @@ USHORT ScColumn::GetOptimalColWidth( OutputDevice* pDev, double nPPTX, double nP if (nCount == 0) return nOldWidth; - USHORT nWidth = (USHORT) (nOldWidth * nPPTX); - BOOL bFound = FALSE; + USHORT nWidth = (USHORT) (nOldWidth * nPPTX); + BOOL bFound = FALSE; SCSIZE nIndex; ScMarkedDataIter aDataIter(this, pMarkData, TRUE); if ( pParam && pParam->mbSimpleText ) - { // alles eins bis auf NumberFormate + { // alles eins bis auf NumberFormate const ScPatternAttr* pPattern = GetPattern( 0 ); Font aFont; // font color doesn't matter here @@ -660,13 +660,13 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId USHORT nHeight = (USHORT) ((const SvxFontHeightItem&) rPattern.GetItem(nFontHeightId)).GetHeight(); const SvxMarginItem* pMargin = (const SvxMarginItem*) &rPattern.GetItem(ATTR_MARGIN); nHeight += nHeight / 5; - // gibt bei 10pt 240 + // gibt bei 10pt 240 if ( ((const SvxEmphasisMarkItem&)rPattern. GetItem(ATTR_FONT_EMPHASISMARK)).GetEmphasisMark() != EMPHASISMARK_NONE ) { - // add height for emphasis marks - //! font metrics should be used instead + // add height for emphasis marks + //! font metrics should be used instead nHeight += nHeight / 4; } @@ -676,8 +676,8 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId nHeight -= 240; } - // Standard-Hoehe: TextHeight + Raender - 23 - // -> 257 unter Windows + // Standard-Hoehe: TextHeight + Raender - 23 + // -> 257 unter Windows if (nHeight > STD_ROWHEIGHT_DIFF) nHeight -= STD_ROWHEIGHT_DIFF; @@ -687,9 +687,9 @@ USHORT lcl_GetAttribHeight( const ScPatternAttr& rPattern, USHORT nFontHeightId return nHeight; } -// pHeight in Twips -// nMinHeight, nMinStart zur Optimierung: ab nRow >= nMinStart ist mindestens nMinHeight -// (wird nur bei bStdAllowed ausgewertet) +// pHeight in Twips +// nMinHeight, nMinStart zur Optimierung: ab nRow >= nMinStart ist mindestens nMinHeight +// (wird nur bei bStdAllowed ausgewertet) void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight, OutputDevice* pDev, @@ -704,18 +704,18 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight SCROW nEditPos = 0; SCROW nNextEnd = 0; - // bei bedingter Formatierung werden immer die einzelnen Zellen angesehen + // bei bedingter Formatierung werden immer die einzelnen Zellen angesehen const ScPatternAttr* pPattern = aIter.Next(nStart,nEnd); while ( pPattern ) { - const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); - const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); + const ScMergeAttr* pMerge = (const ScMergeAttr*)&pPattern->GetItem(ATTR_MERGE); + const ScMergeFlagAttr* pFlag = (const ScMergeFlagAttr*)&pPattern->GetItem(ATTR_MERGE_FLAG); if ( pMerge->GetRowMerge() > 1 || pFlag->IsOverlapped() ) { - // nix - vertikal bei der zusammengefassten und den ueberdeckten, - // horizontal nur bei den ueberdeckten (unsichtbaren) - - // eine nur horizontal zusammengefasste wird aber beruecksichtigt + // nix - vertikal bei der zusammengefassten und den ueberdeckten, + // horizontal nur bei den ueberdeckten (unsichtbaren) - + // eine nur horizontal zusammengefasste wird aber beruecksichtigt } else { @@ -742,20 +742,20 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight } if (bStdOnly) - if (HasEditCells(nStart,nEnd,nEditPos)) // includes mixed script types + if (HasEditCells(nStart,nEnd,nEditPos)) // includes mixed script types { if (nEditPos == nStart) { bStdOnly = FALSE; if (nEnd > nEditPos) nNextEnd = nEnd; - nEnd = nEditPos; // einzeln ausrechnen - bStdAllowed = FALSE; // wird auf jeden Fall per Zelle berechnet + nEnd = nEditPos; // einzeln ausrechnen + bStdAllowed = FALSE; // wird auf jeden Fall per Zelle berechnet } else { nNextEnd = nEnd; - nEnd = nEditPos - 1; // Standard - Teil + nEnd = nEditPos - 1; // Standard - Teil } } @@ -773,8 +773,8 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight else nDefHeight = nLatHeight = lcl_GetAttribHeight( *pPattern, ATTR_FONT_HEIGHT ); - // if everything below is already larger, the loop doesn't have to - // be run again + // if everything below is already larger, the loop doesn't have to + // be run again SCROW nStdEnd = nEnd; if ( nDefHeight <= nMinHeight && nStdEnd >= nMinStart ) nStdEnd = (nMinStart>0) ? nMinStart-1 : 0; @@ -785,8 +785,8 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight if ( bStdOnly ) { - // if cells are not handled individually below, - // check for cells with different script type + // if cells are not handled individually below, + // check for cells with different script type SCSIZE nIndex; Search(nStart,nIndex); @@ -822,7 +822,7 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight } } - if (!bStdOnly) // belegte Zellen suchen + if (!bStdOnly) // belegte Zellen suchen { ScNeededSizeOptions aOptions; @@ -830,7 +830,7 @@ void ScColumn::GetOptimalHeight( SCROW nStartRow, SCROW nEndRow, USHORT* pHeight Search(nStart,nIndex); while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEnd) : FALSE ) { - // Zellhoehe nur berechnen, wenn sie spaeter auch gebraucht wird (#37928#) + // Zellhoehe nur berechnen, wenn sie spaeter auch gebraucht wird (#37928#) if ( bShrink || !(pDocument->GetRowFlags(nRow, nTab) & CR_MANUALSIZE) ) { @@ -921,27 +921,27 @@ void ScColumn::RemoveAutoSpellObj() { ScEditCell* pOldCell = (ScEditCell*) pItems[i].pCell; const EditTextObject* pData = pOldCell->GetData(); - // keine Abfrage auf HasOnlineSpellErrors, damit es auch - // nach dem Laden funktioniert + // keine Abfrage auf HasOnlineSpellErrors, damit es auch + // nach dem Laden funktioniert - // Fuer den Test auf harte Formatierung (ScEditAttrTester) sind die Defaults - // in der EditEngine unwichtig. Wenn der Tester spaeter einmal gleiche - // Attribute in Default und harter Formatierung erkennen und weglassen sollte, - // muessten an der EditEngine zu jeder Zelle die richtigen Defaults gesetzt - // werden! + // Fuer den Test auf harte Formatierung (ScEditAttrTester) sind die Defaults + // in der EditEngine unwichtig. Wenn der Tester spaeter einmal gleiche + // Attribute in Default und harter Formatierung erkennen und weglassen sollte, + // muessten an der EditEngine zu jeder Zelle die richtigen Defaults gesetzt + // werden! - // auf Attribute testen + // auf Attribute testen if ( !pEngine ) pEngine = new ScTabEditEngine(pDocument); pEngine->SetText( *pData ); ScEditAttrTester aTester( pEngine ); - if ( aTester.NeedsObject() ) // nur Spell-Errors entfernen + if ( aTester.NeedsObject() ) // nur Spell-Errors entfernen { - EditTextObject* pNewData = pEngine->CreateTextObject(); // ohne BIGOBJ + EditTextObject* pNewData = pEngine->CreateTextObject(); // ohne BIGOBJ pOldCell->SetData( pNewData, pEngine->GetEditTextObjectPool() ); delete pNewData; } - else // String erzeugen + else // String erzeugen { String aText = ScEditUtil::GetSpaceDelimitedString( *pEngine ); ScBaseCell* pNewCell = new ScStringCell( aText ); @@ -967,18 +967,18 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ) ScEditCell* pOldCell = (ScEditCell*) pItems[i].pCell; const EditTextObject* pData = pOldCell->GetData(); - // Fuer den Test auf harte Formatierung (ScEditAttrTester) sind die Defaults - // in der EditEngine unwichtig. Wenn der Tester spaeter einmal gleiche - // Attribute in Default und harter Formatierung erkennen und weglassen sollte, - // muessten an der EditEngine zu jeder Zelle die richtigen Defaults gesetzt - // werden! + // Fuer den Test auf harte Formatierung (ScEditAttrTester) sind die Defaults + // in der EditEngine unwichtig. Wenn der Tester spaeter einmal gleiche + // Attribute in Default und harter Formatierung erkennen und weglassen sollte, + // muessten an der EditEngine zu jeder Zelle die richtigen Defaults gesetzt + // werden! - // auf Attribute testen + // auf Attribute testen if ( !pEngine ) { //pEngine = new ScTabEditEngine(pDocument); pEngine = new ScFieldEditEngine( pDocument->GetEditPool() ); - // EE_CNTRL_ONLINESPELLING falls schon Fehler drin sind + // EE_CNTRL_ONLINESPELLING falls schon Fehler drin sind pEngine->SetControlWord( pEngine->GetControlWord() | EE_CNTRL_ONLINESPELLING ); pEngine->SetForbiddenCharsTable( pDocument->GetForbiddenCharacters() ); pEngine->SetAsianCompressionMode( pDocument->GetAsianCompression() ); @@ -992,18 +992,18 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ) const SfxItemSet& rOld = pEngine->GetParaAttribs( nPar ); if ( rOld.Count() ) { - SfxItemSet aNew( *rOld.GetPool(), rOld.GetRanges() ); // leer + SfxItemSet aNew( *rOld.GetPool(), rOld.GetRanges() ); // leer pEngine->SetParaAttribs( nPar, aNew ); } } - // URL-Felder in Text wandeln (andere gibt's nicht, darum pType=0) + // URL-Felder in Text wandeln (andere gibt's nicht, darum pType=0) pEngine->RemoveFields( TRUE ); BOOL bSpellErrors = pEngine->HasOnlineSpellErrors(); - BOOL bNeedObject = bSpellErrors || nParCount>1; // Errors/Absaetze behalten - // ScEditAttrTester nicht mehr noetig, Felder sind raus + BOOL bNeedObject = bSpellErrors || nParCount>1; // Errors/Absaetze behalten + // ScEditAttrTester nicht mehr noetig, Felder sind raus - if ( bNeedObject ) // bleibt Edit-Zelle + if ( bNeedObject ) // bleibt Edit-Zelle { ULONG nCtrl = pEngine->GetControlWord(); ULONG nWantBig = bSpellErrors ? EE_CNTRL_ALLOWBIGOBJS : 0; @@ -1013,7 +1013,7 @@ void ScColumn::RemoveEditAttribs( SCROW nStartRow, SCROW nEndRow ) pOldCell->SetData( pNewData, pEngine->GetEditTextObjectPool() ); delete pNewData; } - else // String erzeugen + else // String erzeugen { String aText = ScEditUtil::GetSpaceDelimitedString( *pEngine ); ScBaseCell* pNewCell = new ScStringCell( aText ); @@ -1072,9 +1072,9 @@ BOOL ScColumnIterator::Next( SCROW& rRow, ScBaseCell*& rpCell ) return FALSE; } -SCSIZE ScColumnIterator::GetIndex() const // Index zur letzen abgefragten Zelle +SCSIZE ScColumnIterator::GetIndex() const // Index zur letzen abgefragten Zelle { - return nPos - 1; // bei Next ist Pos hochgezaehlt worden + return nPos - 1; // bei Next ist Pos hochgezaehlt worden } // ----------------------------------------------------------------------------------------- @@ -1104,17 +1104,17 @@ BOOL ScMarkedDataIter::Next( SCSIZE& rIndex ) { if (!pMarkIter || !pMarkIter->Next( nTop, nBottom )) { - if (bAll) // ganze Spalte + if (bAll) // ganze Spalte { - nTop = 0; - nBottom = MAXROW; + nTop = 0; + nBottom = MAXROW; } else return FALSE; } pColumn->Search( nTop, nPos ); bNext = FALSE; - bAll = FALSE; // nur beim ersten Versuch + bAll = FALSE; // nur beim ersten Versuch } if ( nPos >= pColumn->nCount ) @@ -1159,7 +1159,7 @@ BOOL ScColumn::IsEmptyVisData(BOOL bNotes) const SCSIZE ScColumn::VisibleCount( SCROW nStartRow, SCROW nEndRow ) const { - // Notizen werden nicht mitgezaehlt + // Notizen werden nicht mitgezaehlt SCSIZE nVisCount = 0; SCSIZE nIndex; @@ -1254,10 +1254,10 @@ BOOL ScColumn::IsEmptyBlock(SCROW nStartRow, SCROW nEndRow, bool bIgnoreNotes) c while ( nIndex < nCount && pItems[nIndex].nRow <= nEndRow ) { if ( !pItems[nIndex].pCell->IsBlank( bIgnoreNotes ) ) // found a cell - return FALSE; // not empty + return FALSE; // not empty ++nIndex; } - return TRUE; // no cell found + return TRUE; // no cell found } SCSIZE ScColumn::GetEmptyLinesInBlock( SCROW nStartRow, SCROW nEndRow, ScDirection eDir ) const @@ -1333,11 +1333,11 @@ BOOL ScColumn::GetPrevDataPos(SCROW& rRow) const return bFound; } -BOOL ScColumn::GetNextDataPos(SCROW& rRow) const // greater than rRow +BOOL ScColumn::GetNextDataPos(SCROW& rRow) const // greater than rRow { SCSIZE nIndex; if (Search( rRow, nIndex )) - ++nIndex; // next cell + ++nIndex; // next cell BOOL bMore = ( nIndex < nCount ); if ( bMore ) @@ -1425,11 +1425,11 @@ void ScColumn::FindDataAreaPos(SCROW& rRow, long nMovY) const BOOL ScColumn::HasDataAt(SCROW nRow) const { -/* SCSIZE nIndex; +/* SCSIZE nIndex; return Search( nRow, nIndex ); */ - // immer nur sichtbare interessant ? - //! dann HasVisibleDataAt raus + // immer nur sichtbare interessant ? + //! dann HasVisibleDataAt raus SCSIZE nIndex; if (Search(nRow, nIndex)) @@ -1575,11 +1575,11 @@ void ScColumn::EndListening( SvtListener& rLst, SCROW nRow ) pCell->DeleteBroadcaster(); } } -// else -// DBG_ERROR("ScColumn::EndListening - kein Broadcaster"); +// else +// DBG_ERROR("ScColumn::EndListening - kein Broadcaster"); } -// else -// DBG_ERROR("ScColumn::EndListening - keine Zelle"); +// else +// DBG_ERROR("ScColumn::EndListening - keine Zelle"); } void ScColumn::CompileDBFormula() @@ -1639,12 +1639,12 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) break; case CELLTYPE_FORMULA: { - if ( rData.eFunc != SUBTOTAL_FUNC_CNT2 ) // da interessiert's nicht + if ( rData.eFunc != SUBTOTAL_FUNC_CNT2 ) // da interessiert's nicht { ScFormulaCell* pFC = (ScFormulaCell*)pCell; if ( pFC->GetErrCode() ) { - if ( rData.eFunc != SUBTOTAL_FUNC_CNT ) // fuer Anzahl einfach weglassen + if ( rData.eFunc != SUBTOTAL_FUNC_CNT ) // fuer Anzahl einfach weglassen rData.bError = TRUE; } else if (pFC->IsValue()) @@ -1679,11 +1679,11 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) rData.bError = TRUE; } break; - case SUBTOTAL_FUNC_CNT: // nur Werte + case SUBTOTAL_FUNC_CNT: // nur Werte if (bVal) ++rData.nCount; break; - case SUBTOTAL_FUNC_CNT2: // alle + case SUBTOTAL_FUNC_CNT2: // alle if (bCell) ++rData.nCount; break; @@ -1705,7 +1705,7 @@ void lcl_UpdateSubTotal( ScFunctionData& rData, ScBaseCell* pCell ) } } -// Mehrfachselektion: +// Mehrfachselektion: void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark, ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, @@ -1723,7 +1723,7 @@ void ScColumn::UpdateSelectionFunction( const ScMarkData& rMark, } } -// bei bNoMarked die Mehrfachselektion weglassen +// bei bNoMarked die Mehrfachselektion weglassen void ScColumn::UpdateAreaFunction( ScFunctionData& rData, ScFlatBoolRowSegments& rHiddenRows, SCROW nStartRow, SCROW nEndRow ) @@ -1744,7 +1744,7 @@ ULONG ScColumn::GetWeightedCount() const { ULONG nTotal = 0; - // Notizen werden nicht gezaehlt + // Notizen werden nicht gezaehlt for (SCSIZE i=0; i<nCount; i++) { diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index b34e764a11a7..717883a07def 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.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,10 +47,10 @@ #include "formula/errorcodes.hxx" #include "formula/token.hxx" #include "brdcst.hxx" -#include "docoptio.hxx" // GetStdPrecision fuer GetMaxNumberStringLen +#include "docoptio.hxx" // GetStdPrecision fuer GetMaxNumberStringLen #include "subtotal.hxx" #include "markdata.hxx" -#include "detfunc.hxx" // fuer Notizen bei DeleteRange +#include "detfunc.hxx" // fuer Notizen bei DeleteRange #include "postit.hxx" #include "stringutil.hxx" #include "docpool.hxx" @@ -62,7 +62,7 @@ using ::rtl::OUString; using ::rtl::OUStringBuffer; // Err527 Workaround -extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx +extern const ScFormulaCell* pLastFormulaTreeTop; // in cellform.cxx using namespace formula; // STATIC DATA ----------------------------------------------------------- @@ -82,7 +82,7 @@ void ScColumn::Insert( SCROW nRow, ScBaseCell* pNewCell ) } if ( !bIsAppended ) { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pOldCell = pItems[nIndex].pCell; @@ -205,13 +205,13 @@ void ScColumn::Append( SCROW nRow, ScBaseCell* pCell ) void ScColumn::Delete( SCROW nRow ) { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; ScNoteCell* pNoteCell = new ScNoteCell; - pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret + pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret pDocument->Broadcast( ScHint( SC_HINT_DYING, ScAddress( nCol, nRow, nTab ), pCell ) ); if ( SvtBroadcaster* pBC = pCell->ReleaseBroadcaster() ) @@ -225,7 +225,7 @@ void ScColumn::Delete( SCROW nRow ) memmove( &pItems[nIndex], &pItems[nIndex + 1], (nCount - nIndex) * sizeof(ColEntry) ); pItems[nCount].nRow = 0; pItems[nCount].pCell = NULL; - // Soll man hier den Speicher freigeben (delta)? Wird dann langsamer! + // Soll man hier den Speicher freigeben (delta)? Wird dann langsamer! } pCell->EndListeningTo( pDocument ); pCell->Delete(); @@ -237,7 +237,7 @@ void ScColumn::DeleteAtIndex( SCSIZE nIndex ) { ScBaseCell* pCell = pItems[nIndex].pCell; ScNoteCell* pNoteCell = new ScNoteCell; - pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret + pItems[nIndex].pCell = pNoteCell; // Dummy fuer Interpret pDocument->Broadcast( ScHint( SC_HINT_DYING, ScAddress( nCol, pItems[nIndex].nRow, nTab ), pCell ) ); delete pNoteCell; @@ -277,7 +277,7 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize ) return ; BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden BOOL bFound=FALSE; SCROW nEndRow = nStartRow + nSize - 1; @@ -299,9 +299,9 @@ void ScColumn::DeleteRow( SCROW nStartRow, SCSIZE nSize ) if (pBC) { // gibt jetzt invalid reference, kein Aufruecken der direkten Referenzen -// MoveListeners( *pBC, nRow+nSize ); +// MoveListeners( *pBC, nRow+nSize ); pCell->DeleteBroadcaster(); - // in DeleteRange werden leere Broadcaster geloescht + // in DeleteRange werden leere Broadcaster geloescht } } if (bFound) @@ -551,10 +551,10 @@ void ScColumn::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex, USHORT nDelFla void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag) { - // FreeAll darf hier nicht gerufen werden wegen Broadcastern + // FreeAll darf hier nicht gerufen werden wegen Broadcastern - // Attribute erst am Ende, damit vorher noch zwischen Zahlen und Datum - // unterschieden werden kann (#47901#) + // Attribute erst am Ende, damit vorher noch zwischen Zahlen und Datum + // unterschieden werden kann (#47901#) USHORT nContMask = IDF_CONTENTS; // IDF_NOCAPTIONS needs to be passed too, if IDF_NOTE is set @@ -592,7 +592,7 @@ void ScColumn::DeleteArea(SCROW nStartRow, SCROW nEndRow, USHORT nDelFlag) RemoveEditAttribs( nStartRow, nEndRow ); } - // Attribute erst hier + // Attribute erst hier if ((nDelFlag & IDF_ATTRIB) == IDF_ATTRIB) pAttrArray->DeleteArea( nStartRow, nEndRow ); else if ((nDelFlag & IDF_ATTRIB) != 0) pAttrArray->DeleteHardAttr( nStartRow, nEndRow ); } @@ -605,8 +605,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r if (!nContFlags) return NULL; - // Testen, ob Zelle kopiert werden soll - // auch bei IDF_CONTENTS komplett, wegen Notes / Broadcastern + // Testen, ob Zelle kopiert werden soll + // auch bei IDF_CONTENTS komplett, wegen Notes / Broadcastern BOOL bMatch = FALSE; ScBaseCell* pCell = pItems[nIndex].pCell; @@ -632,8 +632,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r } break; case CELLTYPE_STRING: - case CELLTYPE_EDIT: bMatch = ((nFlags & IDF_STRING) != 0); break; - case CELLTYPE_FORMULA: bMatch = ((nFlags & IDF_FORMULA) != 0); break; + case CELLTYPE_EDIT: bMatch = ((nFlags & IDF_STRING) != 0); break; + case CELLTYPE_FORMULA: bMatch = ((nFlags & IDF_FORMULA) != 0); break; default: { // added to avoid warnings @@ -643,16 +643,16 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r return NULL; - // Referenz einsetzen + // Referenz einsetzen ScSingleRefData aRef; aRef.nCol = nCol; aRef.nRow = pItems[nIndex].nRow; aRef.nTab = nTab; - aRef.InitFlags(); // -> alles absolut + aRef.InitFlags(); // -> alles absolut aRef.SetFlag3D(TRUE); - //! 3D(FALSE) und TabRel(TRUE), wenn die endgueltige Position auf der selben Tabelle ist? - //! (bei TransposeClip ist die Zielposition noch nicht bekannt) + //! 3D(FALSE) und TabRel(TRUE), wenn die endgueltige Position auf der selben Tabelle ist? + //! (bei TransposeClip ist die Zielposition noch nicht bekannt) aRef.CalcRelFromAbs( rDestPos ); @@ -663,8 +663,8 @@ ScFormulaCell* ScColumn::CreateRefCell( ScDocument* pDestDoc, const ScAddress& r } -// rColumn = Quelle -// nRow1, nRow2 = Zielposition +// rColumn = Quelle +// nRow1, nRow2 = Zielposition void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, USHORT nInsFlag, BOOL bAsLink, BOOL bSkipAttrForEmpty, @@ -674,8 +674,8 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, { if ( bSkipAttrForEmpty ) { - // copy only attributes for non-empty cells - // (notes are not counted as non-empty here, to match the content behavior) + // copy only attributes for non-empty cells + // (notes are not counted as non-empty here, to match the content behavior) SCSIZE nStartIndex; rColumn.Search( nRow1-nDy, nStartIndex ); @@ -687,7 +687,7 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, SCROW nStartRow = rColumn.pItems[nStartIndex].nRow; SCROW nEndRow = nStartRow; - // find consecutive non-empty cells + // find consecutive non-empty cells while ( nEndRow < nRow2-nDy && nEndIndex+1 < rColumn.nCount && @@ -711,25 +711,25 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, if ( bAsLink && nInsFlag == IDF_ALL ) { - // bei "alles" werden auch leere Zellen referenziert - //! IDF_ALL muss immer mehr Flags enthalten, als bei "Inhalte Einfuegen" - //! einzeln ausgewaehlt werden koennen! + // bei "alles" werden auch leere Zellen referenziert + //! IDF_ALL muss immer mehr Flags enthalten, als bei "Inhalte Einfuegen" + //! einzeln ausgewaehlt werden koennen! Resize( nCount + static_cast<SCSIZE>(nRow2-nRow1+1) ); - ScAddress aDestPos( nCol, 0, nTab ); // Row wird angepasst + ScAddress aDestPos( nCol, 0, nTab ); // Row wird angepasst - // Referenz erzeugen (Quell-Position) + // Referenz erzeugen (Quell-Position) ScSingleRefData aRef; aRef.nCol = rColumn.nCol; - // nRow wird angepasst + // nRow wird angepasst aRef.nTab = rColumn.nTab; - aRef.InitFlags(); // -> alles absolut + aRef.InitFlags(); // -> alles absolut aRef.SetFlag3D(TRUE); for (SCROW nDestRow = nRow1; nDestRow <= nRow2; nDestRow++) { - aRef.nRow = nDestRow - nDy; // Quell-Zeile + aRef.nRow = nDestRow - nDy; // Quell-Zeile aDestPos.SetRow( nDestRow ); aRef.CalcRelFromAbs( aDestPos ); @@ -765,8 +765,8 @@ void ScColumn::CopyFromClip(SCROW nRow1, SCROW nRow2, long nDy, bAtEnd = TRUE; else if ( nDestRow >= (SCsROW) nRow1 ) { - // rows at the beginning may be skipped if filtered rows are left out, - // nDestRow may be negative then + // rows at the beginning may be skipped if filtered rows are left out, + // nDestRow may be negative then ScAddress aDestPos( nCol, (SCROW)nDestRow, nTab ); @@ -954,7 +954,7 @@ void ScColumn::MixMarked( const ScMarkData& rMark, USHORT nFunction, } -// Ergebnis in rVal1 +// Ergebnis in rVal1 BOOL lcl_DoFunction( double& rVal1, double nVal2, USHORT nFunction ) { @@ -965,7 +965,7 @@ BOOL lcl_DoFunction( double& rVal1, double nVal2, USHORT nFunction ) bOk = SubTotal::SafePlus( rVal1, nVal2 ); break; case PASTE_SUB: - nVal2 = -nVal2; //! geht das immer ohne Fehler? + nVal2 = -nVal2; //! geht das immer ohne Fehler? bOk = SubTotal::SafePlus( rVal1, nVal2 ); break; case PASTE_MUL: @@ -1007,9 +1007,9 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, SCSIZE nIndex; Search( nRow1, nIndex ); -// SCSIZE nSrcIndex = 0; +// SCSIZE nSrcIndex = 0; SCSIZE nSrcIndex; - rSrcCol.Search( nRow1, nSrcIndex ); //! Testen, ob Daten ganz vorne + rSrcCol.Search( nRow1, nSrcIndex ); //! Testen, ob Daten ganz vorne SCROW nNextThis = MAXROW+1; if ( nIndex < nCount ) @@ -1041,14 +1041,14 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, BOOL bSrcEmpty = ( eSrcType == CELLTYPE_NONE || eSrcType == CELLTYPE_NOTE ); BOOL bDestEmpty = ( eDestType == CELLTYPE_NONE || eDestType == CELLTYPE_NOTE ); - if ( bSkipEmpty && bDestEmpty ) // Originalzelle wiederherstellen + if ( bSkipEmpty && bDestEmpty ) // Originalzelle wiederherstellen { - if ( pSrc ) // war da eine Zelle? + if ( pSrc ) // war da eine Zelle? { pNew = pSrc->CloneWithoutNote( *pDocument ); } } - else if ( nFunction ) // wirklich Rechenfunktion angegeben + else if ( nFunction ) // wirklich Rechenfunktion angegeben { double nVal1; double nVal2; @@ -1061,7 +1061,7 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, else nVal2 = 0.0; - // leere Zellen werden als Werte behandelt + // leere Zellen werden als Werte behandelt BOOL bSrcVal = ( bSrcEmpty || eSrcType == CELLTYPE_VALUE ); BOOL bDestVal = ( bDestEmpty || eDestType == CELLTYPE_VALUE ); @@ -1071,15 +1071,15 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, BOOL bDestText = ( eDestType == CELLTYPE_STRING || eDestType == CELLTYPE_EDIT ); - // sonst bleibt nur Formel... + // sonst bleibt nur Formel... if ( bSrcEmpty && bDestEmpty ) { - // beide leer -> nix + // beide leer -> nix } else if ( bSrcVal && bDestVal ) { - // neuen Wert eintragen, oder Fehler bei Ueberlauf + // neuen Wert eintragen, oder Fehler bei Ueberlauf BOOL bOk = lcl_DoFunction( nVal1, nVal2, nFunction ); @@ -1090,15 +1090,15 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, ScFormulaCell* pFC = new ScFormulaCell( pDocument, ScAddress( nCol, nRow, nTab ) ); pFC->SetErrCode( errNoValue ); - //! oder NOVALUE, dann auch in consoli, - //! sonst in Interpreter::GetCellValue die Abfrage auf errNoValue raus - //! (dann geht Stringzelle+Wertzelle nicht mehr) + //! oder NOVALUE, dann auch in consoli, + //! sonst in Interpreter::GetCellValue die Abfrage auf errNoValue raus + //! (dann geht Stringzelle+Wertzelle nicht mehr) pNew = pFC; } } else if ( bSrcText || bDestText ) { - // mit Texten wird nicht gerechnet - immer "alte" Zelle, also pSrc + // mit Texten wird nicht gerechnet - immer "alte" Zelle, also pSrc if (pSrc) pNew = pSrc->CloneWithoutNote( *pDocument ); @@ -1107,28 +1107,28 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, } else { - // Kombination aus Wert und mindestens einer Formel -> Formel erzeugen + // Kombination aus Wert und mindestens einer Formel -> Formel erzeugen ScTokenArray aArr; - // erste Zelle + // erste Zelle if ( eSrcType == CELLTYPE_FORMULA ) lcl_AddCode( aArr, (ScFormulaCell*)pSrc ); else aArr.AddDouble( nVal1 ); - // Operator + // Operator OpCode eOp = ocAdd; switch ( nFunction ) { - case PASTE_ADD: eOp = ocAdd; break; - case PASTE_SUB: eOp = ocSub; break; - case PASTE_MUL: eOp = ocMul; break; - case PASTE_DIV: eOp = ocDiv; break; + case PASTE_ADD: eOp = ocAdd; break; + case PASTE_SUB: eOp = ocSub; break; + case PASTE_MUL: eOp = ocMul; break; + case PASTE_DIV: eOp = ocDiv; break; } - aArr.AddOpCode(eOp); // Funktion + aArr.AddOpCode(eOp); // Funktion - // zweite Zelle + // zweite Zelle if ( eDestType == CELLTYPE_FORMULA ) lcl_AddCode( aArr, (ScFormulaCell*)pDest ); else @@ -1139,21 +1139,21 @@ void ScColumn::MixData( SCROW nRow1, SCROW nRow2, } - if ( pNew || bDelete ) // neues Ergebnis ? + if ( pNew || bDelete ) // neues Ergebnis ? { - if (pDest && !pNew) // alte Zelle da ? + if (pDest && !pNew) // alte Zelle da ? { if ( pDest->GetBroadcaster() ) - pNew = new ScNoteCell; // Broadcaster uebernehmen + pNew = new ScNoteCell; // Broadcaster uebernehmen else - Delete(nRow); // -> loeschen + Delete(nRow); // -> loeschen } if (pNew) - Insert(nRow, pNew); // neue einfuegen + Insert(nRow, pNew); // neue einfuegen - Search( nRow, nIndex ); // alles kann sich verschoben haben + Search( nRow, nIndex ); // alles kann sich verschoben haben if (pNew) - nNextThis = nRow; // nIndex zeigt jetzt genau auf nRow + nNextThis = nRow; // nIndex zeigt jetzt genau auf nRow else nNextThis = ( nIndex < nCount ) ? pItems[nIndex].nRow : MAXROW+1; } @@ -1191,7 +1191,7 @@ void ScColumn::StartAllListeners() SCROW nRow = pItems[i].nRow; ((ScFormulaCell*)pCell)->StartListeningTo( pDocument ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener eingefuegt? + Search( nRow, i ); // Listener eingefuegt? } } } @@ -1212,7 +1212,7 @@ void ScColumn::StartNeededListeners() SCROW nRow = pItems[i].nRow; pFCell->StartListeningTo( pDocument ); if ( nRow != pItems[i].nRow ) - Search( nRow, i ); // Listener eingefuegt? + Search( nRow, i ); // Listener eingefuegt? } } } @@ -1254,14 +1254,14 @@ void ScColumn::StartListeningInArea( SCROW nRow1, SCROW nRow2 ) if ( pCell->GetCellType() == CELLTYPE_FORMULA ) ((ScFormulaCell*)pCell)->StartListeningTo( pDocument ); if ( nRow != pItems[nIndex].nRow ) - Search( nRow, nIndex ); // durch Listening eingefuegt + Search( nRow, nIndex ); // durch Listening eingefuegt nIndex++; } } } -// TRUE = Zahlformat gesetzt +// TRUE = Zahlformat gesetzt BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, formula::FormulaGrammar::AddressConvention eConv, ScSetStringParam* pParam ) @@ -1293,24 +1293,24 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, && aParam.mpNumFormatter->GetType(nIndex) != NUMBERFORMAT_TEXT ) cFirstChar = rString.GetChar(0); else - cFirstChar = 0; // Text + cFirstChar = 0; // Text } else - { // waehrend ConvertFrom Import gibt es keine gesetzten Formate + { // waehrend ConvertFrom Import gibt es keine gesetzten Formate cFirstChar = rString.GetChar(0); } if ( cFirstChar == '=' ) { - if ( rString.Len() == 1 ) // = Text + if ( rString.Len() == 1 ) // = Text pNewCell = new ScStringCell( rString ); - else // =Formel + else // =Formel pNewCell = new ScFormulaCell( pDocument, ScAddress( nCol, nRow, nTabP ), rString, formula::FormulaGrammar::mergeToGrammar( formula::FormulaGrammar::GRAM_DEFAULT, eConv), MM_NONE ); } - else if ( cFirstChar == '\'') // 'Text + else if ( cFirstChar == '\'') // 'Text pNewCell = new ScStringCell( rString.Copy(1) ); else { @@ -1335,7 +1335,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, if ( rString == aStr ) bIsText = TRUE; break; - case CELLTYPE_NOTE : // durch =Formel referenziert + case CELLTYPE_NOTE : // durch =Formel referenziert break; default: if ( i == nCount - 1 ) @@ -1408,7 +1408,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, const LocaleDataWrapper* pLocale = aParam.mpNumFormatter->GetLocaleData(); if (!pLocale) break; - + LocaleDataItem aLocaleItem = pLocale->getLocaleItem(); const OUString& rDecSep = aLocaleItem.decimalSeparator; const OUString& rGroupSep = aLocaleItem.thousandSeparator; @@ -1444,7 +1444,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, } if ( bIsLoading && (!nCount || nRow > pItems[nCount-1].nRow) ) - { // Search einsparen und ohne Umweg ueber Insert, Listener aufbauen + { // Search einsparen und ohne Umweg ueber Insert, Listener aufbauen // und Broadcast kommt eh erst nach dem Laden if ( pNewCell ) Append( nRow, pNewCell ); @@ -1466,7 +1466,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, if (pBC) { pNewCell->TakeBroadcaster(pBC); - pLastFormulaTreeTop = 0; // Err527 Workaround + pLastFormulaTreeTop = 0; // Err527 Workaround } if ( pOldCell->GetCellType() == CELLTYPE_FORMULA ) @@ -1477,7 +1477,7 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, Search(nRow, i); } pOldCell->Delete(); - pItems[i].pCell = pNewCell; // ersetzen + pItems[i].pCell = pNewCell; // ersetzen if ( pNewCell->GetCellType() == CELLTYPE_FORMULA ) { pNewCell->StartListeningTo( pDocument ); @@ -1489,17 +1489,17 @@ BOOL ScColumn::SetString( SCROW nRow, SCTAB nTabP, const String& rString, } else { - DeleteAtIndex(i); // loeschen und Broadcast + DeleteAtIndex(i); // loeschen und Broadcast } } else if (pNewCell) { - Insert(nRow, pNewCell); // neu eintragen und Broadcast + Insert(nRow, pNewCell); // neu eintragen und Broadcast } } - // hier keine Formate mehr fuer Formeln setzen! - // (werden bei der Ausgabe abgefragt) + // hier keine Formate mehr fuer Formeln setzen! + // (werden bei der Ausgabe abgefragt) } return bNumFmtSet; @@ -1518,9 +1518,9 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec while ( (nIndex < nCount) ? ((nRow=pItems[nIndex].nRow) <= nEndRow) : FALSE ) { - ScBaseCell* pCell = pItems[nIndex].pCell; - TypedStrData* pData; - ULONG nFormat = GetNumberFormat( nRow ); + ScBaseCell* pCell = pItems[nIndex].pCell; + TypedStrData* pData; + ULONG nFormat = GetNumberFormat( nRow ); ScCellFormat::GetInputString( pCell, nFormat, aString, *pFormatter ); @@ -1548,7 +1548,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec { short nType = pFormatter->GetType(nFormat); if ((nType & NUMBERFORMAT_DATE) && !(nType & NUMBERFORMAT_TIME)) - { + { // special case for date values. Disregard the time // element if the number format is of date type. nValue = ::rtl::math::approxFloor(nValue); @@ -1560,7 +1560,7 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec } if ( !rStrings.Insert( pData ) ) - delete pData; // doppelt + delete pData; // doppelt ++nIndex; } @@ -1569,13 +1569,13 @@ void ScColumn::GetFilterEntries(SCROW nStartRow, SCROW nEndRow, TypedScStrCollec } // -// GetDataEntries - Strings aus zusammenhaengendem Bereich um nRow +// GetDataEntries - Strings aus zusammenhaengendem Bereich um nRow // -// DATENT_MAX - max. Anzahl Eintrage in Liste fuer Auto-Eingabe -// DATENT_SEARCH - max. Anzahl Zellen, die durchsucht werden - neu: nur Strings zaehlen -#define DATENT_MAX 200 -#define DATENT_SEARCH 2000 +// DATENT_MAX - max. Anzahl Eintrage in Liste fuer Auto-Eingabe +// DATENT_SEARCH - max. Anzahl Zellen, die durchsucht werden - neu: nur Strings zaehlen +#define DATENT_MAX 200 +#define DATENT_SEARCH 2000 BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, BOOL bLimit) @@ -1586,23 +1586,23 @@ BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, B String aString; USHORT nCells = 0; - // Die Beschraenkung auf angrenzende Zellen (ohne Luecken) ist nicht mehr gewollt - // (Featurekommission zur 5.1), stattdessen abwechselnd nach oben und unten suchen, - // damit naheliegende Zellen wenigstens zuerst gefunden werden. - //! Abstaende der Zeilennummern vergleichen? (Performance??) + // Die Beschraenkung auf angrenzende Zellen (ohne Luecken) ist nicht mehr gewollt + // (Featurekommission zur 5.1), stattdessen abwechselnd nach oben und unten suchen, + // damit naheliegende Zellen wenigstens zuerst gefunden werden. + //! Abstaende der Zeilennummern vergleichen? (Performance??) - SCSIZE nUpIndex = nThisIndex; // zeigt hinter die Zelle - SCSIZE nDownIndex = nThisIndex; // zeigt auf die Zelle + SCSIZE nUpIndex = nThisIndex; // zeigt hinter die Zelle + SCSIZE nDownIndex = nThisIndex; // zeigt auf die Zelle if (bThisUsed) - ++nDownIndex; // Startzelle ueberspringen + ++nDownIndex; // Startzelle ueberspringen while ( nUpIndex || nDownIndex < nCount ) { - if ( nUpIndex ) // nach oben + if ( nUpIndex ) // nach oben { ScBaseCell* pCell = pItems[nUpIndex-1].pCell; CellType eType = pCell->GetCellType(); - if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren + if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren { if (eType == CELLTYPE_STRING) ((ScStringCell*)pCell)->GetString(aString); @@ -1611,23 +1611,23 @@ BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, B TypedStrData* pData = new TypedStrData(aString); if ( !rStrings.Insert( pData ) ) - delete pData; // doppelt + delete pData; // doppelt else if ( bLimit && rStrings.GetCount() >= DATENT_MAX ) - break; // Maximum erreicht + break; // Maximum erreicht bFound = TRUE; if ( bLimit ) if (++nCells >= DATENT_SEARCH) - break; // genug gesucht + break; // genug gesucht } --nUpIndex; } - if ( nDownIndex < nCount ) // nach unten + if ( nDownIndex < nCount ) // nach unten { ScBaseCell* pCell = pItems[nDownIndex].pCell; CellType eType = pCell->GetCellType(); - if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren + if (eType == CELLTYPE_STRING || eType == CELLTYPE_EDIT) // nur Strings interessieren { if (eType == CELLTYPE_STRING) ((ScStringCell*)pCell)->GetString(aString); @@ -1636,14 +1636,14 @@ BOOL ScColumn::GetDataEntries(SCROW nStartRow, TypedScStrCollection& rStrings, B TypedStrData* pData = new TypedStrData(aString); if ( !rStrings.Insert( pData ) ) - delete pData; // doppelt + delete pData; // doppelt else if ( bLimit && rStrings.GetCount() >= DATENT_MAX ) - break; // Maximum erreicht + break; // Maximum erreicht bFound = TRUE; if ( bLimit ) if (++nCells >= DATENT_SEARCH) - break; // genug gesucht + break; // genug gesucht } ++nDownIndex; } @@ -1722,7 +1722,7 @@ void ScColumn::SetValue( SCROW nRow, const double& rVal) void ScColumn::GetString( SCROW nRow, String& rString ) const { - SCSIZE nIndex; + SCSIZE nIndex; Color* pColor; if (Search(nRow, nIndex)) { @@ -1742,7 +1742,7 @@ void ScColumn::GetString( SCROW nRow, String& rString ) const void ScColumn::GetInputString( SCROW nRow, String& rString ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; @@ -1761,7 +1761,7 @@ void ScColumn::GetInputString( SCROW nRow, String& rString ) const double ScColumn::GetValue( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; @@ -1789,7 +1789,7 @@ double ScColumn::GetValue( SCROW nRow ) const void ScColumn::GetFormula( SCROW nRow, String& rFormula, BOOL ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; @@ -1805,7 +1805,7 @@ void ScColumn::GetFormula( SCROW nRow, String& rFormula, BOOL ) const CellType ScColumn::GetCellType( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) return pItems[nIndex].pCell->GetCellType(); return CELLTYPE_NONE; @@ -1814,7 +1814,7 @@ CellType ScColumn::GetCellType( SCROW nRow ) const USHORT ScColumn::GetErrCode( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) { ScBaseCell* pCell = pItems[nIndex].pCell; @@ -1827,7 +1827,7 @@ USHORT ScColumn::GetErrCode( SCROW nRow ) const BOOL ScColumn::HasStringData( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) return (pItems[nIndex].pCell)->HasStringData(); return FALSE; @@ -1836,7 +1836,7 @@ BOOL ScColumn::HasStringData( SCROW nRow ) const BOOL ScColumn::HasValueData( SCROW nRow ) const { - SCSIZE nIndex; + SCSIZE nIndex; if (Search(nRow, nIndex)) return (pItems[nIndex].pCell)->HasValueData(); return FALSE; @@ -1844,7 +1844,7 @@ BOOL ScColumn::HasValueData( SCROW nRow ) const BOOL ScColumn::HasStringCells( SCROW nStartRow, SCROW nEndRow ) const { - // TRUE, wenn String- oder Editzellen im Bereich + // TRUE, wenn String- oder Editzellen im Bereich if ( pItems ) { @@ -1949,7 +1949,7 @@ sal_Int32 ScColumn::GetMaxStringLen( SCROW nRowStart, SCROW nRowEnd, CharSet eCh } -xub_StrLen ScColumn::GetMaxNumberStringLen( +xub_StrLen ScColumn::GetMaxNumberStringLen( sal_uInt16& nPrecision, SCROW nRowStart, SCROW nRowEnd ) const { xub_StrLen nStringLen = 0; diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx index be541decc632..7b8fdab72841 100644 --- a/sc/source/core/data/compressedarray.cxx +++ b/sc/source/core/data/compressedarray.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 @@ -363,7 +363,7 @@ A ScCompressedArray<A,D>::GetLastUnequalAccess( A nStart, const D& rCompare ) } -// === ScSummableCompressedArray ============================================= +// === ScSummableCompressedArray ============================================= template< typename A, typename D > unsigned long ScSummableCompressedArray<A,D>::SumValues( A nStart, A nEnd ) const diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index b3852e705e17..8bf17e142d0c 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.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 @@ -145,14 +145,14 @@ ScConditionEntry::ScConditionEntry( const ScConditionEntry& r ) : bRelRef2(r.bRelRef2), bFirstRun(TRUE) { - // ScTokenArray copy ctor erzeugt flache Kopie + // ScTokenArray copy ctor erzeugt flache Kopie if (r.pFormula1) pFormula1 = new ScTokenArray( *r.pFormula1 ); if (r.pFormula2) pFormula2 = new ScTokenArray( *r.pFormula2 ); - // Formelzellen werden erst bei IsValid angelegt + // Formelzellen werden erst bei IsValid angelegt } ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntry& r ) : @@ -186,8 +186,8 @@ ScConditionEntry::ScConditionEntry( ScDocument* pDocument, const ScConditionEntr if (r.pFormula2) pFormula2 = r.pFormula2->Clone(); - // Formelzellen werden erst bei IsValid angelegt - //! im Clipboard nicht - dann vorher interpretieren !!! + // Formelzellen werden erst bei IsValid angelegt + //! im Clipboard nicht - dann vorher interpretieren !!! } ScConditionEntry::ScConditionEntry( ScConditionMode eOper, @@ -195,7 +195,7 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, const String& rExprNmsp1, const String& rExprNmsp2, FormulaGrammar::Grammar eGrammar1, FormulaGrammar::Grammar eGrammar2 ) : eOp(eOper), - nOptions(0), // spaeter... + nOptions(0), // spaeter... nVal1(0.0), nVal2(0.0), aStrNmsp1(rExprNmsp1), @@ -216,14 +216,14 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, { Compile( rExpr1, rExpr2, rExprNmsp1, rExprNmsp2, eGrammar1, eGrammar2, FALSE ); - // Formelzellen werden erst bei IsValid angelegt + // Formelzellen werden erst bei IsValid angelegt } ScConditionEntry::ScConditionEntry( ScConditionMode eOper, const ScTokenArray* pArr1, const ScTokenArray* pArr2, ScDocument* pDocument, const ScAddress& rPos ) : eOp(eOper), - nOptions(0), // spaeter... + nOptions(0), // spaeter... nVal1(0.0), nVal2(0.0), eTempGrammar1(FormulaGrammar::GRAM_DEFAULT), @@ -252,13 +252,13 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, if ( pToken->GetType() == svDouble ) { nVal1 = pToken->GetDouble(); - DELETEZ(pFormula1); // nicht als Formel merken + DELETEZ(pFormula1); // nicht als Formel merken } else if ( pToken->GetType() == svString ) { bIsStr1 = TRUE; aStrVal1 = pToken->GetString(); - DELETEZ(pFormula1); // nicht als Formel merken + DELETEZ(pFormula1); // nicht als Formel merken } } } @@ -276,20 +276,20 @@ ScConditionEntry::ScConditionEntry( ScConditionMode eOper, if ( pToken->GetType() == svDouble ) { nVal2 = pToken->GetDouble(); - DELETEZ(pFormula2); // nicht als Formel merken + DELETEZ(pFormula2); // nicht als Formel merken } else if ( pToken->GetType() == svString ) { bIsStr2 = TRUE; aStrVal2 = pToken->GetString(); - DELETEZ(pFormula2); // nicht als Formel merken + DELETEZ(pFormula2); // nicht als Formel merken } } } bRelRef2 = lcl_HasRelRef( pDoc, pFormula2 ); } - // formula cells are created at IsValid + // formula cells are created at IsValid } ScConditionEntry::~ScConditionEntry() @@ -314,8 +314,8 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, aComp.SetGrammar( eGrammar1 ); if ( pDoc->IsImportingXML() && !bTextToReal ) { - // temporary formula string as string tokens - //! merge with lcl_ScDocFunc_CreateTokenArrayXML + // temporary formula string as string tokens + //! merge with lcl_ScDocFunc_CreateTokenArrayXML pFormula1 = new ScTokenArray; pFormula1->AddString( rExpr1 ); // bRelRef1 is set when the formula is compiled again (CompileXML) @@ -332,13 +332,13 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, if ( pToken->GetType() == svDouble ) { nVal1 = pToken->GetDouble(); - DELETEZ(pFormula1); // nicht als Formel merken + DELETEZ(pFormula1); // nicht als Formel merken } else if ( pToken->GetType() == svString ) { bIsStr1 = TRUE; aStrVal1 = pToken->GetString(); - DELETEZ(pFormula1); // nicht als Formel merken + DELETEZ(pFormula1); // nicht als Formel merken } } } @@ -351,8 +351,8 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, aComp.SetGrammar( eGrammar2 ); if ( pDoc->IsImportingXML() && !bTextToReal ) { - // temporary formula string as string tokens - //! merge with lcl_ScDocFunc_CreateTokenArrayXML + // temporary formula string as string tokens + //! merge with lcl_ScDocFunc_CreateTokenArrayXML pFormula2 = new ScTokenArray; pFormula2->AddString( rExpr2 ); // bRelRef2 is set when the formula is compiled again (CompileXML) @@ -369,13 +369,13 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, if ( pToken->GetType() == svDouble ) { nVal2 = pToken->GetDouble(); - DELETEZ(pFormula2); // nicht als Formel merken + DELETEZ(pFormula2); // nicht als Formel merken } else if ( pToken->GetType() == svString ) { bIsStr2 = TRUE; aStrVal2 = pToken->GetString(); - DELETEZ(pFormula2); // nicht als Formel merken + DELETEZ(pFormula2); // nicht als Formel merken } } } @@ -385,9 +385,9 @@ void ScConditionEntry::Compile( const String& rExpr1, const String& rExpr2, } } -void ScConditionEntry::MakeCells( const ScAddress& rPos ) // Formelzellen anlegen +void ScConditionEntry::MakeCells( const ScAddress& rPos ) // Formelzellen anlegen { - if ( !pDoc->IsClipOrUndo() ) // nie im Clipboard rechnen! + if ( !pDoc->IsClipOrUndo() ) // nie im Clipboard rechnen! { if ( pFormula1 && !pFCell1 && !bRelRef1 ) { @@ -405,8 +405,8 @@ void ScConditionEntry::MakeCells( const ScAddress& rPos ) // Formelzel void ScConditionEntry::SetIgnoreBlank(BOOL bSet) { - // Das Bit SC_COND_NOBLANKS wird gesetzt, wenn Blanks nicht ignoriert werden - // (nur bei Gueltigkeit) + // Das Bit SC_COND_NOBLANKS wird gesetzt, wenn Blanks nicht ignoriert werden + // (nur bei Gueltigkeit) if (bSet) nOptions &= ~SC_COND_NOBLANKS; @@ -416,7 +416,7 @@ void ScConditionEntry::SetIgnoreBlank(BOOL bSet) void ScConditionEntry::CompileAll() { - // Formelzellen loeschen, dann wird beim naechsten IsValid neu kompiliert + // Formelzellen loeschen, dann wird beim naechsten IsValid neu kompiliert DELETEZ(pFCell1); DELETEZ(pFCell2); @@ -437,7 +437,7 @@ void ScConditionEntry::CompileXML() aSrcString.Erase(); } - // Convert the text tokens that were created during XML import into real tokens. + // Convert the text tokens that were created during XML import into real tokens. Compile( GetExpression(aSrcPos, 0, 0, eTempGrammar1), GetExpression(aSrcPos, 1, 0, eTempGrammar2), @@ -527,7 +527,7 @@ void ScConditionEntry::UpdateReference( UpdateRefMode eUpdateRefMode, } if (bChanged1) - DELETEZ(pFCell1); // is created again in IsValid + DELETEZ(pFCell1); // is created again in IsValid } if (pFormula2) { @@ -544,7 +544,7 @@ void ScConditionEntry::UpdateReference( UpdateRefMode eUpdateRefMode, } if (bChanged2) - DELETEZ(pFCell2); // is created again in IsValid + DELETEZ(pFCell2); // is created again in IsValid } } @@ -566,11 +566,11 @@ void ScConditionEntry::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) } } -//! als Vergleichsoperator ans TokenArray ??? +//! als Vergleichsoperator ans TokenArray ??? BOOL lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 ) { - // verglichen wird nur das nicht-UPN Array + // verglichen wird nur das nicht-UPN Array if ( pArr1 && pArr2 ) { @@ -584,12 +584,12 @@ BOOL lcl_IsEqual( const ScTokenArray* pArr1, const ScTokenArray* pArr2 ) { if ( ppToken1[i] != ppToken2[i] && !(*ppToken1[i] == *ppToken2[i]) ) - return FALSE; // Unterschied + return FALSE; // Unterschied } - return TRUE; // alle Eintraege gleich + return TRUE; // alle Eintraege gleich } else - return !pArr1 && !pArr2; // beide 0 -> gleich + return !pArr1 && !pArr2; // beide 0 -> gleich } int ScConditionEntry::operator== ( const ScConditionEntry& r ) const @@ -604,7 +604,7 @@ int ScConditionEntry::operator== ( const ScConditionEntry& r ) const if ( ( pFormula1 || pFormula2 ) && ( aSrcPos != r.aSrcPos || aSrcString != r.aSrcString ) ) bEq = FALSE; - // wenn keine Formeln, Werte vergleichen + // wenn keine Formeln, Werte vergleichen if ( !pFormula1 && ( nVal1 != r.nVal1 || aStrVal1 != r.aStrVal1 || bIsStr1 != r.bIsStr1 ) ) bEq = FALSE; if ( !pFormula2 && ( nVal2 != r.nVal2 || aStrVal2 != r.aStrVal2 || bIsStr2 != r.bIsStr2 ) ) @@ -616,28 +616,28 @@ int ScConditionEntry::operator== ( const ScConditionEntry& r ) const void ScConditionEntry::Interpret( const ScAddress& rPos ) { - // Formelzellen anlegen - // dabei koennen neue Broadcaster (Note-Zellen) ins Dokument eingefuegt werden !!!! + // Formelzellen anlegen + // dabei koennen neue Broadcaster (Note-Zellen) ins Dokument eingefuegt werden !!!! if ( ( pFormula1 && !pFCell1 ) || ( pFormula2 && !pFCell2 ) ) MakeCells( rPos ); - // Formeln auswerten + // Formeln auswerten - BOOL bDirty = FALSE; //! 1 und 2 getrennt ??? + BOOL bDirty = FALSE; //! 1 und 2 getrennt ??? ScFormulaCell* pTemp1 = NULL; ScFormulaCell* pEff1 = pFCell1; if ( bRelRef1 ) { - pTemp1 = new ScFormulaCell( pDoc, rPos, pFormula1 ); // ohne Listening + pTemp1 = new ScFormulaCell( pDoc, rPos, pFormula1 ); // ohne Listening pEff1 = pTemp1; } if ( pEff1 ) { - if (!pEff1->IsRunning()) // keine 522 erzeugen + if (!pEff1->IsRunning()) // keine 522 erzeugen { - //! Changed statt Dirty abfragen !!! + //! Changed statt Dirty abfragen !!! if (pEff1->GetDirty() && !bRelRef1) bDirty = TRUE; if (pEff1->IsValue()) @@ -660,12 +660,12 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) ScFormulaCell* pEff2 = pFCell2; //@ 1!=2 if ( bRelRef2 ) { - pTemp2 = new ScFormulaCell( pDoc, rPos, pFormula2 ); // ohne Listening + pTemp2 = new ScFormulaCell( pDoc, rPos, pFormula2 ); // ohne Listening pEff2 = pTemp2; } if ( pEff2 ) { - if (!pEff2->IsRunning()) // keine 522 erzeugen + if (!pEff2->IsRunning()) // keine 522 erzeugen { if (pEff2->GetDirty() && !bRelRef2) bDirty = TRUE; @@ -685,13 +685,13 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) } delete pTemp2; - // wenn IsRunning, bleiben die letzten Werte erhalten + // wenn IsRunning, bleiben die letzten Werte erhalten if (bDirty && !bFirstRun) { - // bei bedingten Formaten neu painten + // bei bedingten Formaten neu painten - DataChanged( NULL ); // alles + DataChanged( NULL ); // alles } bFirstRun = FALSE; @@ -699,7 +699,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) BOOL ScConditionEntry::IsValid( double nArg ) const { - // Interpret muss schon gerufen sein + // Interpret muss schon gerufen sein if ( bIsStr1 ) { @@ -712,23 +712,23 @@ BOOL ScConditionEntry::IsValid( double nArg ) const if ( bIsStr2 ) return FALSE; - double nComp1 = nVal1; // Kopie, damit vertauscht werden kann + double nComp1 = nVal1; // Kopie, damit vertauscht werden kann double nComp2 = nVal2; if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN ) if ( nComp1 > nComp2 ) { - // richtige Reihenfolge fuer Wertebereich + // richtige Reihenfolge fuer Wertebereich double nTemp = nComp1; nComp1 = nComp2; nComp2 = nTemp; } - // Alle Grenzfaelle muessen per ::rtl::math::approxEqual getestet werden! + // Alle Grenzfaelle muessen per ::rtl::math::approxEqual getestet werden! BOOL bValid = FALSE; switch (eOp) { case SC_COND_NONE: - break; // immer FALSE; + break; // immer FALSE; case SC_COND_EQUAL: bValid = ::rtl::math::approxEqual( nArg, nComp1 ); break; @@ -767,12 +767,12 @@ BOOL ScConditionEntry::IsValid( double nArg ) const BOOL ScConditionEntry::IsValidStr( const String& rArg ) const { - // Interpret muss schon gerufen sein + // Interpret muss schon gerufen sein - if ( eOp == SC_COND_DIRECT ) // Formel ist unabhaengig vom Inhalt + if ( eOp == SC_COND_DIRECT ) // Formel ist unabhaengig vom Inhalt return !::rtl::math::approxEqual( nVal1, 0.0 ); - // Wenn Bedingung Zahl enthaelt, immer FALSE, ausser bei "ungleich" + // Wenn Bedingung Zahl enthaelt, immer FALSE, ausser bei "ungleich" if ( !bIsStr1 ) return ( eOp == SC_COND_NOTEQUAL ); @@ -780,14 +780,14 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const if ( !bIsStr2 ) return FALSE; - String aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) + String aUpVal1( aStrVal1 ); //! als Member? (dann auch in Interpret setzen) String aUpVal2( aStrVal2 ); if ( eOp == SC_COND_BETWEEN || eOp == SC_COND_NOTBETWEEN ) if ( ScGlobal::GetCollator()->compareString( aUpVal1, aUpVal2 ) == COMPARE_GREATER ) { - // richtige Reihenfolge fuer Wertebereich + // richtige Reihenfolge fuer Wertebereich String aTemp( aUpVal1 ); aUpVal1 = aUpVal2; aUpVal2 = aTemp; } @@ -822,14 +822,14 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const break; case SC_COND_BETWEEN: case SC_COND_NOTBETWEEN: - // Test auf NOTBETWEEN: + // Test auf NOTBETWEEN: bValid = ( nCompare == COMPARE_LESS || ScGlobal::GetCollator()->compareString( rArg, aUpVal2 ) == COMPARE_GREATER ); if ( eOp == SC_COND_BETWEEN ) bValid = !bValid; break; - // SC_COND_DIRECT schon oben abgefragt + // SC_COND_DIRECT schon oben abgefragt default: DBG_ERROR("unbekannte Operation bei ScConditionEntry"); bValid = FALSE; @@ -842,7 +842,7 @@ BOOL ScConditionEntry::IsValidStr( const String& rArg ) const BOOL ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) const { - ((ScConditionEntry*)this)->Interpret(rPos); // Formeln auswerten + ((ScConditionEntry*)this)->Interpret(rPos); // Formeln auswerten double nArg = 0.0; String aArgStr; @@ -876,14 +876,14 @@ BOOL ScConditionEntry::IsCellValid( ScBaseCell* pCell, const ScAddress& rPos ) c break; default: - pCell = NULL; // Note-Zellen wie leere + pCell = NULL; // Note-Zellen wie leere break; } } if (!pCell) if (bIsStr1) - bVal = FALSE; // leere Zellen je nach Bedingung + bVal = FALSE; // leere Zellen je nach Bedingung if (bVal) return IsValid( nArg ); @@ -996,7 +996,7 @@ void ScConditionEntry::SourceChanged( const ScAddress& rChanged ) if ( aProv.Ref1.IsColRel() || aProv.Ref1.IsRowRel() || aProv.Ref1.IsTabRel() || aProv.Ref2.IsColRel() || aProv.Ref2.IsRowRel() || aProv.Ref2.IsTabRel() ) { - // absolut muss getroffen sein, relativ bestimmt Bereich + // absolut muss getroffen sein, relativ bestimmt Bereich BOOL bHit = TRUE; SCsCOL nCol1; @@ -1052,11 +1052,11 @@ void ScConditionEntry::SourceChanged( const ScAddress& rChanged ) if ( bHit ) { - //! begrenzen + //! begrenzen ScRange aPaint( nCol1,nRow1,nTab1, nCol2,nRow2,nTab2 ); - // kein Paint, wenn es nur die Zelle selber ist + // kein Paint, wenn es nur die Zelle selber ist if ( aPaint.aStart != rChanged || aPaint.aEnd != rChanged ) DataChanged( &aPaint ); } @@ -1177,7 +1177,7 @@ int ScCondFormatEntry::operator== ( const ScCondFormatEntry& r ) const return ScConditionEntry::operator==( r ) && aStyleName == r.aStyleName; - // Range wird nicht verglichen + // Range wird nicht verglichen } ScCondFormatEntry::~ScCondFormatEntry() @@ -1248,7 +1248,7 @@ BOOL ScConditionalFormat::EqualEntries( const ScConditionalFormat& r ) const if ( nEntryCount != r.nEntryCount ) return FALSE; - //! auf gleiche Eintraege in anderer Reihenfolge testen ??? + //! auf gleiche Eintraege in anderer Reihenfolge testen ??? for (USHORT i=0; i<nEntryCount; i++) if ( ! (*ppEntries[i] == *r.ppEntries[i]) ) @@ -1309,8 +1309,8 @@ void lcl_Extend( ScRange& rRange, ScDocument* pDoc, BOOL bLines ) if (bLines) { - if (nStartCol > 0) --nStartCol; - if (nStartRow > 0) --nStartRow; + if (nStartCol > 0) --nStartCol; + if (nStartRow > 0) --nStartRow; if (nEndCol < MAXCOL) ++nEndCol; if (nEndRow < MAXROW) ++nEndRow; } @@ -1351,7 +1351,7 @@ BOOL lcl_CutRange( ScRange& rRange, const ScRange& rOther ) return TRUE; } - return FALSE; // ausserhalb + return FALSE; // ausserhalb } void ScConditionalFormat::DoRepaint( const ScRange* pModified ) @@ -1360,13 +1360,13 @@ void ScConditionalFormat::DoRepaint( const ScRange* pModified ) SfxObjectShell* pSh = pDoc->GetDocumentShell(); if (pSh) { - // Rahmen/Schatten enthalten? - // (alle Bedingungen testen) + // Rahmen/Schatten enthalten? + // (alle Bedingungen testen) BOOL bExtend = FALSE; BOOL bRotate = FALSE; BOOL bAttrTested = FALSE; - if (!pAreas) // RangeList ggf. holen + if (!pAreas) // RangeList ggf. holen { pAreas = new ScRangeList; pDoc->FindConditionalFormat( nKey, *pAreas ); @@ -1414,11 +1414,11 @@ void ScConditionalFormat::DoRepaint( const ScRange* pModified ) bAttrTested = TRUE; } - lcl_Extend( aRange, pDoc, bExtend ); // zusammengefasste und bExtend + lcl_Extend( aRange, pDoc, bExtend ); // zusammengefasste und bExtend if ( bRotate ) { aRange.aStart.SetCol(0); - aRange.aEnd.SetCol(MAXCOL); // gedreht: ganze Zeilen + aRange.aEnd.SetCol(MAXCOL); // gedreht: ganze Zeilen } // gedreht -> ganze Zeilen @@ -1463,7 +1463,7 @@ void ScConditionalFormat::UpdateReference( UpdateRefMode eUpdateRefMode, for (USHORT i=0; i<nEntryCount; i++) ppEntries[i]->UpdateReference(eUpdateRefMode, rRange, nDx, nDy, nDz); - delete pAreas; // aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf + delete pAreas; // aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf pAreas = NULL; } @@ -1479,7 +1479,7 @@ void ScConditionalFormat::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) for (USHORT i=0; i<nEntryCount; i++) ppEntries[i]->UpdateMoveTab( nOldPos, nNewPos ); - delete pAreas; // aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf + delete pAreas; // aus dem AttrArray kommt beim Einfuegen/Loeschen kein Aufruf pAreas = NULL; } @@ -1502,27 +1502,27 @@ bool ScConditionalFormat::MarkUsedExternalReferences() const ScConditionalFormatList::ScConditionalFormatList(const ScConditionalFormatList& rList) : ScConditionalFormats_Impl() { - // fuer Ref-Undo - echte Kopie mit neuen Tokens! + // fuer Ref-Undo - echte Kopie mit neuen Tokens! USHORT nCount = rList.Count(); for (USHORT i=0; i<nCount; i++) InsertNew( rList[i]->Clone() ); - //! sortierte Eintraege aus rList schneller einfuegen ??? + //! sortierte Eintraege aus rList schneller einfuegen ??? } ScConditionalFormatList::ScConditionalFormatList(ScDocument* pNewDoc, const ScConditionalFormatList& rList) { - // fuer neues Dokument - echte Kopie mit neuen Tokens! + // fuer neues Dokument - echte Kopie mit neuen Tokens! USHORT nCount = rList.Count(); for (USHORT i=0; i<nCount; i++) InsertNew( rList[i]->Clone(pNewDoc) ); - //! sortierte Eintraege aus rList schneller einfuegen ??? + //! sortierte Eintraege aus rList schneller einfuegen ??? } BOOL ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) const @@ -1531,8 +1531,8 @@ BOOL ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) con USHORT nCount = Count(); BOOL bEqual = ( nCount == r.Count() ); - for (USHORT i=0; i<nCount && bEqual; i++) // Eintraege sind sortiert - if ( !(*this)[i]->EqualEntries(*r[i]) ) // Eintraege unterschiedlich ? + for (USHORT i=0; i<nCount && bEqual; i++) // Eintraege sind sortiert + if ( !(*this)[i]->EqualEntries(*r[i]) ) // Eintraege unterschiedlich ? bEqual = FALSE; return bEqual; @@ -1540,7 +1540,7 @@ BOOL ScConditionalFormatList::operator==( const ScConditionalFormatList& r ) con ScConditionalFormat* ScConditionalFormatList::GetFormat( sal_uInt32 nKey ) { - //! binaer suchen + //! binaer suchen USHORT nCount = Count(); for (USHORT i=0; i<nCount; i++) diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index 2bd9b6755776..8fbaced6910f 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.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,7 +68,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB BOOL bError = FALSE; ULONG nFormatIndex = 0; - //! wasNull calls only if null value was found? + //! wasNull calls only if null value was found? try { @@ -76,7 +76,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB { case sdbc::DataType::BIT: case sdbc::DataType::BOOLEAN: - //! use language from doc (here, date/time and currency)? + //! use language from doc (here, date/time and currency)? nFormatIndex = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_LOGICAL, ScGlobal::eLnge ); nVal = (xRow->getBoolean(nRowPos) ? 1 : 0); @@ -93,7 +93,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB case sdbc::DataType::DOUBLE: case sdbc::DataType::NUMERIC: case sdbc::DataType::DECIMAL: - //! do the conversion here? + //! do the conversion here? nVal = xRow->getDouble(nRowPos); bEmptyFlag = ( nVal == 0.0 ) && xRow->wasNull(); bValue = TRUE; @@ -158,7 +158,7 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB case sdbc::DataType::VARBINARY: case sdbc::DataType::LONGVARBINARY: default: - bError = TRUE; // unknown type + bError = TRUE; // unknown type } } catch ( uno::Exception& ) diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index c9df5606f20f..b7d52cd3ce6b 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.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 @@ ScDocumentIterator::~ScDocumentIterator() BOOL ScDocumentIterator::GetThisCol() { - ScTable* pTab; + ScTable* pTab; while ( (pTab = pDoc->pTab[nTab]) == NULL ) { if ( nTab == nEndTab ) @@ -104,8 +104,8 @@ BOOL ScDocumentIterator::GetThisCol() } ++nTab; } - ScColumn* pCol = &pTab->aCol[nCol]; - ScAttrArray* pAtt = pCol->pAttrArray; + ScColumn* pCol = &pTab->aCol[nCol]; + ScAttrArray* pAtt = pCol->pAttrArray; BOOL bFound = FALSE; do @@ -131,8 +131,8 @@ BOOL ScDocumentIterator::GetThisCol() if (nColRow == nRow) { - bFound = TRUE; - pCell = pCol->pItems[nColPos].pCell; + bFound = TRUE; + pCell = pCol->pItems[nColPos].pCell; pPattern = pAtt->pData[nAttrPos].pPattern; } else if ( pAtt->pData[nAttrPos].pPattern != pDefPattern ) @@ -230,7 +230,7 @@ void lcl_IterGetNumberFormat( ULONG& nFormat, const ScAttrArray*& rpArr, if ( rpArr != pNewArr || nAttrEndRow < nRow ) { SCSIZE nPos; - pNewArr->Search( nRow, nPos ); // nPos 0 gueltig wenn nicht gefunden + pNewArr->Search( nRow, nPos ); // nPos 0 gueltig wenn nicht gefunden const ScPatternAttr* pPattern = pNewArr->pData[nPos].pPattern; nFormat = pPattern->GetNumberFormat( pDoc->GetFormatTable() ); rpArr = pNewArr; @@ -270,9 +270,9 @@ ScValueIterator::ScValueIterator( ScDocument* pDocument, const ScRange& rRange, nRow = nStartRow; nTab = nStartTab; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert - nNumFormat = 0; // werden bei GetNumberFormat initialisiert + nNumFormat = 0; // werden bei GetNumberFormat initialisiert pAttrArray = 0; nAttrEndRow = 0; } @@ -296,7 +296,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) { // rValue = 0.0; //! do not change caller's value! rErr = 0; - return FALSE; // Ende und Aus + return FALSE; // Ende und Aus } } pCol = &(pDoc->pTab[nTab])->aCol[nCol]; @@ -329,8 +329,8 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) rValue = pDoc->RoundValueAsShown( rValue, nNumFormat ); } // - // wenn in der selben Spalte gleich noch eine Value-Cell folgt, die - // auch noch im Block liegt, den Wert jetzt schon holen + // wenn in der selben Spalte gleich noch eine Value-Cell folgt, die + // auch noch im Block liegt, den Wert jetzt schon holen // if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow && @@ -348,7 +348,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) } } - return TRUE; // gefunden + return TRUE; // gefunden } // break; case CELLTYPE_FORMULA: @@ -361,7 +361,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) rValue = ((ScFormulaCell*)pCell)->GetValue(); nRow--; bNumValid = FALSE; - return TRUE; // gefunden + return TRUE; // gefunden } else if ( bTextAsZero ) { @@ -396,7 +396,7 @@ BOOL ScValueIterator::GetThis(double& rValue, USHORT& rErr) } } else - nRow = nEndRow + 1; // naechste Spalte + nRow = nEndRow + 1; // naechste Spalte } } @@ -439,18 +439,18 @@ BOOL ScValueIterator::GetFirst(double& rValue, USHORT& rErr) nRow = nStartRow; nTab = nStartTab; -// nColRow = 0; +// nColRow = 0; ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol]; pCol->Search( nRow, nColRow ); - nNumFormat = 0; // werden bei GetNumberFormat initialisiert + nNumFormat = 0; // werden bei GetNumberFormat initialisiert pAttrArray = 0; nAttrEndRow = 0; return GetThis(rValue, rErr); } -/* ist inline: +/* ist inline: BOOL ScValueIterator::GetNext(double& rValue, USHORT& rErr) { ++nRow; @@ -503,7 +503,7 @@ SCSIZE ScDBQueryDataIterator::SearchColEntryIndex(ScDocument& rDoc, SCTAB nTab, // ---------------------------------------------------------------------------- ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDataIterator* pParent, ScDBQueryParamInternal* pParam, ScDocument* pDoc) : - DataAccess(pParent), + DataAccess(pParent), mpParam(pParam), mpDoc(pDoc) { @@ -511,7 +511,7 @@ ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDat nRow = mpParam->nRow1; nTab = mpParam->nTab; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert SCSIZE i; SCSIZE nCount = mpParam->GetEntryCount(); for (i=0; (i<nCount) && (mpParam->GetEntry(i).bDoQuery); i++) @@ -521,7 +521,7 @@ ScDBQueryDataIterator::DataAccessInternal::DataAccessInternal(const ScDBQueryDat rEntry.bQueryByString = !(mpDoc->GetFormatTable()->IsNumberFormat(*rEntry.pStr, nIndex, rEntry.nVal)); } - nNumFormat = 0; // werden bei GetNumberFormat initialisiert + nNumFormat = 0; // werden bei GetNumberFormat initialisiert pAttrArray = 0; nAttrEndRow = 0; } @@ -572,7 +572,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) rValue.mbIsNumber = true; if ( bCalcAsShown ) { - const ScAttrArray* pNewAttrArray = + const ScAttrArray* pNewAttrArray = ScDBQueryDataIterator::GetAttrArrayByCol(*mpDoc, nTab, nCol); lcl_IterGetNumberFormat( nNumFormat, pAttrArray, nAttrEndRow, pNewAttrArray, nRow, mpDoc ); @@ -581,7 +581,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) nNumFmtType = NUMBERFORMAT_NUMBER; nNumFmtIndex = 0; rValue.mnError = 0; - return TRUE; // gefunden + return TRUE; // gefunden } // break; case CELLTYPE_FORMULA: @@ -594,7 +594,7 @@ bool ScDBQueryDataIterator::DataAccessInternal::getCurrent(Value& rValue) nNumFmtIndex, ScAddress( nCol, nRow, nTab ), pCell ); rValue.mnError = ((ScFormulaCell*)pCell)->GetErrCode(); - return TRUE; // gefunden + return TRUE; // gefunden } else nRow++; @@ -742,7 +742,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM vector<bool> aResults; aResults.reserve(nEntryCount); - const CollatorWrapper& rCollator = + const CollatorWrapper& rCollator = mpParam->bCaseSens ? *ScGlobal::GetCaseCollator() : *ScGlobal::GetCollator(); for (SCSIZE i = 0; i < nEntryCount; ++i) @@ -863,7 +863,7 @@ bool ScDBQueryDataIterator::DataAccessMatrix::isValidQuery(SCROW nRow, const ScM else if (rEntry.eConnect == SC_AND) { // For AND op, tuck the result into the last result value. - size_t n = aResults.size(); + size_t n = aResults.size(); aResults[n-1] = aResults[n-1] && bValid; } else @@ -946,21 +946,21 @@ ScCellIterator::ScCellIterator( ScDocument* pDocument, if (!ValidTab(nEndTab)) nEndTab = MAXTAB; while (nEndTab>0 && !pDoc->pTab[nEndTab]) - --nEndTab; // nur benutzte Tabellen + --nEndTab; // nur benutzte Tabellen if (nStartTab>nEndTab) nStartTab = nEndTab; nCol = nStartCol; nRow = nStartRow; nTab = nStartTab; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert if (!pDoc->pTab[nTab]) { DBG_ERROR("Tabelle nicht gefunden"); nStartCol = nCol = MAXCOL+1; nStartRow = nRow = MAXROW+1; - nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst + nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst } } @@ -988,21 +988,21 @@ ScCellIterator::ScCellIterator if (!ValidTab(nEndTab)) nEndTab = MAXTAB; while (nEndTab>0 && !pDoc->pTab[nEndTab]) - --nEndTab; // nur benutzte Tabellen + --nEndTab; // nur benutzte Tabellen if (nStartTab>nEndTab) nStartTab = nEndTab; nCol = nStartCol; nRow = nStartRow; nTab = nStartTab; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert if (!pDoc->pTab[nTab]) { DBG_ERROR("Tabelle nicht gefunden"); nStartCol = nCol = MAXCOL+1; nStartRow = nRow = MAXROW+1; - nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst + nStartTab = nTab = MAXTAB+1; // -> Abbruch bei GetFirst } } @@ -1022,7 +1022,7 @@ ScBaseCell* ScCellIterator::GetThis() nCol = nStartCol; nTab++; if ( nTab > nEndTab ) - return NULL; // Ende und Aus + return NULL; // Ende und Aus } pCol = &(pDoc->pTab[nTab])->aCol[nCol]; } while ( pCol->nCount == 0 ); @@ -1032,7 +1032,7 @@ ScBaseCell* ScCellIterator::GetThis() while ( (nColRow < pCol->nCount) && (pCol->pItems[nColRow].nRow < nRow) ) nColRow++; - if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow ) + if ( nColRow < pCol->nCount && pCol->pItems[nColRow].nRow <= nEndRow ) { nRow = pCol->pItems[nColRow].nRow; if ( !bSubTotal || !pDoc->pTab[nTab]->RowFiltered( nRow ) ) @@ -1041,9 +1041,9 @@ ScBaseCell* ScCellIterator::GetThis() if ( bSubTotal && pCell->GetCellType() == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell)->IsSubTotal() ) - nRow++; // Sub-Total-Zeilen nicht + nRow++; // Sub-Total-Zeilen nicht else - return pCell; // gefunden + return pCell; // gefunden } else nRow++; @@ -1060,7 +1060,7 @@ ScBaseCell* ScCellIterator::GetFirst() nCol = nStartCol; nRow = nStartRow; nTab = nStartTab; -// nColRow = 0; +// nColRow = 0; ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol]; pCol->Search( nRow, nColRow ); return GetThis(); @@ -1086,9 +1086,9 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, { nCol = aParam.nCol1; nRow = aParam.nRow1; - nColRow = 0; // wird bei GetFirst initialisiert + nColRow = 0; // wird bei GetFirst initialisiert SCSIZE i; - if (bMod) // sonst schon eingetragen + if (bMod) // sonst schon eingetragen { for (i=0; (i<MAXQUERY) && (aParam.GetEntry(i).bDoQuery); i++) { @@ -1099,7 +1099,7 @@ ScQueryCellIterator::ScQueryCellIterator(ScDocument* pDocument, SCTAB nTable, nIndex, rEntry.nVal)); } } - nNumFormat = 0; // werden bei GetNumberFormat initialisiert + nNumFormat = 0; // werden bei GetNumberFormat initialisiert pAttrArray = 0; nAttrEndRow = 0; } @@ -1125,7 +1125,7 @@ ScBaseCell* ScQueryCellIterator::GetThis() do { if ( ++nCol > aParam.nCol2 ) - return NULL; // Ende und Aus + return NULL; // Ende und Aus if ( bAdvanceQuery ) { AdvanceQueryParamEntryField(); @@ -1207,7 +1207,7 @@ ScBaseCell* ScQueryCellIterator::GetFirst() nRow = aParam.nRow1; if (aParam.bHasHeader) nRow++; -// nColRow = 0; +// nColRow = 0; ScColumn* pCol = &(pDoc->pTab[nTab])->aCol[nCol]; pCol->Search( nRow, nColRow ); return GetThis(); @@ -1239,7 +1239,7 @@ void ScQueryCellIterator::AdvanceQueryParamEntryField() } } else - break; // for + break; // for } } @@ -1664,7 +1664,7 @@ ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB } else { - pNextRows[i-nStartCol] = MAXROWCOUNT; // nichts gefunden + pNextRows[i-nStartCol] = MAXROWCOUNT; // nichts gefunden pNextIndices[i-nStartCol] = MAXROWCOUNT; } } @@ -1697,7 +1697,7 @@ ScBaseCell* ScHorizontalCellIterator::GetNext( SCCOL& rCol, SCROW& rRow ) } else { - pNextRows[nCol-nStartCol] = MAXROWCOUNT; // nichts gefunden + pNextRows[nCol-nStartCol] = MAXROWCOUNT; // nichts gefunden pNextIndices[nCol-nStartCol] = MAXROWCOUNT; } @@ -1767,9 +1767,9 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB nCol = nStartCol; bRowEmpty = FALSE; - pIndices = new SCSIZE[nEndCol-nStartCol+1]; - pNextEnd = new SCROW[nEndCol-nStartCol+1]; - ppPatterns = new const ScPatternAttr*[nEndCol-nStartCol+1]; + pIndices = new SCSIZE[nEndCol-nStartCol+1]; + pNextEnd = new SCROW[nEndCol-nStartCol+1]; + ppPatterns = new const ScPatternAttr*[nEndCol-nStartCol+1]; SCROW nSkipTo = MAXROW; BOOL bEmpty = TRUE; @@ -1788,10 +1788,10 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB { pPattern = NULL; if ( nThisEnd < nSkipTo ) - nSkipTo = nThisEnd; // nSkipTo kann gleich hier gesetzt werden + nSkipTo = nThisEnd; // nSkipTo kann gleich hier gesetzt werden } else - bEmpty = FALSE; // Attribute gefunden + bEmpty = FALSE; // Attribute gefunden pIndices[nPos] = nIndex; pNextEnd[nPos] = nThisEnd; @@ -1799,7 +1799,7 @@ ScHorizontalAttrIterator::ScHorizontalAttrIterator( ScDocument* pDocument, SCTAB } if (bEmpty) - nRow = nSkipTo; // bis zum naechsten Bereichsende ueberspringen + nRow = nSkipTo; // bis zum naechsten Bereichsende ueberspringen bRowEmpty = bEmpty; } @@ -1829,16 +1829,16 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo while ( nCol < nEndCol && ppPatterns[nCol+1-nStartCol] == pPat ) ++nCol; rCol2 = nCol; - ++nCol; // hochzaehlen fuer naechsten Aufruf - return pPat; // gefunden + ++nCol; // hochzaehlen fuer naechsten Aufruf + return pPat; // gefunden } } // naechste Zeile ++nRow; - if ( nRow > nEndRow ) // schon am Ende? - return NULL; // nichts gefunden + if ( nRow > nEndRow ) // schon am Ende? + return NULL; // nichts gefunden BOOL bEmpty = TRUE; SCCOL i; @@ -1858,7 +1858,7 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo if ( IsDefaultItem( pPattern ) ) pPattern = NULL; else - bEmpty = FALSE; // Attribute gefunden + bEmpty = FALSE; // Attribute gefunden pNextEnd[nPos] = nThisEnd; ppPatterns[nPos] = pPattern; @@ -1873,20 +1873,20 @@ const ScPatternAttr* ScHorizontalAttrIterator::GetNext( SCCOL& rCol1, SCCOL& rCo } } else if ( ppPatterns[nPos] ) - bEmpty = FALSE; // Bereich noch nicht zuende + bEmpty = FALSE; // Bereich noch nicht zuende } if (bEmpty) { SCCOL nCount = nEndCol-nStartCol+1; - SCROW nSkipTo = pNextEnd[0]; // naechstes Bereichsende suchen + SCROW nSkipTo = pNextEnd[0]; // naechstes Bereichsende suchen for (i=1; i<nCount; i++) if ( pNextEnd[i] < nSkipTo ) nSkipTo = pNextEnd[i]; - nRow = nSkipTo; // leere Zeilen ueberspringen + nRow = nSkipTo; // leere Zeilen ueberspringen } bRowEmpty = bEmpty; - nCol = nStartCol; // wieder links anfangen + nCol = nStartCol; // wieder links anfangen } // return NULL; @@ -1916,7 +1916,7 @@ ScUsedAreaIterator::~ScUsedAreaIterator() BOOL ScUsedAreaIterator::GetNext() { - // Iteratoren weiterzaehlen + // Iteratoren weiterzaehlen if ( pCell && IsGreater( nNextCol, nNextRow, nCellCol, nCellRow ) ) pCell = aCellIter.GetNext( nCellCol, nCellRow ); @@ -1930,39 +1930,39 @@ BOOL ScUsedAreaIterator::GetNext() if ( pPattern && nAttrRow == nNextRow && nAttrCol1 < nNextCol ) nAttrCol1 = nNextCol; - // naechsten Abschnitt heraussuchen + // naechsten Abschnitt heraussuchen BOOL bFound = TRUE; BOOL bUseCell = FALSE; if ( pCell && pPattern ) { - if ( IsGreater( nCellCol, nCellRow, nAttrCol1, nAttrRow ) ) // vorne nur Attribute ? + if ( IsGreater( nCellCol, nCellRow, nAttrCol1, nAttrRow ) ) // vorne nur Attribute ? { pFoundCell = NULL; pFoundPattern = pPattern; nFoundRow = nAttrRow; nFoundStartCol = nAttrCol1; - if ( nCellRow == nAttrRow && nCellCol <= nAttrCol2 ) // auch Zelle im Bereich ? - nFoundEndCol = nCellCol - 1; // nur bis vor der Zelle + if ( nCellRow == nAttrRow && nCellCol <= nAttrCol2 ) // auch Zelle im Bereich ? + nFoundEndCol = nCellCol - 1; // nur bis vor der Zelle else - nFoundEndCol = nAttrCol2; // alles + nFoundEndCol = nAttrCol2; // alles } else { bUseCell = TRUE; - if ( nAttrRow == nCellRow && nAttrCol1 == nCellCol ) // Attribute auf der Zelle ? + if ( nAttrRow == nCellRow && nAttrCol1 == nCellCol ) // Attribute auf der Zelle ? pFoundPattern = pPattern; else pFoundPattern = NULL; } } - else if ( pCell ) // nur Zelle -> direkt uebernehmen + else if ( pCell ) // nur Zelle -> direkt uebernehmen { pFoundPattern = NULL; - bUseCell = TRUE; // Position von Zelle + bUseCell = TRUE; // Position von Zelle } - else if ( pPattern ) // nur Attribute -> direkt uebernehmen + else if ( pPattern ) // nur Attribute -> direkt uebernehmen { pFoundCell = NULL; pFoundPattern = pPattern; @@ -1970,10 +1970,10 @@ BOOL ScUsedAreaIterator::GetNext() nFoundStartCol = nAttrCol1; nFoundEndCol = nAttrCol2; } - else // gar nichts + else // gar nichts bFound = FALSE; - if ( bUseCell ) // Position von Zelle + if ( bUseCell ) // Position von Zelle { pFoundCell = pCell; nFoundRow = nCellRow; @@ -2030,7 +2030,7 @@ const ScPatternAttr* ScDocAttrIterator::GetNext( SCCOL& rCol, SCROW& rRow1, SCRO else pColIter = NULL; } - return NULL; // is nix mehr + return NULL; // is nix mehr } // ============================================================================ @@ -2194,14 +2194,14 @@ const ScPatternAttr* ScAttrRectIterator::GetNext( SCCOL& rCol1, SCCOL& rCol2, else pColIter = NULL; } - return NULL; // is nix mehr + return NULL; // is nix mehr } // ============================================================================ SCROW ScRowBreakIterator::NOT_FOUND = -1; -ScRowBreakIterator::ScRowBreakIterator(set<SCROW>& rBreaks) : +ScRowBreakIterator::ScRowBreakIterator(set<SCROW>& rBreaks) : mrBreaks(rBreaks), maItr(rBreaks.begin()), maEnd(rBreaks.end()) { diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 08e275f46833..a514be054197 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.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 @@ -75,11 +75,11 @@ #include "attrib.hxx" #include "patattr.hxx" #include "globstr.hrc" -#include "sc.hrc" // Slot-IDs +#include "sc.hrc" // Slot-IDs -#define SC_MAX_POOLREF (SFX_ITEMS_OLD_MAXREF - 39) -#define SC_SAFE_POOLREF (SC_MAX_POOLREF + 20) +#define SC_MAX_POOLREF (SFX_ITEMS_OLD_MAXREF - 39) +#define SC_SAFE_POOLREF (SC_MAX_POOLREF + 20) // STATIC DATA ----------------------------------------------------------- @@ -99,95 +99,95 @@ USHORT* ScDocumentPool::pVersionMap11 = 0; static SfxItemInfo __READONLY_DATA aItemInfos[] = { - { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // ATTR_FONT - { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_HEIGHT - { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_WEIGHT - { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_FONT_POSTURE - { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_UNDERLINE - { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_OVERLINE - { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // ATTR_FONT_CROSSEDOUT - { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // ATTR_FONT_CONTOUR - { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // ATTR_FONT_SHADOWED - { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, // ATTR_FONT_COLOR - { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_FONT_LANGUAGE - { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT from 614 - { SID_ATTR_CHAR_CJK_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_HEIGHT from 614 - { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_WEIGHT from 614 - { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_POSTURE from 614 - { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_LANGUAGE from 614 - { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT from 614 - { SID_ATTR_CHAR_CTL_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_HEIGHT from 614 - { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_WEIGHT from 614 - { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_POSTURE from 614 - { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_LANGUAGE from 614 - { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, // ATTR_FONT_EMPHASISMARK from 614 - { 0, SFX_ITEM_POOLABLE }, // ATTR_USERDEF from 614 / 641c - { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, // ATTR_FONT_WORDLINE from 632b - { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // ATTR_FONT_RELIEF from 632b - { SID_ATTR_ALIGN_HYPHENATION, SFX_ITEM_POOLABLE }, // ATTR_HYPHENATE from 632b - { 0, SFX_ITEM_POOLABLE }, // ATTR_SCRIPTSPACE from 614d - { 0, SFX_ITEM_POOLABLE }, // ATTR_HANGPUNCTUATION from 614d - { SID_ATTR_PARA_FORBIDDEN_RULES,SFX_ITEM_POOLABLE }, // ATTR_FORBIDDEN_RULES from 614d - { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_HOR_JUSTIFY + { SID_ATTR_CHAR_FONT, SFX_ITEM_POOLABLE }, // ATTR_FONT + { SID_ATTR_CHAR_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_HEIGHT + { SID_ATTR_CHAR_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_FONT_WEIGHT + { SID_ATTR_CHAR_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_FONT_POSTURE + { SID_ATTR_CHAR_UNDERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_UNDERLINE + { SID_ATTR_CHAR_OVERLINE, SFX_ITEM_POOLABLE }, // ATTR_FONT_OVERLINE + { SID_ATTR_CHAR_STRIKEOUT, SFX_ITEM_POOLABLE }, // ATTR_FONT_CROSSEDOUT + { SID_ATTR_CHAR_CONTOUR, SFX_ITEM_POOLABLE }, // ATTR_FONT_CONTOUR + { SID_ATTR_CHAR_SHADOWED, SFX_ITEM_POOLABLE }, // ATTR_FONT_SHADOWED + { SID_ATTR_CHAR_COLOR, SFX_ITEM_POOLABLE }, // ATTR_FONT_COLOR + { SID_ATTR_CHAR_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_FONT_LANGUAGE + { SID_ATTR_CHAR_CJK_FONT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT from 614 + { SID_ATTR_CHAR_CJK_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_HEIGHT from 614 + { SID_ATTR_CHAR_CJK_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_WEIGHT from 614 + { SID_ATTR_CHAR_CJK_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_POSTURE from 614 + { SID_ATTR_CHAR_CJK_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CJK_FONT_LANGUAGE from 614 + { SID_ATTR_CHAR_CTL_FONT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT from 614 + { SID_ATTR_CHAR_CTL_FONTHEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_HEIGHT from 614 + { SID_ATTR_CHAR_CTL_WEIGHT, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_WEIGHT from 614 + { SID_ATTR_CHAR_CTL_POSTURE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_POSTURE from 614 + { SID_ATTR_CHAR_CTL_LANGUAGE, SFX_ITEM_POOLABLE }, // ATTR_CTL_FONT_LANGUAGE from 614 + { SID_ATTR_CHAR_EMPHASISMARK, SFX_ITEM_POOLABLE }, // ATTR_FONT_EMPHASISMARK from 614 + { 0, SFX_ITEM_POOLABLE }, // ATTR_USERDEF from 614 / 641c + { SID_ATTR_CHAR_WORDLINEMODE, SFX_ITEM_POOLABLE }, // ATTR_FONT_WORDLINE from 632b + { SID_ATTR_CHAR_RELIEF, SFX_ITEM_POOLABLE }, // ATTR_FONT_RELIEF from 632b + { SID_ATTR_ALIGN_HYPHENATION, SFX_ITEM_POOLABLE }, // ATTR_HYPHENATE from 632b + { 0, SFX_ITEM_POOLABLE }, // ATTR_SCRIPTSPACE from 614d + { 0, SFX_ITEM_POOLABLE }, // ATTR_HANGPUNCTUATION from 614d + { SID_ATTR_PARA_FORBIDDEN_RULES,SFX_ITEM_POOLABLE }, // ATTR_FORBIDDEN_RULES from 614d + { SID_ATTR_ALIGN_HOR_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_HOR_JUSTIFY { SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD, SFX_ITEM_POOLABLE }, // ATTR_HOR_JUSTIFY_METHOD - { SID_ATTR_ALIGN_INDENT, SFX_ITEM_POOLABLE }, // ATTR_INDENT ab 350 - { SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_VER_JUSTIFY + { SID_ATTR_ALIGN_INDENT, SFX_ITEM_POOLABLE }, // ATTR_INDENT ab 350 + { SID_ATTR_ALIGN_VER_JUSTIFY, SFX_ITEM_POOLABLE }, // ATTR_VER_JUSTIFY { SID_ATTR_ALIGN_VER_JUSTIFY_METHOD, SFX_ITEM_POOLABLE }, // ATTR_VER_JUSTIFY_METHOD { SID_ATTR_ALIGN_STACKED, SFX_ITEM_POOLABLE }, // ATTR_STACKED from 680/dr14 (replaces ATTR_ORIENTATION) - { SID_ATTR_ALIGN_DEGREES, SFX_ITEM_POOLABLE }, // ATTR_ROTATE_VALUE ab 367 - { SID_ATTR_ALIGN_LOCKPOS, SFX_ITEM_POOLABLE }, // ATTR_ROTATE_MODE ab 367 + { SID_ATTR_ALIGN_DEGREES, SFX_ITEM_POOLABLE }, // ATTR_ROTATE_VALUE ab 367 + { SID_ATTR_ALIGN_LOCKPOS, SFX_ITEM_POOLABLE }, // ATTR_ROTATE_MODE ab 367 { SID_ATTR_ALIGN_ASIANVERTICAL, SFX_ITEM_POOLABLE }, // ATTR_VERTICAL_ASIAN from 642 - { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // ATTR_WRITINGDIR from 643 - { SID_ATTR_ALIGN_LINEBREAK, SFX_ITEM_POOLABLE }, // ATTR_LINEBREAK + { SID_ATTR_FRAMEDIRECTION, SFX_ITEM_POOLABLE }, // ATTR_WRITINGDIR from 643 + { SID_ATTR_ALIGN_LINEBREAK, SFX_ITEM_POOLABLE }, // ATTR_LINEBREAK { SID_ATTR_ALIGN_SHRINKTOFIT, SFX_ITEM_POOLABLE }, // ATTR_SHRINKTOFIT from 680/dr14 { SID_ATTR_BORDER_DIAG_TLBR, SFX_ITEM_POOLABLE }, // ATTR_BORDER_TLBR from 680/dr14 { SID_ATTR_BORDER_DIAG_BLTR, SFX_ITEM_POOLABLE }, // ATTR_BORDER_BLTR from 680/dr14 - { SID_ATTR_ALIGN_MARGIN, SFX_ITEM_POOLABLE }, // ATTR_MARGIN - { 0, SFX_ITEM_POOLABLE }, // ATTR_MERGE - { 0, SFX_ITEM_POOLABLE }, // ATTR_MERGE_FLAG - { SID_ATTR_NUMBERFORMAT_VALUE, SFX_ITEM_POOLABLE }, // ATTR_VALUE_FORMAT - { ATTR_LANGUAGE_FORMAT, SFX_ITEM_POOLABLE }, // ATTR_LANGUAGE_FORMAT ab 329, wird im Dialog mit SID_ATTR_NUMBERFORMAT_VALUE kombiniert - { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, // ATTR_BACKGROUND - { SID_SCATTR_PROTECTION, SFX_ITEM_POOLABLE }, // ATTR_PROTECTION - { SID_ATTR_BORDER_OUTER, SFX_ITEM_POOLABLE }, // ATTR_BORDER - { SID_ATTR_BORDER_INNER, SFX_ITEM_POOLABLE }, // ATTR_BORDER_INNER - { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // ATTR_SHADOW - { 0, SFX_ITEM_POOLABLE }, // ATTR_VALIDDATA - { 0, SFX_ITEM_POOLABLE }, // ATTR_CONDITIONAL - { 0, SFX_ITEM_POOLABLE }, // ATTR_PATTERN - { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // ATTR_LRSPACE - { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // ATTR_ULSPACE - { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, // ATTR_PAGE - { 0, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PAPERTRAY, seit 303 nur noch dummy - { SID_ATTR_PAGE_PAPERBIN, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PAPERBIN - { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SIZE - { SID_ATTR_PAGE_MAXSIZE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_MAXSIZE - { SID_ATTR_PAGE_EXT1, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HORCENTER - { SID_ATTR_PAGE_EXT2, SFX_ITEM_POOLABLE }, // ATTR_PAGE_VERCENTER - { SID_ATTR_PAGE_ON, SFX_ITEM_POOLABLE }, // ATTR_PAGE_ON - { SID_ATTR_PAGE_DYNAMIC, SFX_ITEM_POOLABLE }, // ATTR_PAGE_DYNAMIC - { SID_ATTR_PAGE_SHARED, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SHARED - { SID_SCATTR_PAGE_NOTES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_NOTES - { SID_SCATTR_PAGE_GRID, SFX_ITEM_POOLABLE }, // ATTR_PAGE_GRID - { SID_SCATTR_PAGE_HEADERS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERS - { SID_SCATTR_PAGE_CHARTS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_CHARTS - { SID_SCATTR_PAGE_OBJECTS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_OBJECTS - { SID_SCATTR_PAGE_DRAWINGS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_DRAWINGS - { SID_SCATTR_PAGE_TOPDOWN, SFX_ITEM_POOLABLE }, // ATTR_PAGE_TOPDOWN - { SID_SCATTR_PAGE_SCALE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALE - { SID_SCATTR_PAGE_SCALETOPAGES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALETOPAGES - { SID_SCATTR_PAGE_FIRSTPAGENO, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FIRSTPAGENO - { SID_SCATTR_PAGE_PRINTAREA, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PRINTAREA - { SID_SCATTR_PAGE_REPEATROW, SFX_ITEM_POOLABLE }, // ATTR_PAGE_REPEATROW - { SID_SCATTR_PAGE_REPEATCOL, SFX_ITEM_POOLABLE }, // ATTR_PAGE_REPEATCOL - { SID_SCATTR_PAGE_PRINTTABLES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PRINTTABLES - { SID_SCATTR_PAGE_HEADERLEFT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERLEFT - { SID_SCATTR_PAGE_FOOTERLEFT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERLEFT - { SID_SCATTR_PAGE_HEADERRIGHT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERRIGHT - { SID_SCATTR_PAGE_FOOTERRIGHT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERRIGHT - { SID_ATTR_PAGE_HEADERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERSET - { SID_ATTR_PAGE_FOOTERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERSET - { SID_SCATTR_PAGE_FORMULAS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FORMULAS + { SID_ATTR_ALIGN_MARGIN, SFX_ITEM_POOLABLE }, // ATTR_MARGIN + { 0, SFX_ITEM_POOLABLE }, // ATTR_MERGE + { 0, SFX_ITEM_POOLABLE }, // ATTR_MERGE_FLAG + { SID_ATTR_NUMBERFORMAT_VALUE, SFX_ITEM_POOLABLE }, // ATTR_VALUE_FORMAT + { ATTR_LANGUAGE_FORMAT, SFX_ITEM_POOLABLE }, // ATTR_LANGUAGE_FORMAT ab 329, wird im Dialog mit SID_ATTR_NUMBERFORMAT_VALUE kombiniert + { SID_ATTR_BRUSH, SFX_ITEM_POOLABLE }, // ATTR_BACKGROUND + { SID_SCATTR_PROTECTION, SFX_ITEM_POOLABLE }, // ATTR_PROTECTION + { SID_ATTR_BORDER_OUTER, SFX_ITEM_POOLABLE }, // ATTR_BORDER + { SID_ATTR_BORDER_INNER, SFX_ITEM_POOLABLE }, // ATTR_BORDER_INNER + { SID_ATTR_BORDER_SHADOW, SFX_ITEM_POOLABLE }, // ATTR_SHADOW + { 0, SFX_ITEM_POOLABLE }, // ATTR_VALIDDATA + { 0, SFX_ITEM_POOLABLE }, // ATTR_CONDITIONAL + { 0, SFX_ITEM_POOLABLE }, // ATTR_PATTERN + { SID_ATTR_LRSPACE, SFX_ITEM_POOLABLE }, // ATTR_LRSPACE + { SID_ATTR_ULSPACE, SFX_ITEM_POOLABLE }, // ATTR_ULSPACE + { SID_ATTR_PAGE, SFX_ITEM_POOLABLE }, // ATTR_PAGE + { 0, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PAPERTRAY, seit 303 nur noch dummy + { SID_ATTR_PAGE_PAPERBIN, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PAPERBIN + { SID_ATTR_PAGE_SIZE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SIZE + { SID_ATTR_PAGE_MAXSIZE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_MAXSIZE + { SID_ATTR_PAGE_EXT1, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HORCENTER + { SID_ATTR_PAGE_EXT2, SFX_ITEM_POOLABLE }, // ATTR_PAGE_VERCENTER + { SID_ATTR_PAGE_ON, SFX_ITEM_POOLABLE }, // ATTR_PAGE_ON + { SID_ATTR_PAGE_DYNAMIC, SFX_ITEM_POOLABLE }, // ATTR_PAGE_DYNAMIC + { SID_ATTR_PAGE_SHARED, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SHARED + { SID_SCATTR_PAGE_NOTES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_NOTES + { SID_SCATTR_PAGE_GRID, SFX_ITEM_POOLABLE }, // ATTR_PAGE_GRID + { SID_SCATTR_PAGE_HEADERS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERS + { SID_SCATTR_PAGE_CHARTS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_CHARTS + { SID_SCATTR_PAGE_OBJECTS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_OBJECTS + { SID_SCATTR_PAGE_DRAWINGS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_DRAWINGS + { SID_SCATTR_PAGE_TOPDOWN, SFX_ITEM_POOLABLE }, // ATTR_PAGE_TOPDOWN + { SID_SCATTR_PAGE_SCALE, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALE + { SID_SCATTR_PAGE_SCALETOPAGES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_SCALETOPAGES + { SID_SCATTR_PAGE_FIRSTPAGENO, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FIRSTPAGENO + { SID_SCATTR_PAGE_PRINTAREA, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PRINTAREA + { SID_SCATTR_PAGE_REPEATROW, SFX_ITEM_POOLABLE }, // ATTR_PAGE_REPEATROW + { SID_SCATTR_PAGE_REPEATCOL, SFX_ITEM_POOLABLE }, // ATTR_PAGE_REPEATCOL + { SID_SCATTR_PAGE_PRINTTABLES, SFX_ITEM_POOLABLE }, // ATTR_PAGE_PRINTTABLES + { SID_SCATTR_PAGE_HEADERLEFT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERLEFT + { SID_SCATTR_PAGE_FOOTERLEFT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERLEFT + { SID_SCATTR_PAGE_HEADERRIGHT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERRIGHT + { SID_SCATTR_PAGE_FOOTERRIGHT, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERRIGHT + { SID_ATTR_PAGE_HEADERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_HEADERSET + { SID_ATTR_PAGE_FOOTERSET, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FOOTERSET + { SID_SCATTR_PAGE_FORMULAS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_FORMULAS { SID_SCATTR_PAGE_NULLVALS, SFX_ITEM_POOLABLE }, // ATTR_PAGE_NULLVALS { SID_SCATTR_PAGE_SCALETO, SFX_ITEM_POOLABLE } // ATTR_PAGE_SCALETO }; @@ -196,12 +196,12 @@ static SfxItemInfo __READONLY_DATA aItemInfos[] = ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) - : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScDocumentPool")), + : SfxItemPool ( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("ScDocumentPool")), ATTR_STARTINDEX, ATTR_ENDINDEX, aItemInfos, NULL, bLoadRefCounts ), - pSecondary ( pSecPool ) + pSecondary ( pSecPool ) { - // latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead + // latin font from GetDefaultFonts is not used, DEFAULTFONT_LATIN_SPREADSHEET instead Font aStdFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_SPREADSHEET, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE ); SvxFontItem* pStdFont = new SvxFontItem( aStdFont.GetFamily(), @@ -214,14 +214,14 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) SvxFontItem aDummy( ATTR_FONT ); GetDefaultFonts( aDummy, *pCjkFont, *pCtlFont ); - SvxBoxInfoItem* pGlobalBorderInnerAttr = new SvxBoxInfoItem( ATTR_BORDER_INNER ); - SfxItemSet* pSet = new SfxItemSet( *this, ATTR_PATTERN_START, ATTR_PATTERN_END ); - SfxItemSet aSetItemItemSet( *this, + SvxBoxInfoItem* pGlobalBorderInnerAttr = new SvxBoxInfoItem( ATTR_BORDER_INNER ); + SfxItemSet* pSet = new SfxItemSet( *this, ATTR_PATTERN_START, ATTR_PATTERN_END ); + SfxItemSet aSetItemItemSet( *this, ATTR_BACKGROUND, ATTR_BACKGROUND, - ATTR_BORDER, ATTR_SHADOW, - ATTR_LRSPACE, ATTR_ULSPACE, + ATTR_BORDER, ATTR_SHADOW, + ATTR_LRSPACE, ATTR_ULSPACE, ATTR_PAGE_SIZE, ATTR_PAGE_SIZE, - ATTR_PAGE_ON, ATTR_PAGE_SHARED, + ATTR_PAGE_ON, ATTR_PAGE_SHARED, 0 ); pGlobalBorderInnerAttr->SetLine(NULL, BOXINFO_LINE_HORI); @@ -232,7 +232,7 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) ppPoolDefaults = new SfxPoolItem*[ATTR_ENDINDEX-ATTR_STARTINDEX+1]; - ppPoolDefaults[ ATTR_FONT - ATTR_STARTINDEX ] = pStdFont; + ppPoolDefaults[ ATTR_FONT - ATTR_STARTINDEX ] = pStdFont; ppPoolDefaults[ ATTR_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_FONT_HEIGHT ); // 10 pt; ppPoolDefaults[ ATTR_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_FONT_WEIGHT ); ppPoolDefaults[ ATTR_FONT_POSTURE - ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_FONT_POSTURE ); @@ -242,41 +242,41 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) ppPoolDefaults[ ATTR_FONT_CONTOUR - ATTR_STARTINDEX ] = new SvxContourItem( sal_False, ATTR_FONT_CONTOUR ); ppPoolDefaults[ ATTR_FONT_SHADOWED - ATTR_STARTINDEX ] = new SvxShadowedItem( sal_False, ATTR_FONT_SHADOWED ); ppPoolDefaults[ ATTR_FONT_COLOR - ATTR_STARTINDEX ] = new SvxColorItem( Color(COL_AUTO), ATTR_FONT_COLOR ); - ppPoolDefaults[ ATTR_FONT_LANGUAGE - ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_FONT_LANGUAGE ); - ppPoolDefaults[ ATTR_CJK_FONT - ATTR_STARTINDEX ] = pCjkFont; + ppPoolDefaults[ ATTR_FONT_LANGUAGE - ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_FONT_LANGUAGE ); + ppPoolDefaults[ ATTR_CJK_FONT - ATTR_STARTINDEX ] = pCjkFont; ppPoolDefaults[ ATTR_CJK_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_CJK_FONT_HEIGHT ); ppPoolDefaults[ ATTR_CJK_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_CJK_FONT_WEIGHT ); ppPoolDefaults[ ATTR_CJK_FONT_POSTURE- ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_CJK_FONT_POSTURE ); - ppPoolDefaults[ ATTR_CJK_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), + ppPoolDefaults[ ATTR_CJK_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_CJK_FONT_LANGUAGE ); - ppPoolDefaults[ ATTR_CTL_FONT - ATTR_STARTINDEX ] = pCtlFont; + ppPoolDefaults[ ATTR_CTL_FONT - ATTR_STARTINDEX ] = pCtlFont; ppPoolDefaults[ ATTR_CTL_FONT_HEIGHT - ATTR_STARTINDEX ] = new SvxFontHeightItem( 200, 100, ATTR_CTL_FONT_HEIGHT ); ppPoolDefaults[ ATTR_CTL_FONT_WEIGHT - ATTR_STARTINDEX ] = new SvxWeightItem( WEIGHT_NORMAL, ATTR_CTL_FONT_WEIGHT ); ppPoolDefaults[ ATTR_CTL_FONT_POSTURE- ATTR_STARTINDEX ] = new SvxPostureItem( ITALIC_NONE, ATTR_CTL_FONT_POSTURE ); - ppPoolDefaults[ ATTR_CTL_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), + ppPoolDefaults[ ATTR_CTL_FONT_LANGUAGE-ATTR_STARTINDEX ] = new SvxLanguageItem( LanguageType(LANGUAGE_DONTKNOW), ATTR_CTL_FONT_LANGUAGE ); ppPoolDefaults[ ATTR_FONT_EMPHASISMARK-ATTR_STARTINDEX ] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, ATTR_FONT_EMPHASISMARK ); - ppPoolDefaults[ ATTR_USERDEF - ATTR_STARTINDEX ] = new SvXMLAttrContainerItem( ATTR_USERDEF ); + ppPoolDefaults[ ATTR_USERDEF - ATTR_STARTINDEX ] = new SvXMLAttrContainerItem( ATTR_USERDEF ); ppPoolDefaults[ ATTR_FONT_WORDLINE - ATTR_STARTINDEX ] = new SvxWordLineModeItem(sal_False, ATTR_FONT_WORDLINE ); ppPoolDefaults[ ATTR_FONT_RELIEF - ATTR_STARTINDEX ] = new SvxCharReliefItem( RELIEF_NONE, ATTR_FONT_RELIEF ); - ppPoolDefaults[ ATTR_HYPHENATE - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_HYPHENATE ); + ppPoolDefaults[ ATTR_HYPHENATE - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_HYPHENATE ); ppPoolDefaults[ ATTR_SCRIPTSPACE - ATTR_STARTINDEX ] = new SvxScriptSpaceItem( sal_False, ATTR_SCRIPTSPACE); ppPoolDefaults[ ATTR_HANGPUNCTUATION - ATTR_STARTINDEX ] = new SvxHangingPunctuationItem( sal_False, ATTR_HANGPUNCTUATION); ppPoolDefaults[ ATTR_FORBIDDEN_RULES - ATTR_STARTINDEX ] = new SvxForbiddenRuleItem( sal_False, ATTR_FORBIDDEN_RULES); ppPoolDefaults[ ATTR_HOR_JUSTIFY - ATTR_STARTINDEX ] = new SvxHorJustifyItem( SVX_HOR_JUSTIFY_STANDARD, ATTR_HOR_JUSTIFY); ppPoolDefaults[ ATTR_HOR_JUSTIFY_METHOD - ATTR_STARTINDEX ] = new SvxJustifyMethodItem( SVX_JUSTIFY_METHOD_AUTO, ATTR_HOR_JUSTIFY_METHOD); - ppPoolDefaults[ ATTR_INDENT - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_INDENT, 0 ); + ppPoolDefaults[ ATTR_INDENT - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_INDENT, 0 ); ppPoolDefaults[ ATTR_VER_JUSTIFY - ATTR_STARTINDEX ] = new SvxVerJustifyItem( SVX_VER_JUSTIFY_STANDARD, ATTR_VER_JUSTIFY); ppPoolDefaults[ ATTR_VER_JUSTIFY_METHOD - ATTR_STARTINDEX ] = new SvxJustifyMethodItem( SVX_JUSTIFY_METHOD_AUTO, ATTR_VER_JUSTIFY_METHOD); ppPoolDefaults[ ATTR_STACKED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_STACKED, FALSE ); - ppPoolDefaults[ ATTR_ROTATE_VALUE - ATTR_STARTINDEX ] = new SfxInt32Item( ATTR_ROTATE_VALUE, 0 ); - ppPoolDefaults[ ATTR_ROTATE_MODE - ATTR_STARTINDEX ] = new SvxRotateModeItem( SVX_ROTATE_MODE_BOTTOM, ATTR_ROTATE_MODE ); - ppPoolDefaults[ ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_VERTICAL_ASIAN ); - // The default for the ATTR_WRITINGDIR cell attribute must by FRMDIR_ENVIRONMENT, - // so that value is returned when asking for a default cell's attributes. - // The value from the page style is set as DefaultHorizontalTextDirection for the EditEngine. - ppPoolDefaults[ ATTR_WRITINGDIR - ATTR_STARTINDEX ] = new SvxFrameDirectionItem( FRMDIR_ENVIRONMENT, ATTR_WRITINGDIR ); - ppPoolDefaults[ ATTR_LINEBREAK - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_LINEBREAK ); + ppPoolDefaults[ ATTR_ROTATE_VALUE - ATTR_STARTINDEX ] = new SfxInt32Item( ATTR_ROTATE_VALUE, 0 ); + ppPoolDefaults[ ATTR_ROTATE_MODE - ATTR_STARTINDEX ] = new SvxRotateModeItem( SVX_ROTATE_MODE_BOTTOM, ATTR_ROTATE_MODE ); + ppPoolDefaults[ ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_VERTICAL_ASIAN ); + // The default for the ATTR_WRITINGDIR cell attribute must by FRMDIR_ENVIRONMENT, + // so that value is returned when asking for a default cell's attributes. + // The value from the page style is set as DefaultHorizontalTextDirection for the EditEngine. + ppPoolDefaults[ ATTR_WRITINGDIR - ATTR_STARTINDEX ] = new SvxFrameDirectionItem( FRMDIR_ENVIRONMENT, ATTR_WRITINGDIR ); + ppPoolDefaults[ ATTR_LINEBREAK - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_LINEBREAK ); ppPoolDefaults[ ATTR_SHRINKTOFIT - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_SHRINKTOFIT ); ppPoolDefaults[ ATTR_BORDER_TLBR - ATTR_STARTINDEX ] = new SvxLineItem( ATTR_BORDER_TLBR ); ppPoolDefaults[ ATTR_BORDER_BLTR - ATTR_STARTINDEX ] = new SvxLineItem( ATTR_BORDER_BLTR ); @@ -284,63 +284,63 @@ ScDocumentPool::ScDocumentPool( SfxItemPool* pSecPool, BOOL bLoadRefCounts ) pItem->SetTopMargin( 27 ); pItem->SetBottomMargin( 27 ); ppPoolDefaults[ ATTR_MARGIN - ATTR_STARTINDEX ] = pItem; - ppPoolDefaults[ ATTR_MERGE - ATTR_STARTINDEX ] = new ScMergeAttr; - ppPoolDefaults[ ATTR_MERGE_FLAG - ATTR_STARTINDEX ] = new ScMergeFlagAttr; - ppPoolDefaults[ ATTR_VALUE_FORMAT - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALUE_FORMAT, 0 ); - ppPoolDefaults[ ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX ] = new SvxLanguageItem( ScGlobal::eLnge, ATTR_LANGUAGE_FORMAT ); - ppPoolDefaults[ ATTR_BACKGROUND - ATTR_STARTINDEX ] = new SvxBrushItem( Color(COL_TRANSPARENT), ATTR_BACKGROUND ); - ppPoolDefaults[ ATTR_PROTECTION - ATTR_STARTINDEX ] = new ScProtectionAttr; - ppPoolDefaults[ ATTR_BORDER - ATTR_STARTINDEX ] = new SvxBoxItem( ATTR_BORDER ); - ppPoolDefaults[ ATTR_BORDER_INNER - ATTR_STARTINDEX ] = pGlobalBorderInnerAttr; - ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); - ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); - ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_CONDITIONAL, 0 ); - - // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem - //! zusaetzliche Methode ScGlobal::IsInit() oder so... - //! oder erkennen, ob dies der Secondary-Pool fuer einen MessagePool ist + ppPoolDefaults[ ATTR_MERGE - ATTR_STARTINDEX ] = new ScMergeAttr; + ppPoolDefaults[ ATTR_MERGE_FLAG - ATTR_STARTINDEX ] = new ScMergeFlagAttr; + ppPoolDefaults[ ATTR_VALUE_FORMAT - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALUE_FORMAT, 0 ); + ppPoolDefaults[ ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX ] = new SvxLanguageItem( ScGlobal::eLnge, ATTR_LANGUAGE_FORMAT ); + ppPoolDefaults[ ATTR_BACKGROUND - ATTR_STARTINDEX ] = new SvxBrushItem( Color(COL_TRANSPARENT), ATTR_BACKGROUND ); + ppPoolDefaults[ ATTR_PROTECTION - ATTR_STARTINDEX ] = new ScProtectionAttr; + ppPoolDefaults[ ATTR_BORDER - ATTR_STARTINDEX ] = new SvxBoxItem( ATTR_BORDER ); + ppPoolDefaults[ ATTR_BORDER_INNER - ATTR_STARTINDEX ] = pGlobalBorderInnerAttr; + ppPoolDefaults[ ATTR_SHADOW - ATTR_STARTINDEX ] = new SvxShadowItem( ATTR_SHADOW ); + ppPoolDefaults[ ATTR_VALIDDATA - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_VALIDDATA, 0 ); + ppPoolDefaults[ ATTR_CONDITIONAL - ATTR_STARTINDEX ] = new SfxUInt32Item( ATTR_CONDITIONAL, 0 ); + + // GetRscString funktioniert erst nach ScGlobal::Init, zu erkennen am EmptyBrushItem + //! zusaetzliche Methode ScGlobal::IsInit() oder so... + //! oder erkennen, ob dies der Secondary-Pool fuer einen MessagePool ist if ( ScGlobal::GetEmptyBrushItem() ) - ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); + ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ); else - ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, - String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_STANDARD)) ); //! without name? - - ppPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); - ppPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); - ppPoolDefaults[ ATTR_PAGE - ATTR_STARTINDEX ] = new SvxPageItem( ATTR_PAGE ); - ppPoolDefaults[ ATTR_PAGE_PAPERTRAY - ATTR_STARTINDEX ] = new SfxAllEnumItem( ATTR_PAGE_PAPERTRAY ); - ppPoolDefaults[ ATTR_PAGE_PAPERBIN - ATTR_STARTINDEX ] = new SvxPaperBinItem( ATTR_PAGE_PAPERBIN ); - ppPoolDefaults[ ATTR_PAGE_SIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_SIZE ); - ppPoolDefaults[ ATTR_PAGE_MAXSIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_MAXSIZE ); - ppPoolDefaults[ ATTR_PAGE_HORCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HORCENTER ); - ppPoolDefaults[ ATTR_PAGE_VERCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_VERCENTER ); - ppPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, TRUE ); - ppPoolDefaults[ ATTR_PAGE_DYNAMIC - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, TRUE ); - ppPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, TRUE ); - ppPoolDefaults[ ATTR_PAGE_NOTES - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NOTES, FALSE ); - ppPoolDefaults[ ATTR_PAGE_GRID - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_GRID, FALSE ); - ppPoolDefaults[ ATTR_PAGE_HEADERS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HEADERS, FALSE ); - ppPoolDefaults[ ATTR_PAGE_CHARTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_CHARTS ); - ppPoolDefaults[ ATTR_PAGE_OBJECTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_OBJECTS ); - ppPoolDefaults[ ATTR_PAGE_DRAWINGS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_DRAWINGS ); - ppPoolDefaults[ ATTR_PAGE_TOPDOWN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_TOPDOWN, TRUE ); - ppPoolDefaults[ ATTR_PAGE_SCALE - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALE, 100 ); - ppPoolDefaults[ ATTR_PAGE_SCALETOPAGES-ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 1 ); - ppPoolDefaults[ ATTR_PAGE_FIRSTPAGENO- ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 1 ); - ppPoolDefaults[ ATTR_PAGE_PRINTAREA - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_PRINTAREA ); - ppPoolDefaults[ ATTR_PAGE_REPEATROW - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATROW ); - ppPoolDefaults[ ATTR_PAGE_REPEATCOL - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATCOL ); - ppPoolDefaults[ ATTR_PAGE_PRINTTABLES- ATTR_STARTINDEX ] = new ScTableListItem( ATTR_PAGE_PRINTTABLES ); - ppPoolDefaults[ ATTR_PAGE_HEADERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERLEFT ); - ppPoolDefaults[ ATTR_PAGE_FOOTERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERLEFT ); - ppPoolDefaults[ ATTR_PAGE_HEADERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT ); - ppPoolDefaults[ ATTR_PAGE_FOOTERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT ); - ppPoolDefaults[ ATTR_PAGE_HEADERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_HEADERSET, aSetItemItemSet ); - ppPoolDefaults[ ATTR_PAGE_FOOTERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_FOOTERSET, aSetItemItemSet ); - ppPoolDefaults[ ATTR_PAGE_FORMULAS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, FALSE ); - ppPoolDefaults[ ATTR_PAGE_NULLVALS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, TRUE ); + ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ] = new ScPatternAttr( pSet, + String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_STANDARD)) ); //! without name? + + ppPoolDefaults[ ATTR_LRSPACE - ATTR_STARTINDEX ] = new SvxLRSpaceItem( ATTR_LRSPACE ); + ppPoolDefaults[ ATTR_ULSPACE - ATTR_STARTINDEX ] = new SvxULSpaceItem( ATTR_ULSPACE ); + ppPoolDefaults[ ATTR_PAGE - ATTR_STARTINDEX ] = new SvxPageItem( ATTR_PAGE ); + ppPoolDefaults[ ATTR_PAGE_PAPERTRAY - ATTR_STARTINDEX ] = new SfxAllEnumItem( ATTR_PAGE_PAPERTRAY ); + ppPoolDefaults[ ATTR_PAGE_PAPERBIN - ATTR_STARTINDEX ] = new SvxPaperBinItem( ATTR_PAGE_PAPERBIN ); + ppPoolDefaults[ ATTR_PAGE_SIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_SIZE ); + ppPoolDefaults[ ATTR_PAGE_MAXSIZE - ATTR_STARTINDEX ] = new SvxSizeItem( ATTR_PAGE_MAXSIZE ); + ppPoolDefaults[ ATTR_PAGE_HORCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HORCENTER ); + ppPoolDefaults[ ATTR_PAGE_VERCENTER - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_VERCENTER ); + ppPoolDefaults[ ATTR_PAGE_ON - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_ON, TRUE ); + ppPoolDefaults[ ATTR_PAGE_DYNAMIC - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_DYNAMIC, TRUE ); + ppPoolDefaults[ ATTR_PAGE_SHARED - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_SHARED, TRUE ); + ppPoolDefaults[ ATTR_PAGE_NOTES - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NOTES, FALSE ); + ppPoolDefaults[ ATTR_PAGE_GRID - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_GRID, FALSE ); + ppPoolDefaults[ ATTR_PAGE_HEADERS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_HEADERS, FALSE ); + ppPoolDefaults[ ATTR_PAGE_CHARTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_CHARTS ); + ppPoolDefaults[ ATTR_PAGE_OBJECTS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_OBJECTS ); + ppPoolDefaults[ ATTR_PAGE_DRAWINGS - ATTR_STARTINDEX ] = new ScViewObjectModeItem( ATTR_PAGE_DRAWINGS ); + ppPoolDefaults[ ATTR_PAGE_TOPDOWN - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_TOPDOWN, TRUE ); + ppPoolDefaults[ ATTR_PAGE_SCALE - ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALE, 100 ); + ppPoolDefaults[ ATTR_PAGE_SCALETOPAGES-ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_SCALETOPAGES, 1 ); + ppPoolDefaults[ ATTR_PAGE_FIRSTPAGENO- ATTR_STARTINDEX ] = new SfxUInt16Item( ATTR_PAGE_FIRSTPAGENO, 1 ); + ppPoolDefaults[ ATTR_PAGE_PRINTAREA - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_PRINTAREA ); + ppPoolDefaults[ ATTR_PAGE_REPEATROW - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATROW ); + ppPoolDefaults[ ATTR_PAGE_REPEATCOL - ATTR_STARTINDEX ] = new ScRangeItem( ATTR_PAGE_REPEATCOL ); + ppPoolDefaults[ ATTR_PAGE_PRINTTABLES- ATTR_STARTINDEX ] = new ScTableListItem( ATTR_PAGE_PRINTTABLES ); + ppPoolDefaults[ ATTR_PAGE_HEADERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERLEFT ); + ppPoolDefaults[ ATTR_PAGE_FOOTERLEFT - ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERLEFT ); + ppPoolDefaults[ ATTR_PAGE_HEADERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT ); + ppPoolDefaults[ ATTR_PAGE_FOOTERRIGHT- ATTR_STARTINDEX ] = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT ); + ppPoolDefaults[ ATTR_PAGE_HEADERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_HEADERSET, aSetItemItemSet ); + ppPoolDefaults[ ATTR_PAGE_FOOTERSET - ATTR_STARTINDEX ] = new SvxSetItem( ATTR_PAGE_FOOTERSET, aSetItemItemSet ); + ppPoolDefaults[ ATTR_PAGE_FORMULAS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_FORMULAS, FALSE ); + ppPoolDefaults[ ATTR_PAGE_NULLVALS - ATTR_STARTINDEX ] = new SfxBoolItem( ATTR_PAGE_NULLVALS, TRUE ); ppPoolDefaults[ ATTR_PAGE_SCALETO - ATTR_STARTINDEX ] = new ScPageScaleToItem( 1, 1 ); -// ppPoolDefaults[ ATTR_ITEM_DOUBLE - ATTR_STARTINDEX ] = new ScDoubleItem( ATTR_ITEM_DOUBLE, 0 ); +// ppPoolDefaults[ ATTR_ITEM_DOUBLE - ATTR_STARTINDEX ] = new ScDoubleItem( ATTR_ITEM_DOUBLE, 0 ); SetDefaults( ppPoolDefaults ); @@ -410,12 +410,12 @@ void ScDocumentPool::InitVersionMaps() // alte WhichId's mappen // nicht mit ATTR_* zaehlen, falls die sich nochmal aendern - // erste Map: ATTR_LANGUAGE_FORMAT ab sv329 eingefuegt + // erste Map: ATTR_LANGUAGE_FORMAT ab sv329 eingefuegt - const USHORT nMap1Start = 100; // alter ATTR_STARTINDEX - const USHORT nMap1End = 157; // alter ATTR_ENDINDEX + const USHORT nMap1Start = 100; // alter ATTR_STARTINDEX + const USHORT nMap1End = 157; // alter ATTR_ENDINDEX const USHORT nMap1Count = nMap1End - nMap1Start + 1; - const USHORT nMap1New = 18; // ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX + const USHORT nMap1New = 18; // ATTR_LANGUAGE_FORMAT - ATTR_STARTINDEX pVersionMap1 = new USHORT [ nMap1Count ]; USHORT i, j; for ( i=0, j=nMap1Start; i < nMap1New; i++, j++ ) @@ -424,12 +424,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap1New, j=nMap1Start+nMap1New+1; i < nMap1Count; i++, j++ ) pVersionMap1[i] = j; - // zweite Map: ATTR_VALIDDATA und ATTR_CONDITIONAL ab 341 eingefuegt + // zweite Map: ATTR_VALIDDATA und ATTR_CONDITIONAL ab 341 eingefuegt - const USHORT nMap2Start = 100; // ATTR_STARTINDEX - const USHORT nMap2End = 158; // ATTR_ENDINDEX + const USHORT nMap2Start = 100; // ATTR_STARTINDEX + const USHORT nMap2End = 158; // ATTR_ENDINDEX const USHORT nMap2Count = nMap2End - nMap2Start + 1; - const USHORT nMap2New = 24; // ATTR_VALIDDATA - ATTR_STARTINDEX + const USHORT nMap2New = 24; // ATTR_VALIDDATA - ATTR_STARTINDEX pVersionMap2 = new USHORT [ nMap2Count ]; for ( i=0, j=nMap2Start; i < nMap2New; i++, j++ ) pVersionMap2[i] = j; @@ -437,12 +437,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap2New, j=nMap2Start+nMap2New+2; i < nMap2Count; i++, j++ ) pVersionMap2[i] = j; - // dritte Map: ATTR_INDENT ab 350 eingefuegt + // dritte Map: ATTR_INDENT ab 350 eingefuegt - const USHORT nMap3Start = 100; // ATTR_STARTINDEX - const USHORT nMap3End = 160; // ATTR_ENDINDEX + const USHORT nMap3Start = 100; // ATTR_STARTINDEX + const USHORT nMap3End = 160; // ATTR_ENDINDEX const USHORT nMap3Count = nMap3End - nMap3Start + 1; - const USHORT nMap3New = 11; // ATTR_INDENT - ATTR_STARTINDEX + const USHORT nMap3New = 11; // ATTR_INDENT - ATTR_STARTINDEX pVersionMap3 = new USHORT [ nMap3Count ]; for ( i=0, j=nMap3Start; i < nMap3New; i++, j++ ) pVersionMap3[i] = j; @@ -450,12 +450,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap3New, j=nMap3Start+nMap3New+1; i < nMap3Count; i++, j++ ) pVersionMap3[i] = j; - // vierte Map: ATTR_ROTATE_VALUE und ATTR_ROTATE_MODE ab 367 eingefuegt + // vierte Map: ATTR_ROTATE_VALUE und ATTR_ROTATE_MODE ab 367 eingefuegt - const USHORT nMap4Start = 100; // ATTR_STARTINDEX - const USHORT nMap4End = 161; // ATTR_ENDINDEX + const USHORT nMap4Start = 100; // ATTR_STARTINDEX + const USHORT nMap4End = 161; // ATTR_ENDINDEX const USHORT nMap4Count = nMap4End - nMap4Start + 1; - const USHORT nMap4New = 14; // ATTR_ROTATE_VALUE - ATTR_STARTINDEX + const USHORT nMap4New = 14; // ATTR_ROTATE_VALUE - ATTR_STARTINDEX pVersionMap4 = new USHORT [ nMap4Count ]; for ( i=0, j=nMap4Start; i < nMap4New; i++, j++ ) pVersionMap4[i] = j; @@ -463,12 +463,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap4New, j=nMap4Start+nMap4New+2; i < nMap4Count; i++, j++ ) pVersionMap4[i] = j; - // fifth map: CJK..., CTL..., EMPHASISMARK, TWOLINES (12 items) added in 614 + // fifth map: CJK..., CTL..., EMPHASISMARK, TWOLINES (12 items) added in 614 - const USHORT nMap5Start = 100; // ATTR_STARTINDEX - const USHORT nMap5End = 163; // ATTR_ENDINDEX + const USHORT nMap5Start = 100; // ATTR_STARTINDEX + const USHORT nMap5End = 163; // ATTR_ENDINDEX const USHORT nMap5Count = nMap5End - nMap5Start + 1; - const USHORT nMap5New = 10; // ATTR_CJK_FONT - ATTR_STARTINDEX + const USHORT nMap5New = 10; // ATTR_CJK_FONT - ATTR_STARTINDEX pVersionMap5 = new USHORT [ nMap5Count ]; for ( i=0, j=nMap5Start; i < nMap5New; i++, j++ ) pVersionMap5[i] = j; @@ -478,10 +478,10 @@ void ScDocumentPool::InitVersionMaps() // sixth map: ATTR_SCRIPTSPACE, ATTR_HANGPUNCTUATION, ATTR_FORBIDDEN_RULES added in 614d - const USHORT nMap6Start = 100; // ATTR_STARTINDEX - const USHORT nMap6End = 175; // ATTR_ENDINDEX + const USHORT nMap6Start = 100; // ATTR_STARTINDEX + const USHORT nMap6End = 175; // ATTR_ENDINDEX const USHORT nMap6Count = nMap6End - nMap6Start + 1; - const USHORT nMap6New = 22; // ATTR_SCRIPTSPACE - ATTR_STARTINDEX + const USHORT nMap6New = 22; // ATTR_SCRIPTSPACE - ATTR_STARTINDEX pVersionMap6 = new USHORT [ nMap6Count ]; for ( i=0, j=nMap6Start; i < nMap6New; i++, j++ ) pVersionMap6[i] = j; @@ -489,12 +489,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap6New, j=nMap6Start+nMap6New+3; i < nMap6Count; i++, j++ ) pVersionMap6[i] = j; - // seventh map: ATTR_FONT_WORDLINE, ATTR_FONT_RELIEF, ATTR_HYPHENATE added in 632b + // seventh map: ATTR_FONT_WORDLINE, ATTR_FONT_RELIEF, ATTR_HYPHENATE added in 632b - const USHORT nMap7Start = 100; // ATTR_STARTINDEX - const USHORT nMap7End = 178; // ATTR_ENDINDEX + const USHORT nMap7Start = 100; // ATTR_STARTINDEX + const USHORT nMap7End = 178; // ATTR_ENDINDEX const USHORT nMap7Count = nMap7End - nMap7Start + 1; - const USHORT nMap7New = 22; // ATTR_FONT_WORDLINE - ATTR_STARTINDEX + const USHORT nMap7New = 22; // ATTR_FONT_WORDLINE - ATTR_STARTINDEX pVersionMap7 = new USHORT [ nMap7Count ]; for ( i=0, j=nMap7Start; i < nMap7New; i++, j++ ) pVersionMap7[i] = j; @@ -502,12 +502,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap7New, j=nMap7Start+nMap7New+3; i < nMap7Count; i++, j++ ) pVersionMap7[i] = j; - // eighth map: ATTR_VERTICAL_ASIAN added in 642q + // eighth map: ATTR_VERTICAL_ASIAN added in 642q - const USHORT nMap8Start = 100; // ATTR_STARTINDEX - const USHORT nMap8End = 181; // ATTR_ENDINDEX + const USHORT nMap8Start = 100; // ATTR_STARTINDEX + const USHORT nMap8End = 181; // ATTR_ENDINDEX const USHORT nMap8Count = nMap8End - nMap8Start + 1; - const USHORT nMap8New = 34; // ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX + const USHORT nMap8New = 34; // ATTR_VERTICAL_ASIAN - ATTR_STARTINDEX pVersionMap8 = new USHORT [ nMap8Count ]; for ( i=0, j=nMap8Start; i < nMap8New; i++, j++ ) pVersionMap8[i] = j; @@ -515,12 +515,12 @@ void ScDocumentPool::InitVersionMaps() for ( i=nMap8New, j=nMap8Start+nMap8New+1; i < nMap8Count; i++, j++ ) pVersionMap8[i] = j; - // 9th map: ATTR_WRITINGDIR added in 643y + // 9th map: ATTR_WRITINGDIR added in 643y - const USHORT nMap9Start = 100; // ATTR_STARTINDEX - const USHORT nMap9End = 182; // ATTR_ENDINDEX + const USHORT nMap9Start = 100; // ATTR_STARTINDEX + const USHORT nMap9End = 182; // ATTR_ENDINDEX const USHORT nMap9Count = nMap9End - nMap9Start + 1; - const USHORT nMap9New = 35; // ATTR_WRITINGDIR - ATTR_STARTINDEX + const USHORT nMap9New = 35; // ATTR_WRITINGDIR - ATTR_STARTINDEX pVersionMap9 = new USHORT [ nMap9Count ]; for ( i=0, j=nMap9Start; i < nMap9New; i++, j++ ) pVersionMap9[i] = j; @@ -592,25 +592,25 @@ void ScDocumentPool::DeleteVersionMaps() // ---------------------------------------------------------------------------------------- // -// Fuer die Pattern-Attribute (SetItems) kann der USHORT RefCount leicht ueberlaufen -// (z.B. 600 ganze Zeilen abwechselnd formatieren). -// Darum wird der RefCount bei SC_MAX_POOLREF festgehalten und nicht mehr hoch- oder -// heruntergezaehlt. Dieser RefCount wird dann erst beim naechsten Laden neu gezaehlt. -// Die Differenz zwischen SC_MAX_POOLREF und SC_SAFE_POOLREF ist ein wenig groesser -// als noetig, um zu erkennen, wenn der RefCount aus Versehen doch "normal" veraendert -// wird (Assertions). +// Fuer die Pattern-Attribute (SetItems) kann der USHORT RefCount leicht ueberlaufen +// (z.B. 600 ganze Zeilen abwechselnd formatieren). +// Darum wird der RefCount bei SC_MAX_POOLREF festgehalten und nicht mehr hoch- oder +// heruntergezaehlt. Dieser RefCount wird dann erst beim naechsten Laden neu gezaehlt. +// Die Differenz zwischen SC_MAX_POOLREF und SC_SAFE_POOLREF ist ein wenig groesser +// als noetig, um zu erkennen, wenn der RefCount aus Versehen doch "normal" veraendert +// wird (Assertions). // const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, USHORT nWhich ) { - if ( rItem.Which() != ATTR_PATTERN ) // nur Pattern ist special + if ( rItem.Which() != ATTR_PATTERN ) // nur Pattern ist special return SfxItemPool::Put( rItem, nWhich ); - // das Default-Pattern dieses Pools nicht kopieren + // das Default-Pattern dieses Pools nicht kopieren if (&rItem == ppPoolDefaults[ ATTR_PATTERN - ATTR_STARTINDEX ]) return rItem; - // ansonsten muss Put immer passieren, weil es ein anderer Pool sein kann + // ansonsten muss Put immer passieren, weil es ein anderer Pool sein kann const SfxPoolItem& rNew = SfxItemPool::Put( rItem, nWhich ); CheckRef( rNew ); return rNew; @@ -618,7 +618,7 @@ const SfxPoolItem& __EXPORT ScDocumentPool::Put( const SfxPoolItem& rItem, USHOR void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem ) { - if ( rItem.Which() == ATTR_PATTERN ) // nur Pattern ist special + if ( rItem.Which() == ATTR_PATTERN ) // nur Pattern ist special { ULONG nRef = rItem.GetRefCount(); if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF ) @@ -628,13 +628,13 @@ void __EXPORT ScDocumentPool::Remove( const SfxPoolItem& rItem ) DBG_ERROR("Wer fummelt da an meinen Ref-Counts herum"); SetRefCount( (SfxPoolItem&)rItem, (ULONG) SC_SAFE_POOLREF ); } - return; // nicht herunterzaehlen + return; // nicht herunterzaehlen } } SfxItemPool::Remove( rItem ); } -void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static +void ScDocumentPool::CheckRef( const SfxPoolItem& rItem ) // static { ULONG nRef = rItem.GetRefCount(); if ( nRef >= (ULONG) SC_MAX_POOLREF && nRef <= (ULONG) SFX_ITEMS_OLD_MAXREF ) @@ -687,11 +687,11 @@ SfxItemPool* __EXPORT ScDocumentPool::Clone() const SfxItemPresentation lcl_HFPresentation ( - const SfxPoolItem& rItem, + const SfxPoolItem& rItem, SfxItemPresentation ePresentation, - SfxMapUnit eCoreMetric, - SfxMapUnit ePresentationMetric, - String& rText, + SfxMapUnit eCoreMetric, + SfxMapUnit ePresentationMetric, + String& rText, const IntlWrapper* pIntl ) { @@ -704,10 +704,10 @@ SfxItemPresentation lcl_HFPresentation return SFX_ITEM_PRESENTATION_NONE; } - SfxItemIter aIter( rSet ); + SfxItemIter aIter( rSet ); pItem = aIter.FirstItem(); - String aText; - String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " + " )); + String aText; + String aDel = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM( " + " )); while( pItem ) { @@ -789,15 +789,15 @@ SfxItemPresentation lcl_HFPresentation } SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( - const SfxPoolItem& rItem, + const SfxPoolItem& rItem, SfxItemPresentation ePresentation, - SfxMapUnit ePresentationMetric, - String& rText, + SfxMapUnit ePresentationMetric, + String& rText, const IntlWrapper* pIntl ) const { - USHORT nW = rItem.Which(); - String aStrYes ( ScGlobal::GetRscString(STR_YES) ); - String aStrNo ( ScGlobal::GetRscString(STR_NO) ); + USHORT nW = rItem.Which(); + String aStrYes ( ScGlobal::GetRscString(STR_YES) ); + String aStrNo ( ScGlobal::GetRscString(STR_NO) ); String aStrSep = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(": ")); switch( nW ) @@ -808,7 +808,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_PRINTDIR); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? ScGlobal::GetRscString(STR_SCATTR_PAGE_TOPDOWN) : @@ -827,7 +827,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_HEADERS); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -844,7 +844,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NULLVALS); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -861,7 +861,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FORMULAS); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -878,7 +878,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_NOTES); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -895,7 +895,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_GRID); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += ((const SfxBoolItem&)rItem).GetValue() ? aStrYes : aStrNo ; break; @@ -908,7 +908,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_SCALETOPAGES: { - USHORT nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); + USHORT nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); if( nPagNo ) { @@ -918,7 +918,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( { rText.Assign( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALETOPAGES ) ).Append( aStrSep ); } -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: { String aPages( ScGlobal::GetRscString( STR_SCATTR_PAGE_SCALE_PAGES ) ); @@ -941,7 +941,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_FIRSTPAGENO: { - USHORT nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); + USHORT nPagNo = ((const SfxUInt16Item&)rItem).GetValue(); if( nPagNo ) { @@ -950,7 +950,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_FIRSTPAGENO); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += String::CreateFromInt32( nPagNo ); break; @@ -969,7 +969,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_SCALE: { - USHORT nPercent = ((const SfxUInt16Item&)rItem).GetValue(); + USHORT nPercent = ((const SfxUInt16Item&)rItem).GetValue(); if( nPercent ) { @@ -978,7 +978,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case SFX_ITEM_PRESENTATION_COMPLETE: rText = ScGlobal::GetRscString(STR_SCATTR_PAGE_SCALE); rText += aStrSep; -// break; // DURCHFALLEN!!! +// break; // DURCHFALLEN!!! case SFX_ITEM_PRESENTATION_NAMELESS: rText += String::CreateFromInt32( nPercent ); rText += '%'; @@ -998,9 +998,9 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_HEADERSET: { - String aBuffer; + String aBuffer; - if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) + if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) { rText = ScGlobal::GetRscString(STR_HEADER); rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ( " )); @@ -1012,9 +1012,9 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( case ATTR_PAGE_FOOTERSET: { - String aBuffer; + String aBuffer; - if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) + if( lcl_HFPresentation( rItem, ePresentation, GetMetric( nW ), ePresentationMetric, aBuffer, pIntl ) != SFX_ITEM_PRESENTATION_NONE ) { rText = ScGlobal::GetRscString(STR_FOOTER); rText.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " ( " )); @@ -1054,7 +1054,7 @@ SfxItemPresentation __EXPORT ScDocumentPool::GetPresentation( SfxMapUnit __EXPORT ScDocumentPool::GetMetric( USHORT nWhich ) const { - // eigene Attribute: Twips, alles andere 1/100 mm + // eigene Attribute: Twips, alles andere 1/100 mm if ( nWhich >= ATTR_STARTINDEX && nWhich <= ATTR_ENDINDEX ) return SFX_MAPUNIT_TWIP; diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index adb9cf49ed0a..74383622f92a 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.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,7 +78,7 @@ #include "validat.hxx" #include "progress.hxx" #include "detdata.hxx" -#include "sc.hrc" // FID_DATACHANGED +#include "sc.hrc" // FID_DATACHANGED #include "ddelink.hxx" #include "chgtrack.hxx" #include "chgviset.hxx" @@ -125,7 +125,7 @@ private: // STATIC DATA ----------------------------------------------------------- -ScDocument::ScDocument( ScDocumentMode eMode, +ScDocument::ScDocument( ScDocumentMode eMode, SfxObjectShell* pDocShell ) : xServiceManager( ::comphelper::getProcessServiceFactory() ), mpUndoManager( NULL ), @@ -190,7 +190,7 @@ ScDocument::ScDocument( ScDocumentMode eMode, bIsUndo( eMode == SCDOCMODE_UNDO ), bIsVisible( FALSE ), bIsEmbedded( FALSE ), -// bNoSetDirty( TRUE ), +// bNoSetDirty( TRUE ), bNoSetDirty( FALSE ), bInsertingFromOtherDoc( FALSE ), bLoadingMedium( false ), @@ -242,8 +242,8 @@ ScDocument::ScDocument( ScDocumentMode eMode, } else { - pTab[0] = NULL; - pBASM = NULL; + pTab[0] = NULL; + pBASM = NULL; pChartListenerCollection = NULL; pRefreshTimerControl = NULL; } @@ -266,13 +266,13 @@ ScDocument::ScDocument( ScDocumentMode eMode, aTrackTimer.SetTimeout( 100 ); } -sfx2::LinkManager* ScDocument::GetLinkManager() const -{ +sfx2::LinkManager* ScDocument::GetLinkManager() const +{ if ( bAutoCalc && !pLinkManager && pShell) { pLinkManager = new sfx2::LinkManager( pShell ); } - return pLinkManager; + return pLinkManager; } @@ -296,8 +296,8 @@ void ScDocument::SetStorageGrammar( formula::FormulaGrammar::Grammar eGram ) void ScDocument::SetDocVisible( BOOL bSet ) { - // called from view ctor - only for a visible document, - // each new sheet's RTL flag is initialized from the locale + // called from view ctor - only for a visible document, + // each new sheet's RTL flag is initialized from the locale bIsVisible = bSet; } @@ -336,17 +336,17 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG ) { - if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln + if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln { - aTrackTimer.Start(); // spaeter nochmal versuchen + aTrackTimer.Start(); // spaeter nochmal versuchen } - else if (pShell) // ausfuehren + else if (pShell) // ausfuehren { TrackFormulas(); pShell->Broadcast( SfxSimpleHint( FID_DATACHANGED ) ); ResetChanged( ScRange(0,0,0,MAXCOL,MAXROW,MAXTAB) ); - // modified... + // modified... if (!pShell->IsModified()) { @@ -365,7 +365,7 @@ IMPL_LINK( ScDocument, TrackTimeHdl, Timer*, EMPTYARG ) void ScDocument::StartTrackTimer() { - if (!aTrackTimer.IsActive()) // nicht ewig aufschieben + if (!aTrackTimer.IsActive()) // nicht ewig aufschieben aTrackTimer.Start(); } @@ -377,7 +377,7 @@ ScDocument::~ScDocument() // first of all disable all refresh timers by deleting the control if ( pRefreshTimerControl ) - { // To be sure there isn't anything running do it with a protector, + { // To be sure there isn't anything running do it with a protector, // this ensures also that nothing needs the control anymore. ScRefreshTimerProtector aProt( GetRefreshTimerControlAddress() ); delete pRefreshTimerControl, pRefreshTimerControl = NULL; @@ -406,12 +406,12 @@ ScDocument::~ScDocument() DELETEZ( pLookupCacheMapImpl); // before pBASM because of listeners // BroadcastAreas vor allen Zellen zerstoeren um unnoetige // Einzel-EndListenings der Formelzellen zu vermeiden - delete pBASM; // BroadcastAreaSlotMachine + delete pBASM; // BroadcastAreaSlotMachine pBASM = NULL; if (pUnoBroadcaster) { - delete pUnoBroadcaster; // broadcasted nochmal SFX_HINT_DYING + delete pUnoBroadcaster; // broadcasted nochmal SFX_HINT_DYING pUnoBroadcaster = NULL; } @@ -442,12 +442,12 @@ ScDocument::~ScDocument() delete pConsolidateDlgData; delete pLinkManager; delete pClipData; - delete pDetOpList; // loescht auch die Eintraege + delete pDetOpList; // loescht auch die Eintraege delete pChangeTrack; delete pEditEngine; delete pNoteEngine; SfxItemPool::Free(pNoteItemPool); - delete pChangeViewSettings; // und weg damit + delete pChangeViewSettings; // und weg damit delete pVirtualDevice_100th_mm; delete pDPCollection; @@ -486,8 +486,8 @@ void ScDocument::InitClipPtrs( ScDocument* pSourceDoc ) xPoolHelper = pSourceDoc->xPoolHelper; - // bedingte Formate / Gueltigkeiten - //! Vorlagen kopieren? + // bedingte Formate / Gueltigkeiten + //! Vorlagen kopieren? const ScConditionalFormatList* pSourceCond = pSourceDoc->pCondFormList; if ( pSourceCond ) pCondFormList = new ScConditionalFormatList(this, *pSourceCond); @@ -613,7 +613,7 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, { if ( bForceTab && !pTab[nTab] ) { - BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags + BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags pTab[nTab] = new ScTable(this, nTab, String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")), @@ -729,15 +729,15 @@ BOOL ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos ) if (nTabCount > 1) { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SetNoListening( TRUE ); ScProgress* pProgress = new ScProgress( GetDocumentShell(), ScGlobal::GetRscString(STR_UNDO_MOVE_TAB), GetCodeCount() ); if (nNewPos == SC_TAB_APPEND) nNewPos = nTabCount-1; - // Referenz-Updaterei - //! mit UpdateReference zusammenfassen! + // Referenz-Updaterei + //! mit UpdateReference zusammenfassen! SCsTAB nDz = ((SCsTAB)nNewPos) - (SCsTAB)nOldPos; ScRange aSourceRange( 0,0,nOldPos, MAXCOL,MAXROW,nOldPos ); @@ -771,7 +771,7 @@ BOOL ScDocument::MoveTab( SCTAB nOldPos, SCTAB nNewPos ) for (i = 0; i <= MAXTAB; i++) if (pTab[i]) pTab[i]->UpdateMoveTab( nOldPos, nNewPos, i, *pProgress ); - delete pProgress; // freimachen fuer evtl. andere + delete pProgress; // freimachen fuer evtl. andere for (i = 0; i <= MAXTAB; i++) if (pTab[i]) pTab[i]->UpdateCompile(); @@ -800,8 +800,8 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM String aName; GetName(nOldPos, aName); - // vorneweg testen, ob der Prefix als gueltig erkannt wird - // wenn nicht, nur doppelte vermeiden + // vorneweg testen, ob der Prefix als gueltig erkannt wird + // wenn nicht, nur doppelte vermeiden BOOL bPrefix = ValidTabName( aName ); DBG_ASSERT(bPrefix, "ungueltiger Tabellenname"); SCTAB nDummy; @@ -815,7 +815,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM bValid = ( !GetTable( aName, nDummy ) && (nMaxTableNumber <= MAXTAB) ); BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden if (bValid) { if (nNewPos == nMaxTableNumber) @@ -863,7 +863,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM if (pTab[i] && i != nOldPos && i != nNewPos) pTab[i]->StartAllListeners(); - // update conditional formats after table is inserted + // update conditional formats after table is inserted if ( pCondFormList ) pCondFormList->UpdateReference( URM_INSDEL, aRange, 0,0,1 ); if ( pValidationList ) @@ -877,16 +877,16 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM } if (bValid) { - SetNoListening( TRUE ); // noch nicht bei CopyToTable/Insert + SetNoListening( TRUE ); // noch nicht bei CopyToTable/Insert pTab[nOldPos]->CopyToTable(0, 0, MAXCOL, MAXROW, IDF_ALL, (pOnlyMarked != NULL), pTab[nNewPos], pOnlyMarked ); pTab[nNewPos]->SetTabBgColor(pTab[nOldPos]->GetTabBgColor()); SCsTAB nDz; -/* if (nNewPos < nOldPos) +/* if (nNewPos < nOldPos) nDz = ((short)nNewPos) - (short)nOldPos + 1; else -*/ nDz = ((short)nNewPos) - (short)nOldPos; +*/ nDz = ((short)nNewPos) - (short)nOldPos; pTab[nNewPos]->UpdateReference(URM_COPY, 0, 0, nNewPos , MAXCOL, MAXROW, nNewPos, 0, 0, nDz, NULL); @@ -894,7 +894,7 @@ BOOL ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, const ScMarkData* pOnlyM pTab[nOldPos]->UpdateInsertTab(nNewPos); pTab[nOldPos]->UpdateCompile(); - pTab[nNewPos]->UpdateCompile( TRUE ); // #67996# maybe already compiled in Clone, but used names need recompilation + pTab[nNewPos]->UpdateCompile( TRUE ); // #67996# maybe already compiled in Clone, but used names need recompilation SetNoListening( FALSE ); pTab[nOldPos]->StartAllListeners(); pTab[nNewPos]->StartAllListeners(); @@ -918,18 +918,18 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDestPos, BOOL bInsertNew, BOOL bResultsOnly ) { - ULONG nRetVal = 1; // 0 => Fehler 1 = ok + ULONG nRetVal = 1; // 0 => Fehler 1 = ok // 2 => RefBox, 3 => NameBox // 4 => beides BOOL bValid = TRUE; - if (bInsertNew) // neu einfuegen + if (bInsertNew) // neu einfuegen { String aName; pSrcDoc->GetName(nSrcPos, aName); CreateValidTabName(aName); bValid = InsertTab(nDestPos, aName); } - else // bestehende Tabelle ersetzen + else // bestehende Tabelle ersetzen { if (VALIDTAB(nDestPos) && pTab[nDestPos]) { @@ -943,12 +943,12 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, { BOOL bOldAutoCalcSrc = FALSE; BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SetNoListening( TRUE ); if ( bResultsOnly ) { bOldAutoCalcSrc = pSrcDoc->GetAutoCalc(); - pSrcDoc->SetAutoCalc( TRUE ); // falls was berechnet werden muss + pSrcDoc->SetAutoCalc( TRUE ); // falls was berechnet werden muss } { @@ -978,7 +978,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, std::set<USHORT> aUsedNames; pSrcDoc->pTab[nSrcPos]->FindRangeNamesInUse( 0, 0, MAXCOL, MAXROW, aUsedNames ); - for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch !!! + for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch !!! { ScRangeData* pSrcData = (*pSrcDoc->pRangeName)[i]; USHORT nOldIndex = pSrcData->GetIndex(); @@ -1006,7 +1006,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, ScRangeData* pData = new ScRangeData( *pSrcData ); pData->SetDocument(this); if ( pRangeName->FindIndex( pData->GetIndex() ) ) - pData->SetIndex(0); // need new index, done in Insert + pData->SetIndex(0); // need new index, done in Insert if (!pRangeName->Insert(pData)) { DBG_ERROR("can't insert name"); // shouldn't happen @@ -1027,14 +1027,14 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, else { pSrcRangeNames[i] = NULL; - //aSrcRangeMap.SetPair( i, 0, 0 ); // not needed, defaulted + //aSrcRangeMap.SetPair( i, 0, 0 ); // not needed, defaulted } } if ( bRangeNameReplace ) { // first update all inserted named formulas if they contain other // range names and used indices changed - for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch + for (USHORT i = 0; i < nSrcRangeNames; i++) //! DB-Bereiche Pivot-Bereiche auch { if ( pSrcRangeNames[i] ) pSrcRangeNames[i]->ReplaceRangeNamesInUse( aSrcRangeMap ); @@ -1075,7 +1075,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, pSrcDoc->SetAutoCalc( bOldAutoCalcSrc ); SetAutoCalc( bOldAutoCalc ); - // Drawing kopieren + // Drawing kopieren if (bInsertNew) TransferDrawPage( pSrcDoc, nSrcPos, nDestPos ); @@ -1098,7 +1098,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, aLibName = pSrcShell->GetBasicManager()->GetName(); pStarBASIC = pSrcShell->GetBasicManager()->GetLib( aLibName ); } - + String sCodeName; String sSource; uno::Reference< script::XLibraryContainer > xLibContainer = pSrcShell->GetBasicContainer(); @@ -1116,7 +1116,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, rtl::OUString sRTLSource; xLib->getByName( sSrcCodeName ) >>= sRTLSource; sSource = sRTLSource; - } + } VBA_InsertModule( *this, nDestPos, sCodeName, sSource ); } } @@ -1124,7 +1124,7 @@ ULONG ScDocument::TransferTab( ScDocument* pSrcDoc, SCTAB nSrcPos, return nRetVal; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- void ScDocument::SetError( SCCOL nCol, SCROW nRow, SCTAB nTab, const USHORT nError) { @@ -1142,7 +1142,7 @@ void ScDocument::EraseNonUsedSharedNames(USHORT nLevel) { String aName; pRangeData->GetName(aName); - aName.Erase(0, 6); // !!! vgl. Table4, FillFormula !! + aName.Erase(0, 6); // !!! vgl. Table4, FillFormula !! USHORT nInd = (USHORT) aName.ToInt32(); if (nInd <= nLevel) { @@ -1161,7 +1161,7 @@ void ScDocument::EraseNonUsedSharedNames(USHORT nLevel) } } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- void ScDocument::SetConsolidateDlgData( const ScConsolidateParam* pData ) { @@ -1183,7 +1183,7 @@ void ScDocument::SetChangeViewSettings(const ScChangeViewSettings& rNew) *pChangeViewSettings=rNew; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- ScFieldEditEngine* ScDocument::CreateFieldEditEngine() { @@ -1221,7 +1221,7 @@ void ScDocument::DisposeFieldEditEngine(ScFieldEditEngine*& rpEditEngine) rpEditEngine = NULL; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- // static ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() @@ -1229,7 +1229,7 @@ ScRecursionHelper* ScDocument::CreateRecursionHelperInstance() return new ScRecursionHelper; } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- ScLookupCache & ScDocument::GetLookupCache( const ScRange & rRange ) { diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index cb022714fe93..e4de303a60c0 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.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,10 +68,10 @@ #include "dociter.hxx" #include "detdata.hxx" #include "detfunc.hxx" -#include "scmod.hxx" // SC_MOD -#include "inputopt.hxx" // GetExpandRefs +#include "scmod.hxx" // SC_MOD +#include "inputopt.hxx" // GetExpandRefs #include "chartlis.hxx" -#include "sc.hrc" // SID_LINK +#include "sc.hrc" // SID_LINK #include "hints.hxx" #include "dpobject.hxx" #include "drwlayer.hxx" @@ -127,8 +127,8 @@ void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, BOOL bRemove { if ( bRemoveAutoFilter ) { - // remove auto filter attribute if new db data don't contain auto filter flag - // start position is also compared, so bRemoveAutoFilter must not be set from ref-undo! + // remove auto filter attribute if new db data don't contain auto filter flag + // start position is also compared, so bRemoveAutoFilter must not be set from ref-undo! if ( pDBCollection ) { @@ -263,7 +263,7 @@ BOOL ScDocument::IsScenario( SCTAB nTab ) const { return ValidTab(nTab) && pTab[nTab] &&pTab[nTab]->IsScenario(); //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->IsScenario(); + // return pTab[nTab]->IsScenario(); //return FALSE; } @@ -321,7 +321,7 @@ BOOL ScDocument::IsLinked( SCTAB nTab ) const return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->IsLinked(); // euqivalent to //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->IsLinked(); + // return pTab[nTab]->IsLinked(); //return FALSE; } @@ -413,15 +413,15 @@ BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab, return FALSE; } rTab = 0; - String aFilterName; // wird vom Loader gefuellt - String aOptions; // Filter-Optionen + String aFilterName; // wird vom Loader gefuellt + String aOptions; // Filter-Optionen sal_uInt32 nLinkCnt = pExtDocOptions ? pExtDocOptions->GetDocSettings().mnLinkCnt : 0; ScDocumentLoader aLoader( aFileName, aFilterName, aOptions, nLinkCnt + 1 ); if ( aLoader.IsError() ) return FALSE; ScDocument* pSrcDoc = aLoader.GetDocument(); - // Tabelle kopieren + // Tabelle kopieren SCTAB nSrcTab; if ( pSrcDoc->GetTable( aTabName, nSrcTab ) ) { @@ -441,7 +441,7 @@ BOOL ScDocument::LinkExternalTab( SCTAB& rTab, const String& aDocTab, BOOL bWasThere = HasLink( aFileName, aFilterName, aOptions ); SetLink( rTab, SC_LINK_VALUE, aFileName, aFilterName, aOptions, aTabName, nRefreshDelay ); - if ( !bWasThere ) // Link pro Quelldokument nur einmal eintragen + if ( !bWasThere ) // Link pro Quelldokument nur einmal eintragen { ScTableLink* pLink = new ScTableLink( pShell, aFileName, aFilterName, aOptions, nRefreshDelay ); pLink->SetInCreate( TRUE ); @@ -581,8 +581,8 @@ BOOL ScDocument::SetOutlineTable( SCTAB nTab, const ScOutlineTable* pNewOutline { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->SetOutlineTable(pNewOutline); //if (VALIDTAB(nTab)) - // if (pTab[nTab]) - // return pTab[nTab]->SetOutlineTable(pNewOutline); + // if (pTab[nTab]) + // return pTab[nTab]->SetOutlineTable(pNewOutline); //return FALSE; } @@ -598,7 +598,7 @@ BOOL ScDocument::TestRemoveSubTotals( SCTAB nTab, const ScSubTotalParam& rParam { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->TestRemoveSubTotals( rParam ); //if (VALIDTAB(nTab) && pTab[nTab] ) - // return pTab[nTab]->TestRemoveSubTotals( rParam ); + // return pTab[nTab]->TestRemoveSubTotals( rParam ); //return FALSE; } @@ -613,8 +613,8 @@ BOOL ScDocument::DoSubTotals( SCTAB nTab, ScSubTotalParam& rParam ) { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->DoSubTotals( rParam ); //if (VALIDTAB(nTab)) - // if (pTab[nTab]) - // return pTab[nTab]->DoSubTotals( rParam ); + // if (pTab[nTab]) + // return pTab[nTab]->DoSubTotals( rParam ); //return FALSE; } @@ -630,11 +630,11 @@ BOOL ScDocument::HasSubTotalCells( const ScRange& rRange ) pCell = aIter.GetNext(); } - return FALSE; // none found + return FALSE; // none found } -// kopiert aus diesem Dokument die Zellen von Positionen, an denen in pPosDoc -// auch Zellen stehen, nach pDestDoc +// kopiert aus diesem Dokument die Zellen von Positionen, an denen in pPosDoc +// auch Zellen stehen, nach pDestDoc void ScDocument::CopyUpdated( ScDocument* pPosDoc, ScDocument* pDestDoc ) { @@ -648,18 +648,18 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario { if (ValidTab(nSrcTab) && ValidTab(nDestTab) && pTab[nSrcTab] && pTab[nDestTab]) { - // Flags fuer aktive Szenarios richtig setzen - // und aktuelle Werte in bisher aktive Szenarios zurueckschreiben + // Flags fuer aktive Szenarios richtig setzen + // und aktuelle Werte in bisher aktive Szenarios zurueckschreiben ScRangeList aRanges = *pTab[nSrcTab]->GetScenarioRanges(); const ULONG nRangeCount = aRanges.Count(); - // nDestTab ist die Zieltabelle + // nDestTab ist die Zieltabelle for ( SCTAB nTab = nDestTab+1; nTab<=MAXTAB && pTab[nTab] && pTab[nTab]->IsScenario(); nTab++ ) { - if ( pTab[nTab]->IsActiveScenario() ) // auch wenn's dasselbe Szenario ist + if ( pTab[nTab]->IsActiveScenario() ) // auch wenn's dasselbe Szenario ist { BOOL bTouched = FALSE; for ( ULONG nR=0; nR<nRangeCount && !bTouched; nR++) @@ -677,11 +677,11 @@ void ScDocument::CopyScenario( SCTAB nSrcTab, SCTAB nDestTab, BOOL bNewScenario } } - pTab[nSrcTab]->SetActiveScenario(TRUE); // da kommt's her... - if (!bNewScenario) // Daten aus dem ausgewaehlten Szenario kopieren + pTab[nSrcTab]->SetActiveScenario(TRUE); // da kommt's her... + if (!bNewScenario) // Daten aus dem ausgewaehlten Szenario kopieren { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden pTab[nSrcTab]->CopyScenarioTo( pTab[nDestTab] ); SetDirty(); SetAutoCalc( bOldAutoCalc ); @@ -705,7 +705,7 @@ BOOL ScDocument::HasScenarioRange( SCTAB nTab, const ScRange& rRange ) const { return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->HasScenarioRange( rRange ); //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->HasScenarioRange( rRange ); + // return pTab[nTab]->HasScenarioRange( rRange ); //return FALSE; } @@ -722,7 +722,7 @@ BOOL ScDocument::IsActiveScenario( SCTAB nTab ) const { return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->IsActiveScenario( ); //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->IsActiveScenario(); + // return pTab[nTab]->IsActiveScenario(); //return FALSE; } @@ -758,29 +758,29 @@ void ScDocument::RemoveUnoObject( SfxListener& rObject ) if ( bInUnoBroadcast ) { - // #107294# Broadcasts from ScDocument::BroadcastUno are the only way that - // uno object methods are called without holding a reference. + // #107294# Broadcasts from ScDocument::BroadcastUno are the only way that + // uno object methods are called without holding a reference. // - // If RemoveUnoObject is called from an object dtor in the finalizer thread - // while the main thread is calling BroadcastUno, the dtor thread must wait - // (or the object's Notify might try to access a deleted object). - // The SolarMutex can't be locked here because if a component is called from - // a VCL event, the main thread has the SolarMutex locked all the time. + // If RemoveUnoObject is called from an object dtor in the finalizer thread + // while the main thread is calling BroadcastUno, the dtor thread must wait + // (or the object's Notify might try to access a deleted object). + // The SolarMutex can't be locked here because if a component is called from + // a VCL event, the main thread has the SolarMutex locked all the time. // - // This check is done after calling EndListening, so a later BroadcastUno call - // won't touch this object. + // This check is done after calling EndListening, so a later BroadcastUno call + // won't touch this object. osl::SolarMutex& rSolarMutex = Application::GetSolarMutex(); if ( rSolarMutex.tryToAcquire() ) { - // BroadcastUno is always called with the SolarMutex locked, so if it - // can be acquired, this is within the same thread (should not happen) + // BroadcastUno is always called with the SolarMutex locked, so if it + // can be acquired, this is within the same thread (should not happen) DBG_ERRORFILE( "RemoveUnoObject called from BroadcastUno" ); rSolarMutex.release(); } else { - // let the thread that called BroadcastUno continue + // let the thread that called BroadcastUno continue while ( bInUnoBroadcast ) { osl::Thread::yield(); @@ -961,9 +961,9 @@ void ScDocument::UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDo aSource.aEnd.SetTab( nClipTab ); aDest.SetTab( nDestTab ); - // wie UpdateReference + // wie UpdateReference - pRangeName->UpdateTranspose( aSource, aDest ); // vor den Zellen! + pRangeName->UpdateTranspose( aSource, aDest ); // vor den Zellen! for (SCTAB i=0; i<=MAXTAB; i++) if (pTab[i]) pTab[i]->UpdateTranspose( aSource, aDest, pUndoDoc ); @@ -974,9 +974,9 @@ void ScDocument::UpdateTranspose( const ScAddress& rDestPos, ScDocument* pClipDo void ScDocument::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) { - //! pDBCollection - //! pPivotCollection - //! UpdateChartRef + //! pDBCollection + //! pPivotCollection + //! UpdateChartRef pRangeName->UpdateGrow( rArea, nGrowX, nGrowY ); @@ -1124,7 +1124,7 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc) { - //! getrennte Markierungen pro Tabelle verwalten !!!!!!!!!!!!! + //! getrennte Markierungen pro Tabelle verwalten !!!!!!!!!!!!! rMark.MarkToMulti(); @@ -1150,7 +1150,7 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem, } } - // Markierung wird innen schon komplett gesetzt + // Markierung wird innen schon komplett gesetzt } else { @@ -1203,7 +1203,7 @@ BOOL ScDocument::SearchAndReplace(const SvxSearchItem& rSearchItem, return bFound; } -// Outline anpassen +// Outline anpassen BOOL ScDocument::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, SCTAB nTab, BOOL bShow ) { @@ -1273,8 +1273,8 @@ BOOL ScDocument::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n BOOL ScDocument::HasAutoFilter( SCCOL nCurCol, SCROW nCurRow, SCTAB nCurTab ) { - ScDBData* pDBData = GetDBAtCursor( nCurCol, nCurRow, nCurTab ); - BOOL bHasAutoFilter = ( pDBData != NULL ); + ScDBData* pDBData = GetDBAtCursor( nCurCol, nCurRow, nCurTab ); + BOOL bHasAutoFilter = ( pDBData != NULL ); if ( pDBData ) { @@ -1310,8 +1310,8 @@ BOOL ScDocument::HasColHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //if (VALIDTAB(nTab)) - // if (pTab[nTab]) - // return pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow ); + // if (pTab[nTab]) + // return pTab[nTab]->HasColHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //return FALSE; } @@ -1321,8 +1321,8 @@ BOOL ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, { return VALIDTAB(nTab) && pTab[nTab] && pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //if (VALIDTAB(nTab)) - // if (pTab[nTab]) - // return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); + // if (pTab[nTab]) + // return pTab[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); //return FALSE; } @@ -1340,7 +1340,7 @@ void ScDocument::UpdateDynamicEndRow(ScDBData& rDBData) const } // -// GetFilterEntries - Eintraege fuer AutoFilter-Listbox +// GetFilterEntries - Eintraege fuer AutoFilter-Listbox // BOOL ScDocument::GetFilterEntries( @@ -1348,7 +1348,7 @@ BOOL ScDocument::GetFilterEntries( { if ( ValidTab(nTab) && pTab[nTab] && pDBCollection ) { - ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE); //!?? + ScDBData* pDBData = pDBCollection->GetDBAtCursor(nCol, nRow, nTab, FALSE); //!?? if (pDBData) { UpdateDynamicEndRow(*pDBData); @@ -1398,7 +1398,7 @@ BOOL ScDocument::GetFilterEntries( } // -// GetFilterEntriesArea - Eintraege fuer Filter-Dialog +// GetFilterEntriesArea - Eintraege fuer Filter-Dialog // BOOL ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, @@ -1414,7 +1414,7 @@ BOOL ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRo } // -// GetDataEntries - Eintraege fuer Auswahlliste-Listbox (keine Zahlen / Formeln) +// GetDataEntries - Eintraege fuer Auswahlliste-Listbox (keine Zahlen / Formeln) // BOOL ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, @@ -1436,26 +1436,26 @@ BOOL ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, return ValidTab(nTab) && pTab[nTab] && pTab[nTab]->GetDataEntries( nCol, nRow, rStrings, bLimit ); //if (ValidTab(nTab) && pTab[nTab]) - // return pTab[nTab]->GetDataEntries( nCol, nRow, rStrings, bLimit ); + // return pTab[nTab]->GetDataEntries( nCol, nRow, rStrings, bLimit ); //return FALSE; } // -// GetFormulaEntries - Eintraege fuer Formel-AutoEingabe +// GetFormulaEntries - Eintraege fuer Formel-AutoEingabe // -// Funktionen werden als 1 schon vom InputHandler eingefuegt -#define SC_STRTYPE_NAMES 2 -#define SC_STRTYPE_DBNAMES 3 -#define SC_STRTYPE_HEADERS 4 +// Funktionen werden als 1 schon vom InputHandler eingefuegt +#define SC_STRTYPE_NAMES 2 +#define SC_STRTYPE_DBNAMES 3 +#define SC_STRTYPE_HEADERS 4 BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings ) { USHORT i; // - // Bereichsnamen + // Bereichsnamen // if ( pRangeName ) @@ -1474,7 +1474,7 @@ BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings ) } // - // Datenbank-Bereiche + // Datenbank-Bereiche // if ( pDBCollection ) @@ -1493,7 +1493,7 @@ BOOL ScDocument::GetFormulaEntries( TypedScStrCollection& rStrings ) } // - // Inhalte von Beschriftungsbereichen + // Inhalte von Beschriftungsbereichen // ScRangePairList* pLists[2]; @@ -1532,7 +1532,7 @@ void ScDocument::GetEmbedded( ScRange& rRange ) const rRange = aEmbedRange; } -Rectangle ScDocument::GetEmbeddedRect() const // 1/100 mm +Rectangle ScDocument::GetEmbeddedRect() const // 1/100 mm { Rectangle aRect; ScTable* pTable = pTab[aEmbedRange.aStart.Tab()]; @@ -1574,7 +1574,7 @@ void ScDocument::ResetEmbedded() } -/** Similar to ScViewData::AddPixelsWhile(), but add height twips and only +/** Similar to ScViewData::AddPixelsWhile(), but add height twips and only while result is less than nStopTwips. @return TRUE if advanced at least one row. */ @@ -1632,7 +1632,7 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect ) Rectangle aPosRect = rMMRect; if ( IsNegativePage( nTab ) ) - ScDrawLayer::MirrorRectRTL( aPosRect ); // always with positive (LTR) values + ScDrawLayer::MirrorRectRTL( aPosRect ); // always with positive (LTR) values long nSize; long nTwips; @@ -1691,13 +1691,13 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect ) return ScRange( nX1,nY1,nTab, nX2,nY2,nTab ); } -void ScDocument::SetEmbedded( const Rectangle& rRect ) // aus VisArea (1/100 mm) +void ScDocument::SetEmbedded( const Rectangle& rRect ) // aus VisArea (1/100 mm) { bIsEmbedded = TRUE; aEmbedRange = GetRange( nVisibleTab, rRect ); } -// VisArea auf Zellgrenzen anpassen +// VisArea auf Zellgrenzen anpassen void lcl_SnapHor( ScTable* pTable, long& rVal, SCCOL& rStartCol ) { @@ -1731,7 +1731,7 @@ void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow ) SCROW nLastRow; if (pTable->RowHidden(i, NULL, &nLastRow)) { - i = nLastRow; + i = nLastRow; continue; } @@ -1744,7 +1744,7 @@ void lcl_SnapVer( ScTable* pTable, long& rVal, SCROW& rStartRow ) } else { - bFound = true; + bFound = true; break; } } @@ -1770,12 +1770,12 @@ void ScDocument::SnapVisArea( Rectangle& rRect ) const SCCOL nCol = 0; lcl_SnapHor( pTable, rRect.Left(), nCol ); - ++nCol; // mindestens eine Spalte + ++nCol; // mindestens eine Spalte lcl_SnapHor( pTable, rRect.Right(), nCol ); SCROW nRow = 0; lcl_SnapVer( pTable, rRect.Top(), nRow ); - ++nRow; // mindestens eine Zeile + ++nRow; // mindestens eine Zeile lcl_SnapVer( pTable, rRect.Bottom(), nRow ); if ( bNegativePage ) @@ -1912,7 +1912,7 @@ void ScDocument::SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageTy pPool->SetPoolDefaultItem( SvxLanguageItem( eCtlLanguage, ATTR_CTL_FONT_LANGUAGE ) ); } - UpdateDrawLanguages(); // set edit engine defaults in drawing layer pool + UpdateDrawLanguages(); // set edit engine defaults in drawing layer pool } void ScDocument::SetDrawDefaults() @@ -1944,10 +1944,10 @@ Rectangle ScDocument::GetMMRect( SCCOL nStartCol, SCROW nStartRow, aRect.Right() += GetColWidth(i,nTab); aRect.Bottom() += GetRowHeight( nStartRow, nEndRow, nTab); - aRect.Left() = (long)(aRect.Left() * HMM_PER_TWIPS); - aRect.Right() = (long)(aRect.Right() * HMM_PER_TWIPS); - aRect.Top() = (long)(aRect.Top() * HMM_PER_TWIPS); - aRect.Bottom() = (long)(aRect.Bottom() * HMM_PER_TWIPS); + aRect.Left() = (long)(aRect.Left() * HMM_PER_TWIPS); + aRect.Right() = (long)(aRect.Right() * HMM_PER_TWIPS); + aRect.Top() = (long)(aRect.Top() * HMM_PER_TWIPS); + aRect.Bottom() = (long)(aRect.Bottom() * HMM_PER_TWIPS); if ( IsNegativePage( nTab ) ) ScDrawLayer::MirrorRectRTL( aRect ); @@ -2046,7 +2046,7 @@ void ScDocument::DecSizeRecalcLevel( SCTAB nTab, bool bUpdateNoteCaptionPos ) // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance -ScDPTableDataCache* ScDocument::GetDPObjectCache( long nID ) +ScDPTableDataCache* ScDocument::GetDPObjectCache( long nID ) { for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ ) { // @@ -2056,7 +2056,7 @@ ScDPTableDataCache* ScDocument::GetDPObjectCache( long nID ) return NULL; } -ScDPTableDataCache* ScDocument::GetUsedDPObjectCache ( ScRange rRange ) +ScDPTableDataCache* ScDocument::GetUsedDPObjectCache ( ScRange rRange ) { ScDPTableDataCache* pCache = NULL; USHORT nCount = GetDPCollection()->GetCount(); @@ -2076,7 +2076,7 @@ ScDPTableDataCache* ScDocument::GetUsedDPObjectCache ( ScRange rRange ) } long ScDocument::AddDPObjectCache( ScDPTableDataCache* pData ) -{ +{ if ( pData->GetId() < 0 ) { //create a id for it pData->SetId( GetNewDPObjectCacheId() ); @@ -2111,10 +2111,10 @@ long ScDocument::GetNewDPObjectCacheId() void ScDocument::RemoveDPObjectCache( long nID ) { for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ ) - { + { if ( nID == (*iter)->GetId() ) { - ScDPTableDataCache* pCache = *iter; + ScDPTableDataCache* pCache = *iter; m_listDPObjectsCaches.erase( iter ); delete pCache; break; @@ -2124,9 +2124,9 @@ void ScDocument::RemoveDPObjectCache( long nID ) } void ScDocument::RemoveUnusedDPObjectCaches() -{ +{ for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ ) - { + { long nID = (*iter)->GetId(); USHORT nCount = GetDPCollection()->GetCount(); USHORT i ; @@ -2137,7 +2137,7 @@ void ScDocument::RemoveUnusedDPObjectCaches() } if ( i == nCount ) { - ScDPTableDataCache* pCache = *iter; + ScDPTableDataCache* pCache = *iter; m_listDPObjectsCaches.erase( iter ); delete pCache; continue; @@ -2148,10 +2148,10 @@ void ScDocument::RemoveUnusedDPObjectCaches() void ScDocument::GetUsedDPObjectCache( std::list<ScDPTableDataCache*>& usedlist ) { for ( std::list<ScDPTableDataCache*>::iterator iter = m_listDPObjectsCaches.begin(); iter!=m_listDPObjectsCaches.end(); iter++ ) - { + { long nID = (*iter)->GetId(); USHORT nCount = GetDPCollection()->GetCount(); - USHORT i=0; + USHORT i=0; for ( i=0; i<nCount; i++) if ( nID == (*pDPCollection)[i]->GetCacheId() ) break; diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index 47b8921e5fa6..d6e16a9748b2 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.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 @@ -113,7 +113,7 @@ BOOL ScDocument::Solver(SCCOL nFCol, SCROW nFRow, SCTAB nFTab, pCell->Interpret(); USHORT nErrCode = pCell->GetErrCode(); nX = pCell->GetValueAlways(); - if (nErrCode == 0) // kein fehler beim Rechnen + if (nErrCode == 0) // kein fehler beim Rechnen bRet = TRUE; delete pCell; } @@ -136,7 +136,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, SCROW k; i = 0; BOOL bStop = FALSE; - while (i <= MAXTAB && !bStop) // erste markierte Tabelle finden + while (i <= MAXTAB && !bStop) // erste markierte Tabelle finden { if (pTab[i] && rMark.GetTableSelect(i)) bStop = TRUE; @@ -197,7 +197,7 @@ void ScDocument::InsertMatrixFormula(SCCOL nCol1, SCROW nRow1, { for (k = nRow1; k <= nRow2; k++) { - if (j != nCol1 || k != nRow1) // nicht in der ersten Zelle + if (j != nCol1 || k != nRow1) // nicht in der ersten Zelle { // Array muss geklont werden, damit jede // Zelle ein eigenes Array erhaelt! @@ -223,7 +223,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera SCROW k; i = 0; BOOL bStop = FALSE; - while (i <= MAXTAB && !bStop) // erste markierte Tabelle finden + while (i <= MAXTAB && !bStop) // erste markierte Tabelle finden { if (pTab[i] && rMark.GetTableSelect(i)) bStop = TRUE; @@ -244,11 +244,11 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera aForString += ScCompiler::GetNativeSymbol( ocOpen); const String& sSep = ScCompiler::GetNativeSymbol( ocSep); - if (rParam.nMode == 0) // nur Spalte + if (rParam.nMode == 0) // nur Spalte { aRef.Set( rParam.aRefFormulaCell.GetAddress(), TRUE, FALSE, FALSE ); aForString += aRef.GetRefString(this, nTab1); - aForString += sSep; + aForString += sSep; aForString += rParam.aRefColCell.GetRefString(this, nTab1); aForString += sSep; aRef.Set( nCol1, nRow1, nTab1, FALSE, TRUE, TRUE ); @@ -257,7 +257,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera nCol2 = Min( nCol2, (SCCOL)(rParam.aRefFormulaEnd.Col() - rParam.aRefFormulaCell.Col() + nCol1 + 1)); } - else if (rParam.nMode == 1) // nur zeilenweise + else if (rParam.nMode == 1) // nur zeilenweise { aRef.Set( rParam.aRefFormulaCell.GetAddress(), FALSE, TRUE, FALSE ); aForString += aRef.GetRefString(this, nTab1); @@ -270,7 +270,7 @@ void ScDocument::InsertTableOp(const ScTabOpParam& rParam, // Mehrfachopera nRow2 = Min( nRow2, (SCROW)(rParam.aRefFormulaEnd.Row() - rParam.aRefFormulaCell.Row() + nRow1 + 1)); } - else // beides + else // beides { aForString += rParam.aRefFormulaCell.GetRefString(this, nTab1); aForString += sSep; @@ -313,20 +313,20 @@ bool ScDocument::MarkUsedExternalReferences( ScTokenArray & rArr ) switch (t->GetType()) { case svExternalSingleRef: - bAllMarked = pRefMgr->setCacheTableReferenced( + bAllMarked = pRefMgr->setCacheTableReferenced( t->GetIndex(), t->GetString(), 1); break; case svExternalDoubleRef: { const ScComplexRefData& rRef = t->GetDoubleRef(); size_t nSheets = rRef.Ref2.nTab - rRef.Ref1.nTab + 1; - bAllMarked = pRefMgr->setCacheTableReferenced( + bAllMarked = pRefMgr->setCacheTableReferenced( t->GetIndex(), t->GetString(), nSheets); } break; case svExternalName: - /* TODO: external names aren't supported yet, but would - * have to be marked as well, if so. Mechanism would be + /* TODO: external names aren't supported yet, but would + * have to be marked as well, if so. Mechanism would be * different. */ DBG_ERRORFILE("ScDocument::MarkUsedExternalReferences: implement the svExternalName case!"); break; @@ -386,7 +386,7 @@ void ScDocument::CompileDBFormula( BOOL bCreateFormulaString ) void ScDocument::CompileNameFormula( BOOL bCreateFormulaString ) { if ( pCondFormList ) - pCondFormList->CompileAll(); // nach ScNameDlg noetig + pCondFormList->CompileAll(); // nach ScNameDlg noetig for (SCTAB i=0; i<=MAXTAB; i++) { @@ -462,7 +462,7 @@ BOOL ScDocument::GetSelectionFunction( ScSubTotalFunc eFunc, pTab[nTab]->UpdateSelectionFunction( aData, nStartCol, nStartRow, nEndCol, nEndRow, rMark ); - //! rMark an UpdateSelectionFunction uebergeben !!!!! + //! rMark an UpdateSelectionFunction uebergeben !!!!! if (!aData.bError) switch (eFunc) @@ -511,10 +511,10 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat ) nPrecision = (short)GetFormatTable()->GetFormatPrecision( nFormat ); switch ( nType ) { - case NUMBERFORMAT_PERCENT: // 0,41% == 0,0041 + case NUMBERFORMAT_PERCENT: // 0,41% == 0,0041 nPrecision += 2; break; - case NUMBERFORMAT_SCIENTIFIC: // 1,23e-3 == 0,00123 + case NUMBERFORMAT_SCIENTIFIC: // 1,23e-3 == 0,00123 { if ( fVal > 0.0 ) nPrecision = sal::static_int_cast<short>( nPrecision - (short)floor( log10( fVal ) ) ); @@ -533,7 +533,7 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat ) } double fRound = ::rtl::math::round( fVal, nPrecision ); if ( ::rtl::math::approxEqual( fVal, fRound ) ) - return fVal; // durch Rundung hoechstens Fehler + return fVal; // durch Rundung hoechstens Fehler else return fRound; } @@ -542,13 +542,13 @@ double ScDocument::RoundValueAsShown( double fVal, ULONG nFormat ) } // -// bedingte Formate und Gueltigkeitsbereiche +// bedingte Formate und Gueltigkeitsbereiche // ULONG ScDocument::AddCondFormat( const ScConditionalFormat& rNew ) { if (rNew.IsEmpty()) - return 0; // leer ist immer 0 + return 0; // leer ist immer 0 if (!pCondFormList) pCondFormList = new ScConditionalFormatList; @@ -577,7 +577,7 @@ ULONG ScDocument::AddCondFormat( const ScConditionalFormat& rNew ) ULONG ScDocument::AddValidationEntry( const ScValidationData& rNew ) { if (rNew.IsEmpty()) - return 0; // leer ist immer 0 + return 0; // leer ist immer 0 if (!pValidationList) pValidationList = new ScValidationDataList; @@ -673,7 +673,7 @@ const ScConditionalFormat* ScDocument::GetCondFormat( return NULL; } -const ScValidationData* ScDocument::GetValidationEntry( ULONG nIndex ) const +const ScValidationData* ScDocument::GetValidationEntry( ULONG nIndex ) const { if ( pValidationList ) return pValidationList->GetData( nIndex ); @@ -695,7 +695,7 @@ void ScDocument::FindConditionalFormat( ULONG nKey, ScRangeList& rRanges, SCTAB void ScDocument::ConditionalChanged( ULONG nKey ) { - if ( nKey && pCondFormList && !bIsClip && !bIsUndo ) // nKey==0 -> noop + if ( nKey && pCondFormList && !bIsClip && !bIsUndo ) // nKey==0 -> noop { ScConditionalFormat* pForm = pCondFormList->GetFormat( nKey ); if (pForm) @@ -731,27 +731,27 @@ void ScDocument::AddDetectiveOperation( const ScDetOpData& rData ) void ScDocument::ClearDetectiveOperations() { - delete pDetOpList; // loescht auch die Eintraege + delete pDetOpList; // loescht auch die Eintraege pDetOpList = NULL; } void ScDocument::SetDetOpList(ScDetOpList* pNew) { - delete pDetOpList; // loescht auch die Eintraege + delete pDetOpList; // loescht auch die Eintraege pDetOpList = pNew; } //------------------------------------------------------------------------ // -// Vergleich von Dokumenten +// Vergleich von Dokumenten // //------------------------------------------------------------------------ -// Pfriemel-Faktoren -#define SC_DOCCOMP_MAXDIFF 256 -#define SC_DOCCOMP_MINGOOD 128 -#define SC_DOCCOMP_COLUMNS 10 -#define SC_DOCCOMP_ROWS 100 +// Pfriemel-Faktoren +#define SC_DOCCOMP_MAXDIFF 256 +#define SC_DOCCOMP_MINGOOD 128 +#define SC_DOCCOMP_COLUMNS 10 +#define SC_DOCCOMP_ROWS 100 USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, @@ -768,7 +768,7 @@ USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, else nOtherCol = nThisCol; - if (ValidCol(nOtherCol)) // nur Spalten vergleichen, die in beiden Dateien sind + if (ValidCol(nOtherCol)) // nur Spalten vergleichen, die in beiden Dateien sind { const ScBaseCell* pThisCell = GetCell( ScAddress( nThisCol, nThisRow, nThisTab ) ); const ScBaseCell* pOtherCell = rOtherDoc.GetCell( ScAddress( nOtherCol, nOtherRow, nOtherTab ) ); @@ -777,7 +777,7 @@ USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, if ( pThisCell && pOtherCell ) nDif += 3; else - nDif += 4; // Inhalt <-> leer zaehlt mehr + nDif += 4; // Inhalt <-> leer zaehlt mehr } if ( ( pThisCell && pThisCell->GetCellType()!=CELLTYPE_NOTE ) || @@ -787,7 +787,7 @@ USHORT ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, } if (nUsed > 0) - return static_cast<USHORT>((nDif*64)/nUsed); // max.256 (SC_DOCCOMP_MAXDIFF) + return static_cast<USHORT>((nDif*64)/nUsed); // max.256 (SC_DOCCOMP_MAXDIFF) DBG_ASSERT(!nDif,"Diff ohne Used"); return 0; @@ -797,7 +797,7 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, ScDocument& rOtherDoc, SCCOL nOtherCol, SCTAB nOtherTab, SCROW nMaxRow, SCCOLROW* pOtherRows ) { - //! optimieren mit Iterator oder so + //! optimieren mit Iterator oder so ULONG nDif = 0; ULONG nUsed = 0; @@ -809,7 +809,7 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, else nOtherRow = nThisRow; - if (ValidRow(nOtherRow)) // nur Zeilen vergleichen, die in beiden Dateien sind + if (ValidRow(nOtherRow)) // nur Zeilen vergleichen, die in beiden Dateien sind { const ScBaseCell* pThisCell = GetCell( ScAddress( nThisCol, nThisRow, nThisTab ) ); const ScBaseCell* pOtherCell = rOtherDoc.GetCell( ScAddress( nOtherCol, nOtherRow, nOtherTab ) ); @@ -818,7 +818,7 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, if ( pThisCell && pOtherCell ) nDif += 3; else - nDif += 4; // Inhalt <-> leer zaehlt mehr + nDif += 4; // Inhalt <-> leer zaehlt mehr } if ( ( pThisCell && pThisCell->GetCellType()!=CELLTYPE_NOTE ) || @@ -828,7 +828,7 @@ USHORT ScDocument::ColDifferences( SCCOL nThisCol, SCTAB nThisTab, } if (nUsed > 0) - return static_cast<USHORT>((nDif*64)/nUsed); // max.256 + return static_cast<USHORT>((nDif*64)/nUsed); // max.256 DBG_ASSERT(!nDif,"Diff ohne Used"); return 0; @@ -838,28 +838,28 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW BOOL bColumns, ScDocument& rOtherDoc, SCTAB nThisTab, SCTAB nOtherTab, SCCOLROW nEndCol, SCCOLROW* pTranslate, ScProgress* pProgress, ULONG nProAdd ) { - // bColumns=TRUE: Zeilen sind Spalten und umgekehrt + // bColumns=TRUE: Zeilen sind Spalten und umgekehrt - SCCOLROW nMaxCont; // wieviel weiter - SCCOLROW nMinGood; // was ist ein Treffer (incl.) + SCCOLROW nMaxCont; // wieviel weiter + SCCOLROW nMinGood; // was ist ein Treffer (incl.) if ( bColumns ) { - nMaxCont = SC_DOCCOMP_COLUMNS; // 10 Spalten + nMaxCont = SC_DOCCOMP_COLUMNS; // 10 Spalten nMinGood = SC_DOCCOMP_MINGOOD; - //! Extra Durchgang mit nMinGood = 0 ???? + //! Extra Durchgang mit nMinGood = 0 ???? } else { - nMaxCont = SC_DOCCOMP_ROWS; // 100 Zeilen + nMaxCont = SC_DOCCOMP_ROWS; // 100 Zeilen nMinGood = SC_DOCCOMP_MINGOOD; } - BOOL bUseTotal = bColumns && !pTranslate; // nur beim ersten Durchgang + BOOL bUseTotal = bColumns && !pTranslate; // nur beim ersten Durchgang SCCOLROW nOtherRow = 0; USHORT nComp; SCCOLROW nThisRow; - BOOL bTotal = FALSE; // ueber verschiedene nThisRow beibehalten + BOOL bTotal = FALSE; // ueber verschiedene nThisRow beibehalten SCCOLROW nUnknown = 0; for (nThisRow = 0; nThisRow <= nThisEndRow; nThisRow++) { @@ -867,7 +867,7 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW BOOL bFound = FALSE; USHORT nBest = SC_DOCCOMP_MAXDIFF; SCCOLROW nMax = Min( nOtherEndRow, static_cast<SCCOLROW>(( nTempOther + nMaxCont + nUnknown )) ); - for (SCCOLROW i=nTempOther; i<=nMax && nBest>0; i++) // bei 0 abbrechen + for (SCCOLROW i=nTempOther; i<=nMax && nBest>0; i++) // bei 0 abbrechen { if (bColumns) nComp = ColDifferences( static_cast<SCCOL>(nThisRow), nThisTab, rOtherDoc, static_cast<SCCOL>(i), nOtherTab, nEndCol, pTranslate ); @@ -882,7 +882,7 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW if ( nComp < SC_DOCCOMP_MAXDIFF || bFound ) bTotal = FALSE; else if ( i == nTempOther && bUseTotal ) - bTotal = TRUE; // nur ganz oben + bTotal = TRUE; // nur ganz oben } if ( bFound ) { @@ -900,7 +900,7 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW pProgress->SetStateOnPercent(nProAdd+static_cast<ULONG>(nThisRow)); } - // Bloecke ohne Uebereinstimmung ausfuellen + // Bloecke ohne Uebereinstimmung ausfuellen SCROW nFillStart = 0; SCROW nFillPos = 0; @@ -912,7 +912,7 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW { if ( bInFill ) { - if ( nThisOther > nFillStart ) // ist was zu verteilen da? + if ( nThisOther > nFillStart ) // ist was zu verteilen da? { SCROW nDiff1 = nThisOther - nFillStart; SCROW nDiff2 = nThisRow - nFillPos; @@ -941,13 +941,13 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) SCTAB* pOtherTabs = new SCTAB[nThisCount]; SCTAB nThisTab; - // Tabellen mit gleichen Namen vergleichen + // Tabellen mit gleichen Namen vergleichen String aThisName; String aOtherName; for (nThisTab=0; nThisTab<nThisCount; nThisTab++) { SCTAB nOtherTab = SCTAB_MAX; - if (!IsScenario(nThisTab)) // Szenarien weglassen + if (!IsScenario(nThisTab)) // Szenarien weglassen { GetName( nThisTab, aThisName ); for (SCTAB nTemp=0; nTemp<nOtherCount && nOtherTab>MAXTAB; nTemp++) @@ -960,7 +960,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) } pOtherTabs[nThisTab] = nOtherTab; } - // auffuellen, damit einzeln umbenannte Tabellen nicht wegfallen + // auffuellen, damit einzeln umbenannte Tabellen nicht wegfallen SCTAB nFillStart = 0; SCTAB nFillPos = 0; BOOL bInFill = FALSE; @@ -971,7 +971,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) { if ( bInFill ) { - if ( nThisOther > nFillStart ) // ist was zu verteilen da? + if ( nThisOther > nFillStart ) // ist was zu verteilen da? { SCTAB nDiff1 = nThisOther - nFillStart; SCTAB nDiff2 = nThisTab - nFillPos; @@ -991,7 +991,7 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) } // - // Tabellen in der gefundenen Reihenfolge vergleichen + // Tabellen in der gefundenen Reihenfolge vergleichen // for (nThisTab=0; nThisTab<nThisCount; nThisTab++) @@ -1009,9 +1009,9 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) SCROW nEndRow = Max(nThisEndRow, nOtherEndRow); SCCOL nThisCol; SCROW nThisRow; - ULONG n1,n2; // fuer AppendDeleteRange + ULONG n1,n2; // fuer AppendDeleteRange - //! ein Progress ueber alle Tabellen ??? + //! ein Progress ueber alle Tabellen ??? String aTabName; GetName( nThisTab, aTabName ); String aTemplate = ScGlobal::GetRscString(STR_PROGRESS_COMPARING); @@ -1019,20 +1019,20 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) aProText += aTabName; aProText += aTemplate.GetToken( 1, '#' ); ScProgress aProgress( GetDocumentShell(), - aProText, 3*nThisEndRow ); // 2x FindOrder, 1x hier - long nProgressStart = 2*nThisEndRow; // start fuer hier + aProText, 3*nThisEndRow ); // 2x FindOrder, 1x hier + long nProgressStart = 2*nThisEndRow; // start fuer hier SCCOLROW* pTempRows = new SCCOLROW[nThisEndRow+1]; SCCOLROW* pOtherRows = new SCCOLROW[nThisEndRow+1]; SCCOLROW* pOtherCols = new SCCOLROW[nThisEndCol+1]; - // eingefuegte/geloeschte Spalten/Zeilen finden: - // Zwei Versuche: - // 1) Original Zeilen vergleichen (pTempRows) - // 2) Original Spalten vergleichen (pOtherCols) - // mit dieser Spaltenreihenfolge Zeilen vergleichen (pOtherRows) + // eingefuegte/geloeschte Spalten/Zeilen finden: + // Zwei Versuche: + // 1) Original Zeilen vergleichen (pTempRows) + // 2) Original Spalten vergleichen (pOtherCols) + // mit dieser Spaltenreihenfolge Zeilen vergleichen (pOtherRows) - //! Spalten vergleichen zweimal mit unterschiedlichem nMinGood ??? + //! Spalten vergleichen zweimal mit unterschiedlichem nMinGood ??? // 1 FindOrder( pTempRows, nThisEndRow, nOtherEndRow, FALSE, @@ -1044,46 +1044,46 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) rOtherDoc, nThisTab, nOtherTab, nThisEndCol, pOtherCols, &aProgress, nThisEndRow ); - ULONG nMatch1 = 0; // pTempRows, keine Spalten + ULONG nMatch1 = 0; // pTempRows, keine Spalten for (nThisRow = 0; nThisRow<=nThisEndRow; nThisRow++) if (ValidRow(pTempRows[nThisRow])) nMatch1 += SC_DOCCOMP_MAXDIFF - RowDifferences( nThisRow, nThisTab, rOtherDoc, pTempRows[nThisRow], nOtherTab, nEndCol, NULL ); - ULONG nMatch2 = 0; // pOtherRows, pOtherCols + ULONG nMatch2 = 0; // pOtherRows, pOtherCols for (nThisRow = 0; nThisRow<=nThisEndRow; nThisRow++) if (ValidRow(pOtherRows[nThisRow])) nMatch2 += SC_DOCCOMP_MAXDIFF - RowDifferences( nThisRow, nThisTab, rOtherDoc, pOtherRows[nThisRow], nOtherTab, nThisEndCol, pOtherCols ); - if ( nMatch1 >= nMatch2 ) // ohne Spalten ? + if ( nMatch1 >= nMatch2 ) // ohne Spalten ? { - // Spalten zuruecksetzen + // Spalten zuruecksetzen for (nThisCol = 0; nThisCol<=nThisEndCol; nThisCol++) pOtherCols[nThisCol] = nThisCol; - // Zeilenarrays vertauschen (geloescht werden sowieso beide) + // Zeilenarrays vertauschen (geloescht werden sowieso beide) SCCOLROW* pSwap = pTempRows; pTempRows = pOtherRows; pOtherRows = pSwap; } else { - // bleibt bei pOtherCols, pOtherRows + // bleibt bei pOtherCols, pOtherRows } - // Change-Actions erzeugen - // 1) Spalten von rechts - // 2) Zeilen von unten - // 3) einzelne Zellen in normaler Reihenfolge + // Change-Actions erzeugen + // 1) Spalten von rechts + // 2) Zeilen von unten + // 3) einzelne Zellen in normaler Reihenfolge - // Actions fuer eingefuegte/geloeschte Spalten + // Actions fuer eingefuegte/geloeschte Spalten SCCOL nLastOtherCol = static_cast<SCCOL>(nOtherEndCol + 1); - // nThisEndCol ... 0 + // nThisEndCol ... 0 for ( nThisCol = nThisEndCol+1; nThisCol > 0; ) { --nThisCol; @@ -1095,9 +1095,9 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) nLastOtherCol-1, MAXROW, nOtherTab ); pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 ); } - if ( nOtherCol > MAXCOL ) // eingefuegt + if ( nOtherCol > MAXCOL ) // eingefuegt { - // zusammenfassen + // zusammenfassen if ( nThisCol == nThisEndCol || ValidCol(static_cast<SCCOL>(pOtherCols[nThisCol+1])) ) { SCCOL nFirstNew = static_cast<SCCOL>(nThisCol); @@ -1112,17 +1112,17 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) else nLastOtherCol = nOtherCol; } - if ( nLastOtherCol > 0 ) // ganz oben geloescht + if ( nLastOtherCol > 0 ) // ganz oben geloescht { ScRange aDelRange( 0, 0, nOtherTab, nLastOtherCol-1, MAXROW, nOtherTab ); pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 ); } - // Actions fuer eingefuegte/geloeschte Zeilen + // Actions fuer eingefuegte/geloeschte Zeilen SCROW nLastOtherRow = nOtherEndRow + 1; - // nThisEndRow ... 0 + // nThisEndRow ... 0 for ( nThisRow = nThisEndRow+1; nThisRow > 0; ) { --nThisRow; @@ -1134,9 +1134,9 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) MAXCOL, nLastOtherRow-1, nOtherTab ); pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 ); } - if ( nOtherRow > MAXROW ) // eingefuegt + if ( nOtherRow > MAXROW ) // eingefuegt { - // zusammenfassen + // zusammenfassen if ( nThisRow == nThisEndRow || ValidRow(pOtherRows[nThisRow+1]) ) { SCROW nFirstNew = nThisRow; @@ -1151,14 +1151,14 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) else nLastOtherRow = nOtherRow; } - if ( nLastOtherRow > 0 ) // ganz oben geloescht + if ( nLastOtherRow > 0 ) // ganz oben geloescht { ScRange aDelRange( 0, 0, nOtherTab, MAXCOL, nLastOtherRow-1, nOtherTab ); pChangeTrack->AppendDeleteRange( aDelRange, &rOtherDoc, n1, n2 ); } - // Zeilen durchgehen um einzelne Zellen zu finden + // Zeilen durchgehen um einzelne Zellen zu finden for (nThisRow = 0; nThisRow <= nThisEndRow; nThisRow++) { @@ -1192,8 +1192,8 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) } } - //! Inhalt von eingefuegten / geloeschten Tabellen ??? - //! Aktionen fuer eingefuegte / geloeschte Tabellen ??? + //! Inhalt von eingefuegten / geloeschten Tabellen ??? + //! Aktionen fuer eingefuegte / geloeschte Tabellen ??? delete[] pOtherTabs; } diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index 2732a6e3251f..8e6bed07c9cd 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.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,10 +49,10 @@ #include <svx/svdoole2.hxx> #include <svx/svdpage.hxx> -//REMOVE #ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED -//REMOVE #define SO2_DECL_SVINPLACEOBJECT_DEFINED -//REMOVE SO2_DECL_REF(SvInPlaceObject) -//REMOVE #endif +//REMOVE #ifndef SO2_DECL_SVINPLACEOBJECT_DEFINED +//REMOVE #define SO2_DECL_SVINPLACEOBJECT_DEFINED +//REMOVE SO2_DECL_REF(SvInPlaceObject) +//REMOVE #endif #include "document.hxx" #include "drwlayer.hxx" @@ -137,7 +137,7 @@ void ScDocument::UpdateAllCharts() USHORT nDataCount = pChartCollection->GetCount(); if ( !nDataCount ) - return ; // nothing to do + return ; // nothing to do USHORT nPos; @@ -238,7 +238,7 @@ BOOL ScDocument::HasChartAtPoint( SCTAB nTab, const Point& rPos, String* pName ) if (pName) pName->Erase(); - return FALSE; // nix gefunden + return FALSE; // nix gefunden } void ScDocument::UpdateChartArea( const String& rChartName, @@ -442,7 +442,7 @@ void ScDocument::UpdateChartArea( const String& rChartName, // ((SdrOle2Obj*)pObject)->GetNewReplacement(); // pObject->ActionChanged(); - return; // nicht weitersuchen + return; // nicht weitersuchen } } pObject = aIter.Next(); @@ -560,8 +560,8 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode, if ( bChanged ) { { -// SetChartRangeList( pChartListener->GetString(), aNewRLR ); -// pChartListener->ChangeListening( aNewRLR, bDataChanged ); +// SetChartRangeList( pChartListener->GetString(), aNewRLR ); +// pChartListener->ChangeListening( aNewRLR, bDataChanged ); // Force the chart to be loaded now, so it registers itself for UNO events. // UNO broadcasts are done after UpdateChartRef, so the chart will get this @@ -640,9 +640,9 @@ uno::Reference< embed::XEmbeddedObject > if (!pDrawLayer) return uno::Reference< embed::XEmbeddedObject >(); - // die Seiten hier vom Draw-Layer nehmen, - // weil sie evtl. nicht mit den Tabellen uebereinstimmen - // (z.B. Redo von Tabelle loeschen, Draw-Redo passiert vor DeleteTab). + // die Seiten hier vom Draw-Layer nehmen, + // weil sie evtl. nicht mit den Tabellen uebereinstimmen + // (z.B. Redo von Tabelle loeschen, Draw-Redo passiert vor DeleteTab). sal_uInt16 nCount = pDrawLayer->GetPageCount(); for (sal_uInt16 nTab=0; nTab<nCount; nTab++) @@ -755,10 +755,10 @@ void ScDocument::UpdateChartListenerCollection() if (!bIsChart) { - // put into list of other ole objects, so the object doesn't have to - // be swapped in the next time UpdateChartListenerCollection is called - //! remove names when objects are no longer there? - // (object names aren't used again before reloading the document) + // put into list of other ole objects, so the object doesn't have to + // be swapped in the next time UpdateChartListenerCollection is called + //! remove names when objects are no longer there? + // (object names aren't used again before reloading the document) if (!pOtherObjects) pOtherObjects = new ScStrCollection; diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index de0105cb63af..3cfc6a27e03c 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.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,11 +47,11 @@ using namespace com::sun::star; -#define SC_BREAKITER_SERVICE "com.sun.star.i18n.BreakIterator" +#define SC_BREAKITER_SERVICE "com.sun.star.i18n.BreakIterator" // -// this file is compiled with exceptions enabled -// put functions here that need exceptions! +// this file is compiled with exceptions enabled +// put functions here that need exceptions! // // ----------------------------------------------------------------------- @@ -85,7 +85,7 @@ BOOL ScDocument::HasStringWeakCharacters( const String& rString ) { sal_Int16 nType = xBreakIter->getScriptType( aText, nPos ); if ( nType == i18n::ScriptType::WEAK ) - return TRUE; // found + return TRUE; // found nPos = xBreakIter->endOfScript( aText, nPos, nType ); } @@ -93,7 +93,7 @@ BOOL ScDocument::HasStringWeakCharacters( const String& rString ) } } - return FALSE; // none found + return FALSE; // none found } BYTE ScDocument::GetStringScriptType( const String& rString ) @@ -136,11 +136,11 @@ BYTE ScDocument::GetStringScriptType( const String& rString ) BYTE ScDocument::GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ) { if ( !pCell ) - return 0; // empty + return 0; // empty BYTE nStored = pCell->GetScriptType(); - if ( nStored != SC_SCRIPTTYPE_UNKNOWN ) // stored value valid? - return nStored; // use stored value + if ( nStored != SC_SCRIPTTYPE_UNKNOWN ) // stored value valid? + return nStored; // use stored value String aStr; Color* pColor; @@ -148,7 +148,7 @@ BYTE ScDocument::GetCellScriptType( ScBaseCell* pCell, ULONG nNumberFormat ) BYTE nRet = GetStringScriptType( aStr ); - pCell->SetScriptType( nRet ); // store for later calls + pCell->SetScriptType( nRet ); // store for later calls return nRet; } @@ -161,14 +161,14 @@ BYTE ScDocument::GetScriptType( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* { pCell = GetCell( ScAddress( nCol, nRow, nTab ) ); if ( !pCell ) - return 0; // empty + return 0; // empty } // if script type is set, don't have to get number formats BYTE nStored = pCell->GetScriptType(); - if ( nStored != SC_SCRIPTTYPE_UNKNOWN ) // stored value valid? - return nStored; // use stored value + if ( nStored != SC_SCRIPTTYPE_UNKNOWN ) // stored value valid? + return nStored; // use stored value // include number formats from conditional formatting diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index fba5fa0a1b82..1cca198ffe23 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.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,14 +44,14 @@ #include "brdcst.hxx" #include "bcaslot.hxx" #include "cell.hxx" -#include "formula/errorcodes.hxx" // errCircularReference +#include "formula/errorcodes.hxx" // errCircularReference #include "scerrors.hxx" #include "docoptio.hxx" #include "refupdat.hxx" #include "table.hxx" #include "progress.hxx" -#include "scmod.hxx" // SC_MOD -#include "inputopt.hxx" // GetExpandRefs +#include "scmod.hxx" // SC_MOD +#include "inputopt.hxx" // GetExpandRefs #include "conditio.hxx" #include "sheetevents.hxx" #include <tools/shl.hxx> @@ -59,7 +59,7 @@ #include "globstr.hrc" -extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround +extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround // STATIC DATA ----------------------------------------------------------- @@ -93,7 +93,7 @@ void ScDocument::Broadcast( ULONG nHint, const ScAddress& rAddr, ) { if ( !pBASM ) - return ; // Clipboard or Undo + return ; // Clipboard or Undo ScHint aHint( nHint, rAddr, pCell ); Broadcast( aHint ); } @@ -102,7 +102,7 @@ void ScDocument::Broadcast( ULONG nHint, const ScAddress& rAddr, void ScDocument::Broadcast( const ScHint& rHint ) { if ( !pBASM ) - return ; // Clipboard or Undo + return ; // Clipboard or Undo if ( !nHardRecalcState ) { ScBulkBroadcast aBulkBroadcast( pBASM); // scoped bulk broadcast @@ -121,7 +121,7 @@ void ScDocument::Broadcast( const ScHint& rHint ) TrackFormulas( rHint.GetId() ); } - // Repaint fuer bedingte Formate mit relativen Referenzen: + // Repaint fuer bedingte Formate mit relativen Referenzen: if ( pCondFormList && rHint.GetAddress() != BCA_BRDCST_ALWAYS ) pCondFormList->SourceChanged( rHint.GetAddress() ); @@ -137,7 +137,7 @@ void ScDocument::Broadcast( const ScHint& rHint ) void ScDocument::AreaBroadcast( const ScHint& rHint ) { if ( !pBASM ) - return ; // Clipboard or Undo + return ; // Clipboard or Undo if ( !nHardRecalcState ) { ScBulkBroadcast aBulkBroadcast( pBASM); // scoped bulk broadcast @@ -145,7 +145,7 @@ void ScDocument::AreaBroadcast( const ScHint& rHint ) TrackFormulas( rHint.GetId() ); } - // Repaint fuer bedingte Formate mit relativen Referenzen: + // Repaint fuer bedingte Formate mit relativen Referenzen: if ( pCondFormList && rHint.GetAddress() != BCA_BRDCST_ALWAYS ) pCondFormList->SourceChanged( rHint.GetAddress() ); } @@ -227,7 +227,7 @@ void ScDocument::PutInFormulaTree( ScFormulaCell* pCell ) if ( pEOFormulaTree ) pEOFormulaTree->SetNext( pCell ); else - pFormulaTree = pCell; // kein Ende, kein Anfang.. + pFormulaTree = pCell; // kein Ende, kein Anfang.. pCell->SetPrevious( pEOFormulaTree ); pCell->SetNext( 0 ); pEOFormulaTree = pCell; @@ -244,13 +244,13 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell ) { ScFormulaCell* pNext = pCell->GetNext(); if ( pPrev ) - pPrev->SetNext( pNext ); // gibt Vorlaeufer + pPrev->SetNext( pNext ); // gibt Vorlaeufer else - pFormulaTree = pNext; // ist erste Zelle + pFormulaTree = pNext; // ist erste Zelle if ( pNext ) - pNext->SetPrevious( pPrev ); // gibt Nachfolger + pNext->SetPrevious( pPrev ); // gibt Nachfolger else - pEOFormulaTree = pPrev; // ist letzte Zelle + pEOFormulaTree = pPrev; // ist letzte Zelle pCell->SetPrevious( 0 ); pCell->SetNext( 0 ); USHORT nRPN = pCell->GetCode()->GetCodeLen(); @@ -299,7 +299,7 @@ void ScDocument::CalcFormulaTree( BOOL bOnlyForced, BOOL bNoProgress ) while ( pCell ) { if ( pCell->GetDirty() ) - pCell = pCell->GetNext(); // alles klar + pCell = pCell->GetNext(); // alles klar else { if ( pCell->GetCode()->IsRecalcModeAlways() ) @@ -312,7 +312,7 @@ void ScDocument::CalcFormulaTree( BOOL bOnlyForced, BOOL bNoProgress ) pCell = pNext; } else - { // andere simpel berechnen + { // andere simpel berechnen pCell->SetDirtyVar(); pCell = pCell->GetNext(); } @@ -405,7 +405,7 @@ void ScDocument::AppendToFormulaTrack( ScFormulaCell* pCell ) if ( pEOFormulaTrack ) pEOFormulaTrack->SetNextTrack( pCell ); else - pFormulaTrack = pCell; // kein Ende, kein Anfang.. + pFormulaTrack = pCell; // kein Ende, kein Anfang.. pCell->SetPreviousTrack( pEOFormulaTrack ); pCell->SetNextTrack( 0 ); pEOFormulaTrack = pCell; @@ -422,13 +422,13 @@ void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell ) { ScFormulaCell* pNext = pCell->GetNextTrack(); if ( pPrev ) - pPrev->SetNextTrack( pNext ); // gibt Vorlaeufer + pPrev->SetNextTrack( pNext ); // gibt Vorlaeufer else - pFormulaTrack = pNext; // ist erste Zelle + pFormulaTrack = pNext; // ist erste Zelle if ( pNext ) - pNext->SetPreviousTrack( pPrev ); // gibt Nachfolger + pNext->SetPreviousTrack( pPrev ); // gibt Nachfolger else - pEOFormulaTrack = pPrev; // ist letzte Zelle + pEOFormulaTrack = pPrev; // ist letzte Zelle pCell->SetPreviousTrack( 0 ); pCell->SetNextTrack( 0 ); --nFormulaTrackCount; @@ -466,7 +466,7 @@ void ScDocument::TrackFormulas( ULONG nHintId ) if ( ( pBC = pTrack->GetBroadcaster() ) != NULL ) pBC->Broadcast( aHint ); pBASM->AreaBroadcast( aHint ); - // Repaint fuer bedingte Formate mit relativen Referenzen: + // Repaint fuer bedingte Formate mit relativen Referenzen: if ( pCondFormList ) pCondFormList->SourceChanged( pTrack->aPos ); // for "calculate" event, keep track of which sheets are affected by tracked formulas diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 8b9d6714246b..1e9b4e16e687 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.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,7 +86,7 @@ #include "chartlis.hxx" #include "chartlock.hxx" #include "refupdat.hxx" -#include "validat.hxx" // fuer HasMacroCalls +#include "validat.hxx" // fuer HasMacroCalls #include "markdata.hxx" #include "scmod.hxx" #include "printopt.hxx" @@ -97,11 +97,11 @@ #include "macromgr.hxx" #include "dpobject.hxx" -#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() +#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() -// states for online spelling in the visible range (0 is set initially) -#define VSPL_START 0 -#define VSPL_DONE 1 +// states for online spelling in the visible range (0 is set initially) +#define VSPL_START 0 +#define VSPL_DONE 1 // STATIC DATA ----------------------------------------------------------- @@ -161,9 +161,9 @@ void ScDocument::SetPrinter( SfxPrinter* pNewPrinter ) { if ( pNewPrinter == pPrinter ) { - // #i6706# SetPrinter is called with the same printer again if - // the JobSetup has changed. In that case just call UpdateDrawPrinter - // (SetRefDevice for drawing layer) because of changed text sizes. + // #i6706# SetPrinter is called with the same printer again if + // the JobSetup has changed. In that case just call UpdateDrawPrinter + // (SetRefDevice for drawing layer) because of changed text sizes. UpdateDrawPrinter(); } else @@ -207,8 +207,8 @@ VirtualDevice* ScDocument::GetVirtualDevice_100th_mm() { if (!pVirtualDevice_100th_mm) { -// pVirtualDevice_100th_mm = new VirtualDevice; -// pVirtualDevice_100th_mm->SetMapMode( MAP_100TH_MM ); +// pVirtualDevice_100th_mm = new VirtualDevice; +// pVirtualDevice_100th_mm->SetMapMode( MAP_100TH_MM ); pVirtualDevice_100th_mm = new VirtualDevice( 1 ); pVirtualDevice_100th_mm->SetReferenceDevice(VirtualDevice::REFDEV_MODE_MSO1); @@ -241,10 +241,10 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, { case SFX_STYLE_FAMILY_PAGE: { - const USHORT nOldScale = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE); + const USHORT nOldScale = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE); const USHORT nOldScaleToPages = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALETOPAGES); rSet.Put( rChanges ); - const USHORT nNewScale = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE); + const USHORT nNewScale = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALE); const USHORT nNewScaleToPages = GET_SCALEVALUE(rSet,ATTR_PAGE_SCALETOPAGES); if ( (nOldScale != nNewScale) || (nOldScaleToPages != nNewScaleToPages) ) @@ -286,9 +286,9 @@ void ScDocument::ModifyStyleSheet( SfxStyleSheetBase& rStyleSheet, } // Bedeutung der Items in rChanges: - // Item gesetzt - Aenderung uebernehmen - // Dontcare - Default setzen - // Default - keine Aenderung + // Item gesetzt - Aenderung uebernehmen + // Dontcare - Default setzen + // Default - keine Aenderung // ("keine Aenderung" geht nicht mit PutExtended, darum Schleife) for (USHORT nWhich = ATTR_PATTERN_START; nWhich <= ATTR_PATTERN_END; nWhich++) { @@ -336,7 +336,7 @@ void ScDocument::InvalidateTextWidth( const String& rStyleName ) void ScDocument::InvalidateTextWidth( SCTAB nTab ) { - ScAddress aAdrFrom( 0, 0, nTab ); + ScAddress aAdrFrom( 0, 0, nTab ); ScAddress aAdrTo ( MAXCOL, MAXROW, nTab ); InvalidateTextWidth( &aAdrFrom, &aAdrTo, FALSE ); } @@ -345,7 +345,7 @@ void ScDocument::InvalidateTextWidth( SCTAB nTab ) BOOL ScDocument::IsPageStyleInUse( const String& rStrPageStyle, SCTAB* pInTab ) { - BOOL bInUse = FALSE; + BOOL bInUse = FALSE; const SCTAB nCount = GetTableCount(); SCTAB i; @@ -447,10 +447,10 @@ void ScDocument::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress //------------------------------------------------------------------------ -#define CALCMAX 1000 // Berechnungen -#define ABORT_EVENTS (INPUT_ANY & ~INPUT_TIMER & ~INPUT_OTHER) +#define CALCMAX 1000 // Berechnungen +#define ABORT_EVENTS (INPUT_ANY & ~INPUT_TIMER & ~INPUT_OTHER) -BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder versuchen +BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder versuchen { // #i75610# if a printer hasn't been set or created yet, don't create one for this if ( bIdleDisabled || IsInLinkUpdate() || GetPrinter(FALSE) == NULL ) @@ -460,22 +460,22 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers // ULONG nMs = 0; // USHORT nIter = 0; - const ULONG nStart = Time::GetSystemTicks(); - double nPPTX = 0.0; - double nPPTY = 0.0; - OutputDevice* pDev = NULL; - MapMode aOldMap; - ScStyleSheet* pStyle = NULL; - ScColumnIterator* pColIter = NULL; - ScTable* pTable = NULL; - ScColumn* pColumn = NULL; - ScBaseCell* pCell = NULL; - SCTAB nTab = aCurTextWidthCalcPos.Tab(); - SCROW nRow = aCurTextWidthCalcPos.Row(); - SCsCOL nCol = aCurTextWidthCalcPos.Col(); - USHORT nRestart = 0; - USHORT nZoom = 0; - BOOL bNeedMore= FALSE; + const ULONG nStart = Time::GetSystemTicks(); + double nPPTX = 0.0; + double nPPTY = 0.0; + OutputDevice* pDev = NULL; + MapMode aOldMap; + ScStyleSheet* pStyle = NULL; + ScColumnIterator* pColIter = NULL; + ScTable* pTable = NULL; + ScColumn* pColumn = NULL; + ScBaseCell* pCell = NULL; + SCTAB nTab = aCurTextWidthCalcPos.Tab(); + SCROW nRow = aCurTextWidthCalcPos.Row(); + SCsCOL nCol = aCurTextWidthCalcPos.Col(); + USHORT nRestart = 0; + USHORT nZoom = 0; + BOOL bNeedMore= FALSE; if ( !ValidRow(nRow) ) nRow = 0, nCol--; @@ -484,11 +484,11 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers if ( !ValidTab(nTab) || !pTab[nTab] ) nTab = 0; -// DBG_ERROR( String("Start = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); +// DBG_ERROR( String("Start = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); - // SearchMask/Family muss gemerkt werden, - // damit z.B. der Organizer nicht durcheinanderkommt, wenn zwischendurch eine - // Query-Box aufgemacht wird !!! + // SearchMask/Family muss gemerkt werden, + // damit z.B. der Organizer nicht durcheinanderkommt, wenn zwischendurch eine + // Query-Box aufgemacht wird !!! ScStyleSheetPool* pStylePool = xPoolHelper->GetStylePool(); USHORT nOldMask = pStylePool->GetSearchMask(); @@ -506,7 +506,7 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers { USHORT nCount = 0; - nZoom = GET_SCALEVALUE(pStyle->GetItemSet(),ATTR_PAGE_SCALE); + nZoom = GET_SCALEVALUE(pStyle->GetItemSet(),ATTR_PAGE_SCALE); Fraction aZoomFract( nZoom, 100 ); pColumn = &pTable->aCol[nCol]; pColIter = new ScColumnIterator( pColumn, nRow, MAXROW ); @@ -515,13 +515,13 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers { if ( pColIter->Next( nRow, pCell ) ) { - if ( TEXTWIDTH_DIRTY == pCell->GetTextWidth() ) + if ( TEXTWIDTH_DIRTY == pCell->GetTextWidth() ) { if ( !pDev ) { pDev = GetPrinter(); aOldMap = pDev->GetMapMode(); - pDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize + pDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize Point aPix1000 = pDev->LogicToPixel( Point(1000,1000), MAP_TWIP ); nPPTX = aPix1000.X() / 1000.0; @@ -534,15 +534,15 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers bProgress = TRUE; } -// DBG_ERROR( String("t,c,r = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); -// DBG_ERROR( String("nOldWidth = ") + String(pCell->GetTextWidth()) ); +// DBG_ERROR( String("t,c,r = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); +// DBG_ERROR( String("nOldWidth = ") + String(pCell->GetTextWidth()) ); USHORT nNewWidth = (USHORT)GetNeededSize( nCol, nRow, nTab, pDev, nPPTX, nPPTY, aZoomFract,aZoomFract, TRUE, - TRUE ); // bTotalSize + TRUE ); // bTotalSize -// DBG_ERROR( String("nNewWidth = ") + String(nNewWidth) ); +// DBG_ERROR( String("nNewWidth = ") + String(nNewWidth) ); pCell->SetTextWidth( nNewWidth ); @@ -627,7 +627,7 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers delete pColIter; -// DBG_ERROR( String(nCount) + String(" End = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); +// DBG_ERROR( String(nCount) + String(" End = ") + String(nTab) + String(',') + String(nCol) + String(',') + String(nRow) ); if (pDev) pDev->SetMapMode(aOldMap); @@ -649,7 +649,7 @@ BOOL ScDocument::IdleCalcTextWidth() // TRUE = demnaechst wieder vers class ScSpellStatus { public: - BOOL bModified; + BOOL bModified; ScSpellStatus() : bModified(FALSE) {}; @@ -665,38 +665,38 @@ IMPL_LINK( ScSpellStatus, EventHdl, EditStatus *, pStatus ) return 0; } -// SPELL_MAXCELLS muss mindestens 256 sein, solange am Iterator keine -// Start-Spalte gesetzt werden kann +// SPELL_MAXCELLS muss mindestens 256 sein, solange am Iterator keine +// Start-Spalte gesetzt werden kann -//! SPELL_MAXTEST fuer Timer und Idle unterschiedlich ??? +//! SPELL_MAXTEST fuer Timer und Idle unterschiedlich ??? -// SPELL_MAXTEST now divided between visible and rest of document +// SPELL_MAXTEST now divided between visible and rest of document -#define SPELL_MAXTEST_VIS 1 -#define SPELL_MAXTEST_ALL 3 -#define SPELL_MAXCELLS 256 +#define SPELL_MAXTEST_VIS 1 +#define SPELL_MAXTEST_ALL 3 +#define SPELL_MAXCELLS 256 BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpellPos, USHORT nMaxTest ) { - ScEditEngineDefaulter* pEngine = NULL; //! am Dokument speichern + ScEditEngineDefaulter* pEngine = NULL; //! am Dokument speichern SfxItemSet* pDefaults = NULL; ScSpellStatus aStatus; - USHORT nCellCount = 0; // Zellen insgesamt - USHORT nTestCount = 0; // Aufrufe Spelling - BOOL bChanged = FALSE; // Aenderungen? + USHORT nCellCount = 0; // Zellen insgesamt + USHORT nTestCount = 0; // Aufrufe Spelling + BOOL bChanged = FALSE; // Aenderungen? - SCCOL nCol = rSpellRange.aStart.Col(); // iterator always starts on the left edge + SCCOL nCol = rSpellRange.aStart.Col(); // iterator always starts on the left edge SCROW nRow = rSpellPos.Row(); SCTAB nTab = rSpellPos.Tab(); - if ( !pTab[nTab] ) // sheet deleted? + if ( !pTab[nTab] ) // sheet deleted? { nTab = rSpellRange.aStart.Tab(); nRow = rSpellRange.aStart.Row(); if ( !pTab[nTab] ) { - // may happen for visible range + // may happen for visible range return FALSE; } } @@ -704,7 +704,7 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe rSpellRange.aStart.Col(), nRow, rSpellRange.aEnd.Col(), rSpellRange.aEnd.Row() ); ScBaseCell* pCell = aIter.GetNext( nCol, nRow ); - // skip everything left of rSpellPos: + // skip everything left of rSpellPos: while ( pCell && nRow == rSpellPos.Row() && nCol < rSpellPos.Col() ) pCell = aIter.GetNext( nCol, nRow ); @@ -719,13 +719,13 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe { if (!pEngine) { - // #71154# ScTabEditEngine is needed - // because MapMode must be set for some old documents + // #71154# ScTabEditEngine is needed + // because MapMode must be set for some old documents pEngine = new ScTabEditEngine( this ); pEngine->SetControlWord( pEngine->GetControlWord() | ( EE_CNTRL_ONLINESPELLING | EE_CNTRL_ALLOWBIGOBJS ) ); pEngine->SetStatusEventHdl( LINK( &aStatus, ScSpellStatus, EventHdl ) ); - // Delimiters hier wie in inputhdl.cxx !!! + // Delimiters hier wie in inputhdl.cxx !!! pEngine->SetWordDelimiters( ScEditUtil::ModifyDelimiters( pEngine->GetWordDelimiters() ) ); pDefaults = new SfxItemSet( pEngine->GetEmptyItemSet() ); @@ -737,7 +737,7 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe const ScPatternAttr* pPattern = GetPattern( nCol, nRow, nTab ); pPattern->FillEditItemSet( pDefaults ); - pEngine->SetDefaults( pDefaults, FALSE ); //! noetig ? + pEngine->SetDefaults( pDefaults, FALSE ); //! noetig ? USHORT nCellLang = ((const SvxLanguageItem&) pPattern->GetItem(ATTR_FONT_LANGUAGE)).GetValue(); @@ -756,9 +756,9 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe aStatus.bModified = FALSE; pEngine->CompleteOnlineSpelling(); - if ( aStatus.bModified ) // Fehler dazu oder weggekommen? + if ( aStatus.bModified ) // Fehler dazu oder weggekommen? { - BOOL bNeedEdit = TRUE; // Test auf einfachen Text + BOOL bNeedEdit = TRUE; // Test auf einfachen Text if ( !pEngine->HasOnlineSpellErrors() ) { ScEditAttrTester aTester( pEngine ); @@ -776,14 +776,14 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe this, pEngine->GetEditTextObjectPool() ) ); delete pNewData; } - else // einfacher String + else // einfacher String PutCell( nCol, nRow, nTab, new ScStringCell( pEngine->GetText() ) ); - // Paint + // Paint if (pShell) { - // #47751# Seitenvorschau ist davon nicht betroffen - // (sollte jedenfalls nicht) + // #47751# Seitenvorschau ist davon nicht betroffen + // (sollte jedenfalls nicht) ScPaintHint aHint( ScRange( nCol, nRow, nTab ), PAINT_GRID ); aHint.SetPrintFlag( FALSE ); pShell->Broadcast( aHint ); @@ -792,17 +792,17 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe bChanged = TRUE; } - if ( ++nTestCount >= nMaxTest ) // checked enough text? + if ( ++nTestCount >= nMaxTest ) // checked enough text? break; } - if ( ++nCellCount >= SPELL_MAXCELLS ) // seen enough cells? + if ( ++nCellCount >= SPELL_MAXCELLS ) // seen enough cells? break; } if ( pCell ) { - ++nCol; // continue after last cell + ++nCol; // continue after last cell if ( nCol > rSpellRange.aEnd.Col() ) { nCol = rSpellRange.aStart.Col(); @@ -812,7 +812,7 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe } } - if (!pCell) // end of range reached -> next sheet + if (!pCell) // end of range reached -> next sheet { ++nTab; if ( nTab > rSpellRange.aEnd.Tab() || !pTab[nTab] ) @@ -820,12 +820,12 @@ BOOL ScDocument::OnlineSpellInRange( const ScRange& rSpellRange, ScAddress& rSpe nCol = rSpellRange.aStart.Col(); nRow = rSpellRange.aStart.Row(); - nVisSpellState = VSPL_DONE; //! only if this is for the visible range + nVisSpellState = VSPL_DONE; //! only if this is for the visible range } rSpellPos.Set( nCol, nRow, nTab ); delete pDefaults; - delete pEngine; // bevor aStatus out of scope geht + delete pEngine; // bevor aStatus out of scope geht return bChanged; } @@ -841,23 +841,23 @@ BOOL ScDocument::ContinueOnlineSpelling() BOOL bOldInserting = IsInsertingFromOtherDoc(); SetInsertingFromOtherDoc( TRUE ); - //! use one EditEngine for both calls + //! use one EditEngine for both calls - // #41504# first check visible range + // #41504# first check visible range BOOL bResult = OnlineSpellInRange( aVisSpellRange, aVisSpellPos, SPELL_MAXTEST_VIS ); - // during first pass through visible range, always continue + // during first pass through visible range, always continue if ( nVisSpellState == VSPL_START ) bResult = TRUE; if (bResult) { - // if errors found, continue there + // if errors found, continue there OnlineSpellInRange( aVisSpellRange, aVisSpellPos, SPELL_MAXTEST_ALL ); } else { - // if nothing found there, continue with rest of document + // if nothing found there, continue with rest of document ScRange aTotalRange( 0,0,0, MAXCOL,MAXROW,MAXTAB ); bResult = OnlineSpellInRange( aTotalRange, aOnlineSpellPos, SPELL_MAXTEST_ALL ); } @@ -872,7 +872,7 @@ void ScDocument::SetOnlineSpellPos( const ScAddress& rPos ) { aOnlineSpellPos = rPos; - // skip visible area for aOnlineSpellPos + // skip visible area for aOnlineSpellPos if ( aVisSpellRange.In( aOnlineSpellPos ) ) aOnlineSpellPos = aVisSpellRange.aEnd; } @@ -882,7 +882,7 @@ BOOL ScDocument::SetVisibleSpellRange( const ScRange& rNewRange ) BOOL bChange = ( aVisSpellRange != rNewRange ); if (bChange) { - // continue spelling through visible range when scrolling down + // continue spelling through visible range when scrolling down BOOL bContDown = ( nVisSpellState == VSPL_START && rNewRange.In( aVisSpellPos ) && rNewRange.aStart.Row() > aVisSpellRange.aStart.Row() && rNewRange.aStart.Col() == aVisSpellRange.aStart.Col() && @@ -896,7 +896,7 @@ BOOL ScDocument::SetVisibleSpellRange( const ScRange& rNewRange ) nVisSpellState = VSPL_START; } - // skip visible area for aOnlineSpellPos + // skip visible area for aOnlineSpellPos if ( aVisSpellRange.In( aOnlineSpellPos ) ) aOnlineSpellPos = aVisSpellRange.aEnd; } @@ -905,7 +905,7 @@ BOOL ScDocument::SetVisibleSpellRange( const ScRange& rNewRange ) void ScDocument::RemoveAutoSpellObj() { - // alle Spelling-Informationen entfernen + // alle Spelling-Informationen entfernen for (SCTAB nTab=0; nTab<=MAXTAB && pTab[nTab]; nTab++) pTab[nTab]->RemoveAutoSpellObj(); @@ -913,7 +913,7 @@ void ScDocument::RemoveAutoSpellObj() //------------------------------------------------------------------------ -BOOL ScDocument::IdleCheckLinks() // TRUE = demnaechst wieder versuchen +BOOL ScDocument::IdleCheckLinks() // TRUE = demnaechst wieder versuchen { BOOL bAnyLeft = FALSE; @@ -942,13 +942,13 @@ BOOL ScDocument::IdleCheckLinks() // TRUE = demnaechst wieder versuche void ScDocument::SaveDdeLinks(SvStream& rStream) const { - // bei 4.0-Export alle mit Modus != DEFAULT weglassen + // bei 4.0-Export alle mit Modus != DEFAULT weglassen BOOL bExport40 = ( rStream.GetVersion() <= SOFFICE_FILEFORMAT_40 ); const ::sfx2::SvBaseLinks& rLinks = GetLinkManager()->GetLinks(); USHORT nCount = rLinks.Count(); - // erstmal zaehlen... + // erstmal zaehlen... USHORT nDdeCount = 0; USHORT i; @@ -960,12 +960,12 @@ void ScDocument::SaveDdeLinks(SvStream& rStream) const ++nDdeCount; } - // Header + // Header ScMultipleWriteHeader aHdr( rStream ); rStream << nDdeCount; - // Links speichern + // Links speichern for (i=0; i<nCount; i++) { @@ -996,7 +996,7 @@ void ScDocument::LoadDdeLinks(SvStream& rStream) BOOL ScDocument::HasDdeLinks() const { - if (GetLinkManager()) // Clipboard z.B. hat keinen LinkManager + if (GetLinkManager()) // Clipboard z.B. hat keinen LinkManager { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); USHORT nCount = rLinks.Count(); @@ -1010,7 +1010,7 @@ BOOL ScDocument::HasDdeLinks() const void ScDocument::SetInLinkUpdate(BOOL bSet) { - // called from TableLink and AreaLink + // called from TableLink and AreaLink DBG_ASSERT( bInLinkUpdate != bSet, "SetInLinkUpdate twice" ); bInLinkUpdate = bSet; @@ -1104,9 +1104,9 @@ void ScDocument::UpdateDdeLinks() BOOL ScDocument::UpdateDdeLink( const String& rAppl, const String& rTopic, const String& rItem ) { - // fuer refresh() per StarOne Api - // ResetValue() fuer einzelnen Link nicht noetig - //! wenn's mal alles asynchron wird, aber auch hier + // fuer refresh() per StarOne Api + // ResetValue() fuer einzelnen Link nicht noetig + //! wenn's mal alles asynchron wird, aber auch hier BOOL bFound = FALSE; if (GetLinkManager()) @@ -1143,14 +1143,14 @@ void ScDocument::DisconnectDdeLinks() { ::sfx2::SvBaseLink* pBase = *rLinks[i]; if (pBase->ISA(ScDdeLink)) - pBase->Disconnect(); // bleibt im LinkManager eingetragen + pBase->Disconnect(); // bleibt im LinkManager eingetragen } } } void ScDocument::CopyDdeLinks( ScDocument* pDestDoc ) const { - if (bIsClip) // aus Stream erzeugen + if (bIsClip) // aus Stream erzeugen { if (pClipData) { @@ -1326,7 +1326,7 @@ bool ScDocument::SetDdeLinkResultMatrix( USHORT nDdePos, ScMatrix* pResults ) BOOL ScDocument::HasAreaLinks() const { - if (GetLinkManager()) // Clipboard z.B. hat keinen LinkManager + if (GetLinkManager()) // Clipboard z.B. hat keinen LinkManager { const ::sfx2::SvBaseLinks& rLinks = pLinkManager->GetLinks(); USHORT nCount = rLinks.Count(); @@ -1453,12 +1453,12 @@ void ScDocument::KeyInput( const KeyEvent& ) apTemporaryChartLock->StartOrContinueLocking(); } -// ---------------------------------------------------------------------------- +// ---------------------------------------------------------------------------- BOOL ScDocument::CheckMacroWarn() { - // The check for macro configuration, macro warning and disabling is now handled - // in SfxObjectShell::AdjustMacroMode, called by SfxObjectShell::CallBasic. + // The check for macro configuration, macro warning and disabling is now handled + // in SfxObjectShell::AdjustMacroMode, called by SfxObjectShell::CallBasic. return TRUE; } @@ -1467,17 +1467,17 @@ BOOL ScDocument::CheckMacroWarn() SfxBindings* ScDocument::GetViewBindings() { - // used to invalidate slots after changes to this document + // used to invalidate slots after changes to this document if ( !pShell ) - return NULL; // no ObjShell -> no view + return NULL; // no ObjShell -> no view - // first check current view + // first check current view SfxViewFrame* pViewFrame = SfxViewFrame::Current(); - if ( pViewFrame && pViewFrame->GetObjectShell() != pShell ) // wrong document? + if ( pViewFrame && pViewFrame->GetObjectShell() != pShell ) // wrong document? pViewFrame = NULL; - // otherwise use first view for this doc + // otherwise use first view for this doc if ( !pViewFrame ) pViewFrame = SfxViewFrame::GetFirst( pShell ); @@ -1493,7 +1493,7 @@ void lcl_TransliterateEditEngine( ScEditEngineDefaulter& rEngine, utl::TransliterationWrapper& rTranslitarationWrapper, BOOL bConsiderLanguage, ScDocument* pDoc ) { - //! should use TransliterateText method of EditEngine instead, when available! + //! should use TransliterateText method of EditEngine instead, when available! sal_uInt16 nLanguage = LANGUAGE_SYSTEM; @@ -1513,7 +1513,7 @@ void lcl_TransliterateEditEngine( ScEditEngineDefaulter& rEngine, String aOldStr = rEngine.GetText( aSel ); SfxItemSet aAttr = rEngine.GetAttribs( aSel ); - if ( aAttr.GetItemState( EE_FEATURE_FIELD ) != SFX_ITEM_ON ) // fields are not touched + if ( aAttr.GetItemState( EE_FEATURE_FIELD ) != SFX_ITEM_ON ) // fields are not touched { if ( bConsiderLanguage ) { @@ -1548,7 +1548,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp BOOL bConsiderLanguage = aTranslitarationWrapper.needLanguageForTheMode(); sal_uInt16 nLanguage = LANGUAGE_SYSTEM; - ScEditEngineDefaulter* pEngine = NULL; // not using pEditEngine member because of defaults + ScEditEngineDefaulter* pEngine = NULL; // not using pEditEngine member because of defaults SCTAB nCount = GetTableCount(); for (SCTAB nTab = 0; nTab < nCount; nTab++) @@ -1574,7 +1574,7 @@ void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nTyp if ( bConsiderLanguage ) { - BYTE nScript = GetStringScriptType( aOldStr ); //! cell script type? + BYTE nScript = GetStringScriptType( aOldStr ); //! cell script type? USHORT nWhich = ( nScript == SCRIPTTYPE_ASIAN ) ? ATTR_CJK_FONT_LANGUAGE : ( ( nScript == SCRIPTTYPE_COMPLEX ) ? ATTR_CTL_FONT_LANGUAGE : ATTR_FONT_LANGUAGE ); diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 528db06b79e0..c036f4df70e7 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.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 @@ #include "rechead.hxx" #include "poolhelp.hxx" #include "docpool.hxx" -#include "detfunc.hxx" // for UpdateAllComments +#include "detfunc.hxx" // for UpdateAllComments #include "editutil.hxx" #include "postit.hxx" #include "charthelper.hxx" @@ -129,8 +129,8 @@ void ScDocument::TransferDrawPage(ScDocument* pSrcDoc, SCTAB nSrcPos, SCTAB nDes } } - // #71726# make sure the data references of charts are adapted - // (this must be after InsertObject!) + // #71726# make sure the data references of charts are adapted + // (this must be after InsertObject!) ScChartHelper::AdjustRangesOfChartsOnDestinationPage( pSrcDoc, this, nSrcPos, nDestPos ); } @@ -139,30 +139,30 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) if (pDocShell && !pShell) pShell = pDocShell; -// DBG_ASSERT(pShell,"InitDrawLayer ohne Shell"); +// DBG_ASSERT(pShell,"InitDrawLayer ohne Shell"); if (!pDrawLayer) { String aName; - if ( pShell && !pShell->IsLoading() ) // #88438# don't call GetTitle while loading + if ( pShell && !pShell->IsLoading() ) // #88438# don't call GetTitle while loading aName = pShell->GetTitle(); pDrawLayer = new ScDrawLayer( this, aName ); if (GetLinkManager()) pDrawLayer->SetLinkManager( pLinkManager ); - // Drawing pages are accessed by table number, so they must also be present - // for preceding table numbers, even if the tables aren't allocated - // (important for clipboard documents). + // Drawing pages are accessed by table number, so they must also be present + // for preceding table numbers, even if the tables aren't allocated + // (important for clipboard documents). SCTAB nDrawPages = 0; SCTAB nTab; for (nTab=0; nTab<=MAXTAB; nTab++) if (pTab[nTab]) - nDrawPages = nTab + 1; // needed number of pages + nDrawPages = nTab + 1; // needed number of pages for (nTab=0; nTab<nDrawPages; nTab++) { - pDrawLayer->ScAddPage( nTab ); // always add page, with or without the table + pDrawLayer->ScAddPage( nTab ); // always add page, with or without the table if (pTab[nTab]) { String aTabName; @@ -216,8 +216,8 @@ void ScDocument::UpdateDrawPrinter() // use the printer even if IsValid is false // Application::GetDefaultDevice causes trouble with changing MapModes -// OutputDevice* pRefDev = GetPrinter(); -// pRefDev->SetMapMode( MAP_100TH_MM ); +// OutputDevice* pRefDev = GetPrinter(); +// pRefDev->SetMapMode( MAP_100TH_MM ); pDrawLayer->SetRefDevice(GetRefDevice()); } } @@ -296,7 +296,7 @@ void ScDocument::DeleteObjectsInSelection( const ScMarkData& rMark ) BOOL ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* pTabMark ) { - // pTabMark is used only for selected tables. If pTabMark is 0, all tables of rRange are used. + // pTabMark is used only for selected tables. If pTabMark is 0, all tables of rRange are used. if (!pDrawLayer) return FALSE; @@ -367,10 +367,10 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin ) BOOL ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) { - // Gibt es Objekte auf dem Hintergrund-Layer, die (teilweise) von rMMRect - // betroffen sind? - // (fuer Drawing-Optimierung, vor dem Hintergrund braucht dann nicht geloescht - // zu werden) + // Gibt es Objekte auf dem Hintergrund-Layer, die (teilweise) von rMMRect + // betroffen sind? + // (fuer Drawing-Optimierung, vor dem Hintergrund braucht dann nicht geloescht + // zu werden) if (!pDrawLayer) return FALSE; @@ -395,9 +395,9 @@ BOOL ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) BOOL ScDocument::HasAnyDraw( SCTAB nTab, const Rectangle& rMMRect ) { - // Gibt es ueberhaupt Objekte, die (teilweise) von rMMRect - // betroffen sind? - // (um leere Seiten beim Drucken zu erkennen) + // Gibt es ueberhaupt Objekte, die (teilweise) von rMMRect + // betroffen sind? + // (um leere Seiten beim Drucken zu erkennen) if (!pDrawLayer) return FALSE; @@ -428,7 +428,7 @@ void ScDocument::EnsureGraphicNames() SdrObject* ScDocument::GetObjectAtPoint( SCTAB nTab, const Point& rPos ) { - // fuer Drag&Drop auf Zeichenobjekt + // fuer Drag&Drop auf Zeichenobjekt SdrObject* pFound = NULL; if (pDrawLayer && pTab[nTab]) @@ -443,8 +443,8 @@ SdrObject* ScDocument::GetObjectAtPoint( SCTAB nTab, const Point& rPos ) { if ( pObject->GetCurrentBoundRect().IsInside(rPos) ) { - // Intern interessiert gar nicht - // Objekt vom Back-Layer nur, wenn kein Objekt von anderem Layer getroffen + // Intern interessiert gar nicht + // Objekt vom Back-Layer nur, wenn kein Objekt von anderem Layer getroffen SdrLayerID nLayer = pObject->GetLayer(); if ( (nLayer != SC_LAYER_INTERN) && (nLayer != SC_LAYER_HIDDEN) ) @@ -456,7 +456,7 @@ SdrObject* ScDocument::GetObjectAtPoint( SCTAB nTab, const Point& rPos ) } } } - // weitersuchen -> letztes (oberstes) getroffenes Objekt nehmen + // weitersuchen -> letztes (oberstes) getroffenes Objekt nehmen pObject = aIter.Next(); } @@ -472,13 +472,13 @@ BOOL ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, if (!IsBlockEmpty( nTab, nStartCol, nStartRow, nEndCol, nEndRow )) return FALSE; - ScDocument* pThis = (ScDocument*)this; //! GetMMRect / HasAnyDraw etc. const !!! + ScDocument* pThis = (ScDocument*)this; //! GetMMRect / HasAnyDraw etc. const !!! Rectangle aMMRect; if ( pLastRange && pLastMM && nTab == pLastRange->aStart.Tab() && nStartRow == pLastRange->aStart.Row() && nEndRow == pLastRange->aEnd.Row() ) { - // keep vertical part of aMMRect, only update horizontal position + // keep vertical part of aMMRect, only update horizontal position aMMRect = *pLastMM; long nLeft = 0; @@ -506,17 +506,17 @@ BOOL ScDocument::IsPrintEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, if ( nStartCol > 0 && !bLeftIsEmpty ) { - // aehnlich wie in ScPrintFunc::AdjustPrintArea - //! ExtendPrintArea erst ab Start-Spalte des Druckbereichs + // aehnlich wie in ScPrintFunc::AdjustPrintArea + //! ExtendPrintArea erst ab Start-Spalte des Druckbereichs SCCOL nExtendCol = nStartCol - 1; SCROW nTmpRow = nEndRow; pThis->ExtendMerge( 0,nStartRow, nExtendCol,nTmpRow, nTab, - FALSE, TRUE ); // kein Refresh, incl. Attrs + FALSE, TRUE ); // kein Refresh, incl. Attrs OutputDevice* pDev = pThis->GetPrinter(); - pDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize + pDev->SetMapMode( MAP_PIXEL ); // wichtig fuer GetNeededSize pThis->ExtendPrintArea( pDev, nTab, 0, nStartRow, nExtendCol, nEndRow ); if ( nExtendCol >= nStartCol ) return FALSE; @@ -590,9 +590,9 @@ void ScDocument::InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& Rectangle aObjRect = pObject->GetLogicRect(); if ( aObjRect.IsOver( rMMRect ) ) { - // Uno-Controls zeichnen sich immer komplett, ohne Ruecksicht - // auf ClippingRegions. Darum muss das ganze Objekt neu gepainted - // werden, damit die Selektion auf der Tabelle nicht uebermalt wird. + // Uno-Controls zeichnen sich immer komplett, ohne Ruecksicht + // auf ClippingRegions. Darum muss das ganze Objekt neu gepainted + // werden, damit die Selektion auf der Tabelle nicht uebermalt wird. //pWin->Invalidate( aObjRect.GetIntersection( rMMRect ) ); pWin->Invalidate( aObjRect ); @@ -607,8 +607,8 @@ void ScDocument::InvalidateControls( Window* pWin, SCTAB nTab, const Rectangle& BOOL ScDocument::HasDetectiveObjects(SCTAB nTab) const { - // looks for detective objects, annotations don't count - // (used to adjust scale so detective objects hit their cells better) + // looks for detective objects, annotations don't count + // (used to adjust scale so detective objects hit their cells better) BOOL bFound = FALSE; @@ -636,11 +636,11 @@ BOOL ScDocument::HasDetectiveObjects(SCTAB nTab) const void ScDocument::UpdateFontCharSet() { - // In alten Versionen (bis incl. 4.0 ohne SP) wurden beim Austausch zwischen - // Systemen die CharSets in den Font-Attributen nicht angepasst. - // Das muss fuer Dokumente bis incl SP2 nun nachgeholt werden: - // Alles, was nicht SYMBOL ist, wird auf den System-CharSet umgesetzt. - // Bei neuen Dokumenten (Version SC_FONTCHARSET) sollte der CharSet stimmen. + // In alten Versionen (bis incl. 4.0 ohne SP) wurden beim Austausch zwischen + // Systemen die CharSets in den Font-Attributen nicht angepasst. + // Das muss fuer Dokumente bis incl SP2 nun nachgeholt werden: + // Alles, was nicht SYMBOL ist, wird auf den System-CharSet umgesetzt. + // Bei neuen Dokumenten (Version SC_FONTCHARSET) sollte der CharSet stimmen. BOOL bUpdateOld = ( nSrcVer < SC_FONTCHARSET ); diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index 24445911a4c5..2a66a64e330e 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.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 @@ -84,7 +84,7 @@ #include "detdata.hxx" #include "cell.hxx" #include "dpobject.hxx" -#include "detfunc.hxx" // for UpdateAllComments +#include "detfunc.hxx" // for UpdateAllComments #include "scmod.hxx" #include "dociter.hxx" #include "progress.hxx" @@ -107,9 +107,9 @@ using ::std::set; struct ScDefaultAttr { - const ScPatternAttr* pAttr; - SCROW nFirst; - SCSIZE nCount; + const ScPatternAttr* pAttr; + SCROW nFirst; + SCSIZE nCount; ScDefaultAttr(const ScPatternAttr* pPatAttr) : pAttr(pPatAttr), nFirst(0), nCount(0) {} }; @@ -121,7 +121,7 @@ struct ScLessDefaultAttr } }; -typedef std::set<ScDefaultAttr, ScLessDefaultAttr> ScDefaultAttrSet; +typedef std::set<ScDefaultAttr, ScLessDefaultAttr> ScDefaultAttrSet; void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck ) { @@ -130,7 +130,7 @@ void ScDocument::MakeTable( SCTAB nTab,bool _bNeedsNameCheck ) String aString = ScGlobal::GetRscString(STR_TABLE_DEF); //"Table" aString += String::CreateFromInt32(nTab+1); if ( _bNeedsNameCheck ) - CreateValidTabName( aString ); // no doubles + CreateValidTabName( aString ); // no doubles pTab[nTab] = new ScTable(this, nTab, aString); pTab[nTab]->SetLoadingMedium(bLoadingMedium); @@ -161,7 +161,7 @@ BOOL ScDocument::GetName( SCTAB nTab, String& rName ) const return FALSE; } -BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName ) +BOOL ScDocument::SetCodeName( SCTAB nTab, String& rName ) { if (VALIDTAB(nTab)) { @@ -275,14 +275,14 @@ void ScDocument::CreateValidTabName(String& rName) const // Find new one const String aStrTable( ScResId(SCSTR_TABLE) ); - BOOL bOk = FALSE; + BOOL bOk = FALSE; // First test if the prefix is valid, if so only avoid doubles BOOL bPrefix = ValidTabName( aStrTable ); OSL_ENSURE(bPrefix, "Invalid Table Name"); SCTAB nDummy; - SCTAB nLoops = 0; // "for safety messures" + SCTAB nLoops = 0; // "for safety messures" for ( SCTAB i = nMaxTableNumber+1; !bOk && nLoops <= MAXTAB; i++ ) { rName = aStrTable; @@ -323,9 +323,9 @@ void ScDocument::CreateValidTabName(String& rName) const BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName, BOOL bExternalDocument ) { - SCTAB nTabCount = GetTableCount(); - BOOL bValid = ValidTab(nTabCount); - if ( !bExternalDocument ) // else test rName == "'Doc'!Tab" first + SCTAB nTabCount = GetTableCount(); + BOOL bValid = ValidTab(nTabCount); + if ( !bExternalDocument ) // else test rName == "'Doc'!Tab" first bValid = (bValid && ValidNewTabName(rName)); if (bValid) { @@ -381,7 +381,7 @@ BOOL ScDocument::InsertTab( SCTAB nPos, const String& rName, if (pTab[i]) pTab[i]->StartAllListeners(); - // update conditional formats after table is inserted + // update conditional formats after table is inserted if ( pCondFormList ) pCondFormList->UpdateReference( URM_INSDEL, aRange, 0,0,1 ); if ( pValidationList ) @@ -412,7 +412,7 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc ) if (nTabCount > 1) { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple calculations + SetAutoCalc( FALSE ); // avoid multiple calculations ScRange aRange( 0, 0, nTab, MAXCOL, MAXROW, nTab ); DelBroadcastAreasInRange( aRange ); @@ -491,13 +491,13 @@ BOOL ScDocument::DeleteTab( SCTAB nTab, ScDocument* pRefUndoDoc ) BOOL ScDocument::RenameTab( SCTAB nTab, const String& rName, BOOL /* bUpdateRef */, BOOL bExternalDocument ) { - BOOL bValid = FALSE; - SCTAB i; + BOOL bValid = FALSE; + SCTAB i; if VALIDTAB(nTab) if (pTab[nTab]) { if ( bExternalDocument ) - bValid = TRUE; // composed name + bValid = TRUE; // composed name else bValid = ValidTabName(rName); for (i=0; (i<=MAXTAB) && bValid; i++) @@ -596,10 +596,10 @@ void ScDocument::SetLayoutRTL( SCTAB nTab, BOOL bRTL ) return; } - pTab[nTab]->SetLayoutRTL( bRTL ); // only sets the flag + pTab[nTab]->SetLayoutRTL( bRTL ); // only sets the flag pTab[nTab]->SetDrawPageSize(); - // mirror existing objects: + // mirror existing objects: if (pDrawLayer) { @@ -611,8 +611,8 @@ void ScDocument::SetLayoutRTL( SCTAB nTab, BOOL bRTL ) SdrObject* pObject = aIter.Next(); while (pObject) { - // objects with ScDrawObjData are re-positioned in SetPageSize, - // don't mirror again + // objects with ScDrawObjData are re-positioned in SetPageSize, + // don't mirror again ScDrawObjData* pData = ScDrawLayer::GetObjData( pObject ); if ( !pData ) pDrawLayer->MirrorRTL( pObject ); @@ -638,8 +638,8 @@ BOOL ScDocument::IsLayoutRTL( SCTAB nTab ) const BOOL ScDocument::IsNegativePage( SCTAB nTab ) const { - // Negative page area is always used for RTL layout. - // The separate method is used to find all RTL handling of drawing objects. + // Negative page area is always used for RTL layout. + // The separate method is used to find all RTL handling of drawing objects. return IsLayoutRTL( nTab ); } @@ -647,7 +647,7 @@ BOOL ScDocument::IsNegativePage( SCTAB nTab ) const /* ---------------------------------------------------------------------------- used search area: - GetCellArea - Only Data + GetCellArea - Only Data GetTableArea - Data / Attributes GetPrintArea - intended for character objects, sweeps attributes all the way to bottom / right @@ -708,15 +708,12 @@ bool ScDocument::ShrinkToDataArea(SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow return true; // success! } -bool ScDocument::ShrinkToUsedDataArea( bool& o_bShrunk, SCTAB nTab, SCCOL& rStartCol, +bool ScDocument::ShrinkToUsedDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const { if (!ValidTab(nTab) || !pTab[nTab]) - { - o_bShrunk = false; return false; - } - return pTab[nTab]->ShrinkToUsedDataArea( o_bShrunk, rStartCol, rStartRow, rEndCol, rEndRow, bColumnsOnly); + return pTab[nTab]->ShrinkToUsedDataArea( rStartCol, rStartRow, rEndCol, rEndRow, bColumnsOnly); } // connected area @@ -850,7 +847,7 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, BOOL bTest = TRUE; BOOL bRet = FALSE; BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid mulitple calculations + SetAutoCalc( FALSE ); // avoid mulitple calculations for ( i = nStartTab; i <= nEndTab && bTest; i++) if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i))) bTest &= pTab[i]->TestInsertRow( nStartCol, nEndCol, nSize ); @@ -884,8 +881,8 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i))) pTab[i]->InsertRow( nStartCol, nEndCol, nStartRow, nSize ); - // #82991# UpdateRef for drawing layer must be after inserting, - // when the new row heights are known. + // #82991# UpdateRef for drawing layer must be after inserting, + // when the new row heights are known. for (i=nStartTab; i<=nEndTab; i++) if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i))) pTab[i]->UpdateDrawRef( URM_INSDEL, @@ -893,7 +890,7 @@ BOOL ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, 0, static_cast<SCsROW>(nSize), 0 ); if ( pChangeTrack && pChangeTrack->IsInDeleteUndo() ) - { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist + { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist // ein neues Listening faellig, bisherige Listener wurden in // FormulaCell UpdateReference abgehaengt StartAllListeners(); @@ -944,7 +941,7 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, } BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple calculations + SetAutoCalc( FALSE ); // avoid multiple calculations // handle chunks of consecutive selected sheets together SCTAB nTabRangeStart = nStartTab; @@ -1053,7 +1050,7 @@ BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab, BOOL bTest = TRUE; BOOL bRet = FALSE; BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple calculations + SetAutoCalc( FALSE ); // avoid multiple calculations for ( i = nStartTab; i <= nEndTab && bTest; i++) if (pTab[i] && (!pTabMark || pTabMark->GetTableSelect(i))) bTest &= pTab[i]->TestInsertCol( nStartRow, nEndRow, nSize ); @@ -1085,7 +1082,7 @@ BOOL ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab, pTab[i]->InsertCol( nStartCol, nStartRow, nEndRow, nSize ); if ( pChangeTrack && pChangeTrack->IsInDeleteUndo() ) - { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist + { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist // ein neues Listening faellig, bisherige Listener wurden in // FormulaCell UpdateReference abgehaengt StartAllListeners(); @@ -1134,7 +1131,7 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA } BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple calculations + SetAutoCalc( FALSE ); // avoid multiple calculations // handle chunks of consecutive selected sheets together SCTAB nTabRangeStart = nStartTab; @@ -1203,8 +1200,8 @@ void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, BOOL } -// fuer Area-Links: Zellen einuegen/loeschen, wenn sich der Bereich veraendert -// (ohne Paint) +// fuer Area-Links: Zellen einuegen/loeschen, wenn sich der Bereich veraendert +// (ohne Paint) void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, @@ -1223,32 +1220,32 @@ void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, SCROW nNewEndY = rNew.aEnd.Row(); SCTAB nTab = rOld.aStart.Tab(); - // wenn es mehr Zeilen werden, werden Spalten auf der alten Hoehe eingefuegt/geloescht + // wenn es mehr Zeilen werden, werden Spalten auf der alten Hoehe eingefuegt/geloescht BOOL bGrowY = ( nNewEndY > nOldEndY ); SCROW nColEndY = bGrowY ? nOldEndY : nNewEndY; SCCOL nRowEndX = bGrowY ? nNewEndX : nOldEndX; - // Spalten + // Spalten - if ( nNewEndX > nOldEndX ) // Spalten einfuegen + if ( nNewEndX > nOldEndX ) // Spalten einfuegen { rColRange = ScRange( nOldEndX+1, nStartY, nTab, nNewEndX, nColEndY, nTab ); rInsCol = TRUE; } - else if ( nNewEndX < nOldEndX ) // Spalten loeschen + else if ( nNewEndX < nOldEndX ) // Spalten loeschen { rColRange = ScRange( nNewEndX+1, nStartY, nTab, nOldEndX, nColEndY, nTab ); rDelCol = TRUE; } - // Zeilen + // Zeilen - if ( nNewEndY > nOldEndY ) // Zeilen einfuegen + if ( nNewEndY > nOldEndY ) // Zeilen einfuegen { rRowRange = ScRange( nStartX, nOldEndY+1, nTab, nRowEndX, nNewEndY, nTab ); rInsRow = TRUE; } - else if ( nNewEndY < nOldEndY ) // Zeilen loeschen + else if ( nNewEndY < nOldEndY ) // Zeilen loeschen { rRowRange = ScRange( nStartX, nNewEndY+1, nTab, nRowEndX, nOldEndY, nTab ); rDelRow = TRUE; @@ -1289,9 +1286,9 @@ BOOL ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew ) ScRange aColRange,aRowRange; lcl_GetInsDelRanges( rOld, rNew, aColRange,bInsCol,bDelCol, aRowRange,bInsRow,bDelRow ); - if ( bInsCol && !CanInsertCol( aColRange ) ) // Zellen am Rand ? + if ( bInsCol && !CanInsertCol( aColRange ) ) // Zellen am Rand ? bOk = FALSE; - if ( bInsRow && !CanInsertRow( aRowRange ) ) // Zellen am Rand ? + if ( bInsRow && !CanInsertRow( aRowRange ) ) // Zellen am Rand ? bOk = FALSE; if ( bInsCol || bDelCol ) @@ -1321,16 +1318,16 @@ void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, BOOL bClear lcl_GetInsDelRanges( rOld, rNew, aColRange,bInsCol,bDelCol, aRowRange,bInsRow,bDelRow ); if ( bInsCol ) - InsertCol( aColRange ); // Spalten zuerst einfuegen + InsertCol( aColRange ); // Spalten zuerst einfuegen if ( bInsRow ) InsertRow( aRowRange ); if ( bDelRow ) - DeleteRow( aRowRange ); // Zeilen zuerst loeschen + DeleteRow( aRowRange ); // Zeilen zuerst loeschen if ( bDelCol ) DeleteCol( aColRange ); - // Referenzen um eingefuegte Zeilen erweitern + // Referenzen um eingefuegte Zeilen erweitern if ( bInsCol || bInsRow ) { @@ -1351,7 +1348,7 @@ void ScDocument::DeleteArea(SCCOL nCol1, SCROW nRow1, PutInOrder( nCol1, nCol2 ); PutInOrder( nRow1, nRow2 ); BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple calculations + SetAutoCalc( FALSE ); // avoid multiple calculations for (SCTAB i = 0; i <= MAXTAB; i++) if (pTab[i]) if ( rMark.GetTableSelect(i) || bIsUndo ) @@ -1369,7 +1366,7 @@ void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1, if ( VALIDTAB(nTab) && pTab[nTab] ) { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple calculations + SetAutoCalc( FALSE ); // avoid multiple calculations pTab[nTab]->DeleteArea(nCol1, nRow1, nCol2, nRow2, nDelFlag); SetAutoCalc( bOldAutoCalc ); } @@ -1486,7 +1483,7 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, if (VALIDTAB(nTab1) && VALIDTAB(nTab2)) { BOOL bOldAutoCalc = pDestDoc->GetAutoCalc(); - pDestDoc->SetAutoCalc( FALSE ); // avoid multiple calculations + pDestDoc->SetAutoCalc( FALSE ); // avoid multiple calculations for (SCTAB i = nTab1; i <= nTab2; i++) { if (pTab[i] && pDestDoc->pTab[i]) @@ -1510,7 +1507,7 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, if (VALIDTAB(nTab1) && VALIDTAB(nTab2)) { BOOL bOldAutoCalc = pDestDoc->GetAutoCalc(); - pDestDoc->SetAutoCalc( FALSE ); // avoid multiple calculations + pDestDoc->SetAutoCalc( FALSE ); // avoid multiple calculations if (nTab1 > 0) CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, FALSE, pDestDoc, pMarks ); @@ -1538,7 +1535,7 @@ void ScDocument::CopyToDocument(const ScRange& rRange, if( !pDestDoc->aDocName.Len() ) pDestDoc->aDocName = aDocName; BOOL bOldAutoCalc = pDestDoc->GetAutoCalc(); - pDestDoc->SetAutoCalc( FALSE ); // avoid multiple calculations + pDestDoc->SetAutoCalc( FALSE ); // avoid multiple calculations for (SCTAB i = aNewRange.aStart.Tab(); i <= aNewRange.aEnd.Tab(); i++) if (pTab[i] && pDestDoc->pTab[i]) pTab[i]->CopyToTable(aNewRange.aStart.Col(), aNewRange.aStart.Row(), @@ -1559,7 +1556,7 @@ void ScDocument::UndoToDocument(const ScRange& rRange, SCTAB nTab2 = aNewRange.aEnd.Tab(); BOOL bOldAutoCalc = pDestDoc->GetAutoCalc(); - pDestDoc->SetAutoCalc( FALSE ); // avoid multiple calculations + pDestDoc->SetAutoCalc( FALSE ); // avoid multiple calculations if (nTab1 > 0) CopyToDocument( 0,0,0, MAXCOL,MAXROW,nTab1-1, IDF_FORMULA, FALSE, pDestDoc, pMarks ); @@ -1610,7 +1607,7 @@ void ScDocument::CopyToClip(const ScClipParam& rClipParam, if (pDrawLayer && bIncludeObjects) { - // also copy drawing objects + // also copy drawing objects Rectangle aObjRect = GetMMRect( aClipRange.aStart.Col(), aClipRange.aStart.Row(), aClipRange.aEnd.Col(), aClipRange.aEnd.Row(), i); pDrawLayer->CopyToClip(pClipDoc, i, aObjRect); @@ -1688,15 +1685,15 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL OSL_ENSURE( bIsClip && pTransClip && pTransClip->bIsClip, "TransposeClip with wrong Document" ); - // initialisieren - // -> pTransClip muss vor dem Original-Dokument geloescht werden! + // initialisieren + // -> pTransClip muss vor dem Original-Dokument geloescht werden! - pTransClip->ResetClip(this, (ScMarkData*)NULL); // alle + pTransClip->ResetClip(this, (ScMarkData*)NULL); // alle - // Bereiche uebernehmen + // Bereiche uebernehmen pTransClip->pRangeName->FreeAll(); - for (USHORT i = 0; i < pRangeName->GetCount(); i++) //! DB-Bereiche Pivot-Bereiche auch !!! + for (USHORT i = 0; i < pRangeName->GetCount(); i++) //! DB-Bereiche Pivot-Bereiche auch !!! { USHORT nIndex = ((ScRangeData*)((*pRangeName)[i]))->GetIndex(); ScRangeData* pData = new ScRangeData(*((*pRangeName)[i])); @@ -1721,11 +1718,11 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL if ( pDrawLayer && ( nFlags & IDF_OBJECTS ) ) { - // Drawing objects are copied to the new area without transposing. - // CopyFromClip is used to adjust the objects to the transposed block's - // cell range area. - // (pDrawLayer in the original clipboard document is set only if there - // are drawing objects to copy) + // Drawing objects are copied to the new area without transposing. + // CopyFromClip is used to adjust the objects to the transposed block's + // cell range area. + // (pDrawLayer in the original clipboard document is set only if there + // are drawing objects to copy) pTransClip->InitDrawLayer(); Rectangle aSourceRect = GetMMRect( aClipRange.aStart.Col(), aClipRange.aStart.Row(), @@ -1745,7 +1742,7 @@ void ScDocument::TransposeClip( ScDocument* pTransClip, USHORT nFlags, BOOL bAsL OSL_TRACE("TransposeClip: Too big"); } - // Dies passiert erst beim Einfuegen... + // Dies passiert erst beim Einfuegen... GetClipParam().mbCutMode = false; } @@ -2008,16 +2005,16 @@ void ScDocument::CopyBlockFromClip( SCCOL nCol1, SCROW nRow1, if ( pCBFCP->pClipDoc->pDrawLayer && ( pCBFCP->nInsFlag & IDF_OBJECTS ) ) { - // also copy drawing objects + // also copy drawing objects // drawing layer must be created before calling CopyFromClip // (ScDocShell::MakeDrawLayer also does InitItems etc.) OSL_ENSURE( pDrawLayer, "CopyBlockFromClip: No drawing layer" ); if ( pDrawLayer ) { - // For GetMMRect, the row heights in the target document must already be valid - // (copied in an extra step before pasting, or updated after pasting cells, but - // before pasting objects). + // For GetMMRect, the row heights in the target document must already be valid + // (copied in an extra step before pasting, or updated after pasting cells, but + // before pasting objects). Rectangle aSourceRect = pCBFCP->pClipDoc->GetMMRect( nCol1-nDx, nRow1-nDy, nCol2-nDx, nRow2-nDy, nClipTab ); @@ -2078,10 +2075,10 @@ void ScDocument::CopyNonFilteredFromClip( SCCOL nCol1, SCROW nRow1, const ScCopyBlockFromClipParams* pCBFCP, SCROW & rClipStartRow ) { - // call CopyBlockFromClip for ranges of consecutive non-filtered rows - // nCol1/nRow1 etc. is in target doc + // call CopyBlockFromClip for ranges of consecutive non-filtered rows + // nCol1/nRow1 etc. is in target doc - // filtered state is taken from first used table in clipboard (as in GetClipArea) + // filtered state is taken from first used table in clipboard (as in GetClipArea) SCTAB nFlagTab = 0; ScTable** ppClipTab = pCBFCP->pClipDoc->pTab; while ( nFlagTab < MAXTAB && !ppClipTab[nFlagTab] ) @@ -2137,7 +2134,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar if (pClipDoc->bIsClip && pClipDoc->GetTableCount()) { BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple recalculations + SetAutoCalc( FALSE ); // avoid multiple recalculations NumFmtMergeHandler aNumFmtMergeHdl(this, pClipDoc); @@ -2187,8 +2184,8 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar nDelFlag |= IDF_NOTE; else if ( nInsFlag & IDF_CONTENTS ) nDelFlag |= IDF_CONTENTS; - // With bSkipAttrForEmpty, don't remove attributes, copy - // on top of existing attributes instead. + // With bSkipAttrForEmpty, don't remove attributes, copy + // on top of existing attributes instead. if ( ( nInsFlag & IDF_ATTRIB ) && !bSkipAttrForEmpty ) nDelFlag |= IDF_ATTRIB; @@ -2196,14 +2193,14 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar aCBFCP.pRefUndoDoc = pRefUndoDoc; aCBFCP.pClipDoc = pClipDoc; aCBFCP.nInsFlag = nInsFlag; - aCBFCP.bAsLink = bAsLink; + aCBFCP.bAsLink = bAsLink; aCBFCP.bSkipAttrForEmpty = bSkipAttrForEmpty; - aCBFCP.nTabStart = MAXTAB; // wird in der Schleife angepasst - aCBFCP.nTabEnd = 0; // wird in der Schleife angepasst + aCBFCP.nTabStart = MAXTAB; // wird in der Schleife angepasst + aCBFCP.nTabEnd = 0; // wird in der Schleife angepasst - // Inc/DecRecalcLevel einmal aussen, damit nicht fuer jeden Block - // die Draw-Seitengroesse neu berechnet werden muss - //! nur wenn ganze Zeilen/Spalten kopiert werden? + // Inc/DecRecalcLevel einmal aussen, damit nicht fuer jeden Block + // die Draw-Seitengroesse neu berechnet werden muss + //! nur wenn ganze Zeilen/Spalten kopiert werden? for (SCTAB j = 0; j <= MAXTAB; j++) if (pTab[j] && rMark.GetTableSelect(j)) @@ -2221,7 +2218,7 @@ void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMar pDestRanges = &aLocalRangeList; } - bInsertingFromOtherDoc = TRUE; // kein Broadcast/Listener aufbauen bei Insert + bInsertingFromOtherDoc = TRUE; // kein Broadcast/Listener aufbauen bei Insert // bei mindestens 64 Zeilen wird in ScColumn::CopyFromClip voralloziert BOOL bDoDouble = ( nYw < 64 && nAllRow2 - nAllRow1 > 64); @@ -2506,8 +2503,8 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered nClipY = nEndRow - nStartRow; else { - // count non-filtered rows - // count on first used table in clipboard + // count non-filtered rows + // count on first used table in clipboard SCTAB nCountTab = 0; while ( nCountTab < MAXTAB && !pTab[nCountTab] ) ++nCountTab; @@ -2517,7 +2514,7 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, BOOL bIncludeFiltered if ( nResult > 0 ) nClipY = nResult - 1; else - nClipY = 0; // always return at least 1 row + nClipY = 0; // always return at least 1 row } } @@ -2542,7 +2539,7 @@ void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY) BOOL ScDocument::HasClipFilteredRows() { - // count on first used table in clipboard + // count on first used table in clipboard SCTAB nCountTab = 0; while ( nCountTab < MAXTAB && !pTab[nCountTab] ) ++nCountTab; @@ -2580,7 +2577,7 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, { USHORT nDelFlags = nFlags; if (nDelFlags & IDF_CONTENTS) - nDelFlags |= IDF_CONTENTS; // immer alle Inhalte oder keine loeschen! + nDelFlags |= IDF_CONTENTS; // immer alle Inhalte oder keine loeschen! SCTAB nSrcTab = rSrcArea.aStart.Tab(); @@ -2594,7 +2591,7 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, BOOL bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS ); BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple calculations + SetAutoCalc( FALSE ); // avoid multiple calculations SCTAB nCount = GetTableCount(); for (SCTAB i=0; i<nCount; i++) @@ -2638,7 +2635,7 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, { USHORT nDelFlags = nFlags; if (nDelFlags & IDF_CONTENTS) - nDelFlags |= IDF_CONTENTS; // immer alle Inhalte oder keine loeschen! + nDelFlags |= IDF_CONTENTS; // immer alle Inhalte oder keine loeschen! if (ValidTab(nSrcTab) && pTab[nSrcTab]) { @@ -2646,7 +2643,7 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, BOOL bDoMix = ( bSkipEmpty || nFunction ) && ( nFlags & IDF_CONTENTS ); BOOL bOldAutoCalc = GetAutoCalc(); - SetAutoCalc( FALSE ); // avoid multiple calculations + SetAutoCalc( FALSE ); // avoid multiple calculations ScRange aArea; rMark.GetMultiMarkArea( aArea ); @@ -2697,7 +2694,7 @@ void ScDocument::PutCell( SCCOL nCol, SCROW nRow, SCTAB nTab, ScBaseCell* pCell, { if ( bForceTab && !pTab[nTab] ) { - BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags + BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags pTab[nTab] = new ScTable(this, nTab, String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")), @@ -2716,7 +2713,7 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT SCTAB nTab = rPos.Tab(); if ( bForceTab && !pTab[nTab] ) { - BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags + BOOL bExtras = !bIsUndo; // Spaltenbreiten, Zeilenhoehen, Flags pTab[nTab] = new ScTable(this, nTab, String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("temp")), @@ -2729,7 +2726,7 @@ void ScDocument::PutCell( const ScAddress& rPos, ScBaseCell* pCell, BOOL bForceT } -BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, +BOOL ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rString, ScSetStringParam* pParam ) { if ( ValidTab(nTab) && pTab[nTab] ) @@ -2925,7 +2922,7 @@ BOOL ScDocument::HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const BOOL ScDocument::HasStringCells( const ScRange& rRange ) const { - // TRUE, wenn String- oder Editzellen im Bereich + // TRUE, wenn String- oder Editzellen im Bereich SCCOL nStartCol = rRange.aStart.Col(); SCROW nStartRow = rRange.aStart.Row(); @@ -3012,16 +3009,16 @@ void ScDocument::InitializeAllNoteCaptions( bool bForced ) void ScDocument::SetDirty() { BOOL bOldAutoCalc = GetAutoCalc(); - bAutoCalc = FALSE; // keine Mehrfachberechnung + bAutoCalc = FALSE; // keine Mehrfachberechnung { // scope for bulk broadcast ScBulkBroadcast aBulkBroadcast( GetBASM()); for (SCTAB i=0; i<=MAXTAB; i++) if (pTab[i]) pTab[i]->SetDirty(); } - // Charts werden zwar auch ohne AutoCalc im Tracking auf Dirty gesetzt, - // wenn alle Formeln dirty sind, werden die Charts aber nicht mehr erwischt - // (#45205#) - darum alle Charts nochmal explizit + // Charts werden zwar auch ohne AutoCalc im Tracking auf Dirty gesetzt, + // wenn alle Formeln dirty sind, werden die Charts aber nicht mehr erwischt + // (#45205#) - darum alle Charts nochmal explizit if (pChartListenerCollection) pChartListenerCollection->SetDirty(); @@ -3032,7 +3029,7 @@ void ScDocument::SetDirty() void ScDocument::SetDirty( const ScRange& rRange ) { BOOL bOldAutoCalc = GetAutoCalc(); - bAutoCalc = FALSE; // keine Mehrfachberechnung + bAutoCalc = FALSE; // keine Mehrfachberechnung { // scope for bulk broadcast ScBulkBroadcast aBulkBroadcast( GetBASM()); SCTAB nTab2 = rRange.aEnd.Tab(); @@ -3046,7 +3043,7 @@ void ScDocument::SetDirty( const ScRange& rRange ) void ScDocument::SetTableOpDirty( const ScRange& rRange ) { BOOL bOldAutoCalc = GetAutoCalc(); - bAutoCalc = FALSE; // no multiple recalculation + bAutoCalc = FALSE; // no multiple recalculation SCTAB nTab2 = rRange.aEnd.Tab(); for (SCTAB i=rRange.aStart.Tab(); i<=nTab2; i++) if (pTab[i]) pTab[i]->SetTableOpDirty( rRange ); @@ -3148,8 +3145,8 @@ void ScDocument::CalcAfterLoad() { SCTAB i; - if (bIsClip) // Excel-Dateien werden aus dem Clipboard in ein Clip-Doc geladen - return; // dann wird erst beim Einfuegen in das richtige Doc berechnet + if (bIsClip) // Excel-Dateien werden aus dem Clipboard in ein Clip-Doc geladen + return; // dann wird erst beim Einfuegen in das richtige Doc berechnet bCalcingAfterLoad = TRUE; for ( i = 0; i <= MAXTAB; i++) @@ -3158,7 +3155,7 @@ void ScDocument::CalcAfterLoad() if (pTab[i]) pTab[i]->SetDirtyAfterLoad(); bCalcingAfterLoad = FALSE; - SetDetectiveDirty(FALSE); // noch keine wirklichen Aenderungen + SetDetectiveDirty(FALSE); // noch keine wirklichen Aenderungen // #i112436# If formula cells are already dirty, they don't broadcast further changes. // So the source ranges of charts must be interpreted even if they are not visible, @@ -3194,7 +3191,7 @@ void ScDocument::ResetChanged( const ScRange& rRange ) } // -// Spaltenbreiten / Zeilenhoehen -------------------------------------- +// Spaltenbreiten / Zeilenhoehen -------------------------------------- // @@ -3391,7 +3388,7 @@ BOOL ScDocument::SetOptimalHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, U const Fraction& rZoomX, const Fraction& rZoomY, BOOL bShrink ) { -//! MarkToMulti(); +//! MarkToMulti(); if ( ValidTab(nTab) && pTab[nTab] ) return pTab[nTab]->SetOptimalHeight( nStartRow, nEndRow, nExtra, pDev, nPPTX, nPPTY, rZoomX, rZoomY, bShrink ); @@ -3425,7 +3422,7 @@ void ScDocument::UpdateAllRowHeights( OutputDevice* pDev, double nPPTX, double n // -// Spalten-/Zeilen-Flags ---------------------------------------------- +// Spalten-/Zeilen-Flags ---------------------------------------------- // void ScDocument::ShowCol(SCCOL nCol, SCTAB nTab, BOOL bShow) @@ -3611,7 +3608,7 @@ bool ScDocument::RowHidden(SCROW nRow, SCTAB nTab, SCROW& rLastRow) { if (!ValidTab(nTab) || !pTab[nTab]) { - rLastRow = nRow; + rLastRow = nRow; return false; } @@ -3631,7 +3628,7 @@ bool ScDocument::ColHidden(SCCOL nCol, SCTAB nTab, SCCOL& rLastCol) { if (!ValidTab(nTab) || !pTab[nTab]) { - rLastCol = nCol; + rLastCol = nCol; return false; } @@ -3811,7 +3808,7 @@ SCCOL ScDocument::GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const SCROW ScDocument::GetNextDifferentChangedRow( SCTAB nTab, SCROW nStart, bool bCareManualSize) const { const ScBitMaskCompressedArray< SCROW, BYTE> * pRowFlagsArray; - if ( ValidTab(nTab) && pTab[nTab] && ((pRowFlagsArray = pTab[nTab]->GetRowFlagsArray()) != NULL) && + if ( ValidTab(nTab) && pTab[nTab] && ((pRowFlagsArray = pTab[nTab]->GetRowFlagsArray()) != NULL) && pTab[nTab]->mpRowHeights && pTab[nTab]->mpHiddenRows ) { size_t nIndex; // ignored @@ -3917,7 +3914,7 @@ void ScDocument::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, S } // -// Attribute ---------------------------------------------------------- +// Attribute ---------------------------------------------------------- // const SfxPoolItem* ScDocument::GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, USHORT nWhich ) const @@ -4066,7 +4063,7 @@ void ScDocument::ApplySelectionLineStyle( const ScMarkData& rMark, } -const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const +const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { if ( VALIDTAB(nTab) && pTab[nTab] ) return pTab[nTab]->GetStyle(nCol, nRow); @@ -4075,10 +4072,10 @@ const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) c } -const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) const +const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) const { - BOOL bEqual = TRUE; - BOOL bFound; + BOOL bEqual = TRUE; + BOOL bFound; const ScStyleSheet* pStyle = NULL; const ScStyleSheet* pNewStyle; @@ -4091,7 +4088,7 @@ const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con if (bFound) { if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } } @@ -4108,7 +4105,7 @@ const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con if (bFound) { if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } } @@ -4130,7 +4127,7 @@ void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, BOOL b if ( pStyleSheet && pStyleSheet->GetName() == ScGlobal::GetRscString(STR_STYLENAME_STANDARD) ) { - // update attributes for all note objects + // update attributes for all note objects ScDetectiveFunc::UpdateAllComments( *this ); } } @@ -4224,13 +4221,13 @@ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, BOOL { ScMergePatternState aState; - if ( rMark.IsMultiMarked() ) // multi selection + if ( rMark.IsMultiMarked() ) // multi selection { for (SCTAB i=0; i<=MAXTAB; i++) if (pTab[i] && rMark.GetTableSelect(i)) pTab[i]->MergeSelectionPattern( aState, rMark, bDeep ); } - if ( rMark.IsMarked() ) // simle selection + if ( rMark.IsMarked() ) // simle selection { ScRange aRange; rMark.GetMarkArea(aRange); @@ -4245,7 +4242,7 @@ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, BOOL if (aState.pItemSet) return new ScPatternAttr( aState.pItemSet ); else - return new ScPatternAttr( GetPool() ); // empty + return new ScPatternAttr( GetPool() ); // empty } @@ -4258,8 +4255,8 @@ const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, B void ScDocument::GetSelectionFrame( const ScMarkData& rMark, - SvxBoxItem& rLineOuter, - SvxBoxInfoItem& rLineInner ) + SvxBoxItem& rLineOuter, + SvxBoxInfoItem& rLineInner ) { rLineOuter.SetLine(NULL, BOX_LINE_TOP); rLineOuter.SetLine(NULL, BOX_LINE_BOTTOM); @@ -4288,7 +4285,7 @@ void ScDocument::GetSelectionFrame( const ScMarkData& rMark, aRange.aEnd.Col(), aRange.aEnd.Row() ); } - // Don't care Status auswerten + // Don't care Status auswerten rLineInner.SetValid( VALID_LEFT, ( aFlags.nLeft != SC_LINE_DONTCARE ) ); rLineInner.SetValid( VALID_RIGHT, ( aFlags.nRight != SC_LINE_DONTCARE ) ); @@ -4403,7 +4400,7 @@ void ScDocument::GetBorderLines( SCCOL nCol, SCROW nRow, SCTAB nTab, const SvxBorderLine** ppLeft, const SvxBorderLine** ppTop, const SvxBorderLine** ppRight, const SvxBorderLine** ppBottom ) const { - //! Seitengrenzen fuer Druck beruecksichtigen !!!!! + //! Seitengrenzen fuer Druck beruecksichtigen !!!!! const SvxBoxItem* pThisAttr = (const SvxBoxItem*) GetEffItem( nCol, nRow, nTab, ATTR_BORDER ); DBG_ASSERT(pThisAttr,"wo ist das Attribut?"); @@ -4586,7 +4583,7 @@ BOOL ScDocument::HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRo BOOL ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMatrix ) { - // if rCell is part of a matrix formula, return its complete range + // if rCell is part of a matrix formula, return its complete range BOOL bRet = FALSE; ScBaseCell* pCell = GetCell( rCellPos ); @@ -4645,7 +4642,7 @@ BOOL ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, IsVerOverlapped()) --rStartRow; - //! weiterreichen ? + //! weiterreichen ? ScAttrArray* pAttrArray = pTab[nTab]->aCol[nOldCol].pAttrArray; SCSIZE nIndex; @@ -4764,8 +4761,8 @@ BOOL ScDocument::ExtendMerge( ScRange& rRange, BOOL bRefresh, BOOL bAttrs ) BOOL ScDocument::ExtendTotalMerge( ScRange& rRange ) { - // Bereich genau dann auf zusammengefasste Zellen erweitern, wenn - // dadurch keine neuen nicht-ueberdeckten Zellen getroffen werden + // Bereich genau dann auf zusammengefasste Zellen erweitern, wenn + // dadurch keine neuen nicht-ueberdeckten Zellen getroffen werden BOOL bRet = FALSE; ScRange aExt = rRange; @@ -4837,11 +4834,11 @@ BOOL ScDocument::RefreshAutoFilter( SCCOL nStartCol, SCROW nStartRow, SCCOL nDBEndCol; SCROW nDBEndRow; - // Autofilter loeschen + // Autofilter loeschen BOOL bChange = RemoveFlagsTab( nStartCol,nStartRow, nEndCol,nEndRow, nTab, SC_MF_AUTO ); - // Autofilter setzen + // Autofilter setzen for (i=0; i<nCount; i++) { @@ -5058,7 +5055,7 @@ void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, } // -// Datei-Operationen +// Datei-Operationen // @@ -5217,8 +5214,8 @@ BOOL ScDocument::HasManualBreaks( SCTAB nTab ) const void ScDocument::GetDocStat( ScDocStat& rDocStat ) { rDocStat.nTableCount = GetTableCount(); - rDocStat.aDocName = aDocName; - rDocStat.nCellCount = GetCellCount(); + rDocStat.aDocName = aDocName; + rDocStat.nCellCount = GetCellCount(); } @@ -5334,8 +5331,8 @@ void ScDocument::RestorePrintRanges( const ScPrintRangeSaver& rSaver ) BOOL ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const { // Die Seitennummern-Zaehlung faengt bei einer Tabelle neu an, wenn eine - // andere Vorlage als bei der vorherigen gesetzt ist (nur Namen vergleichen) - // und eine Seitennummer angegeben ist (nicht 0) + // andere Vorlage als bei der vorherigen gesetzt ist (nur Namen vergleichen) + // und eine Seitennummer angegeben ist (nicht 0) if ( nTab < MAXTAB && pTab[nTab] && pTab[nTab+1] ) { @@ -5348,12 +5345,12 @@ BOOL ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const const SfxItemSet& rSet = pStyle->GetItemSet(); USHORT nFirst = ((const SfxUInt16Item&)rSet.Get(ATTR_PAGE_FIRSTPAGENO)).GetValue(); if ( nFirst != 0 ) - return TRUE; // Seitennummer in neuer Vorlage angegeben + return TRUE; // Seitennummer in neuer Vorlage angegeben } } } - return FALSE; // sonst nicht + return FALSE; // sonst nicht } SfxUndoManager* ScDocument::GetUndoManager() diff --git a/sc/source/core/data/dpcachetable.cxx b/sc/source/core/data/dpcachetable.cxx index b371a30b7542..a87bd803e596 100644 --- a/sc/source/core/data/dpcachetable.cxx +++ b/sc/source/core/data/dpcachetable.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 @@ -89,7 +89,7 @@ bool ScDPCacheTable::FilterItem::match( const ScDPItemData& rCellData ) const } // ---------------------------------------------------------------------------- -ScDPCacheTable::SingleFilter::SingleFilter(String aString, double fValue, bool bHasValue) +ScDPCacheTable::SingleFilter::SingleFilter(String aString, double fValue, bool bHasValue) { maItem.maString = aString; maItem.mfValue = fValue; @@ -118,7 +118,7 @@ bool ScDPCacheTable::SingleFilter::hasValue() const // ---------------------------------------------------------------------------- -ScDPCacheTable::GroupFilter::GroupFilter() +ScDPCacheTable::GroupFilter::GroupFilter() { } @@ -158,8 +158,8 @@ ScDPCacheTable::Criterion::Criterion() : // ---------------------------------------------------------------------------- -ScDPCacheTable::ScDPCacheTable( ScDocument* pDoc,long nId ) : - mpCache( NULL ), +ScDPCacheTable::ScDPCacheTable( ScDocument* pDoc,long nId ) : + mpCache( NULL ), mpNoneCache( NULL ) { if ( nId >= 0 ) @@ -190,7 +190,7 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, if ( mpCache == NULL ) InitNoneCache( NULL ); //check cache - const SCROW nRowCount = getRowSize(); + const SCROW nRowCount = getRowSize(); const SCCOL nColCount = (SCCOL) getColSize(); if ( nRowCount <= 0 || nColCount <= 0) return; @@ -202,7 +202,7 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, // Initialize field entries container. maFieldEntries.clear(); maFieldEntries.reserve(nColCount); - + // Data rows for (SCCOL nCol = 0; nCol < nColCount; ++nCol) { @@ -215,11 +215,11 @@ void ScDPCacheTable::fillTable( const ScQueryParam& rQuery, BOOL* pSpecial, { SCROW nIndex = GetCache()->GetItemDataId( nCol, nRow, bRepeatIfEmpty ); SCROW nOrder = GetCache()->GetOrder( nCol, nIndex ); - + if ( nCol == 0 ) maRowsVisible.push_back(false); - if ( lcl_HasQueryEntry(rQuery) && + if ( lcl_HasQueryEntry(rQuery) && !GetCache()->ValidQuery( nRow , rQuery, pSpecial ) ) continue; if ( bIgnoreEmptyRows && GetCache()->IsRowEmpty( nRow ) ) @@ -245,7 +245,7 @@ void ScDPCacheTable::fillTable() if ( mpCache == NULL ) InitNoneCache( NULL ); //check cache - const SCROW nRowCount = getRowSize(); + const SCROW nRowCount = getRowSize(); const SCCOL nColCount = (SCCOL) getColSize(); if ( nRowCount <= 0 || nColCount <= 0) return; @@ -257,7 +257,7 @@ void ScDPCacheTable::fillTable() // Initialize field entries container. maFieldEntries.clear(); maFieldEntries.reserve(nColCount); - + // Data rows for (SCCOL nCol = 0; nCol < nColCount; ++nCol) { @@ -270,7 +270,7 @@ void ScDPCacheTable::fillTable() { SCROW nIndex = GetCache()->GetItemDataId( nCol, nRow, false ); SCROW nOrder = GetCache()->GetOrder( nCol, nIndex ); - + if ( nCol == 0 ) maRowsVisible.push_back(true); @@ -311,7 +311,7 @@ void ScDPCacheTable::filterByPageDimension(const vector<Criterion>& rCriteria, c } const ScDPItemData* ScDPCacheTable::getCell(SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const -{ +{ SCROW nId= GetCache()->GetItemDataId(nCol, nRow, bRepeatIfEmpty); return GetCache()->GetItemDataById( nCol, nId ); } @@ -319,7 +319,7 @@ const ScDPItemData* ScDPCacheTable::getCell(SCCOL nCol, SCROW nRow, bool bRepeat void ScDPCacheTable::getValue( ScDPValueData& rVal, SCCOL nCol, SCROW nRow, bool bRepeatIfEmpty) const { const ScDPItemData* pData = getCell( nCol, nRow, bRepeatIfEmpty ); - + if (pData) { rVal.fValue = pData->IsValue() ? pData->GetValue() : 0.0; @@ -349,7 +349,7 @@ const ::std::vector<SCROW>& ScDPCacheTable::getFieldEntries( sal_Int32 nColumn return maFieldEntries[nColumn]; } -void ScDPCacheTable::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData, +void ScDPCacheTable::filterTable(const vector<Criterion>& rCriteria, Sequence< Sequence<Any> >& rTabData, const hash_set<sal_Int32>& rRepeatIfEmptyDims) { sal_Int32 nRowSize = getRowSize(); diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index f8b06fbb0dd1..5cff12a533da 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.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/core/data/dpglobal.cxx b/sc/source/core/data/dpglobal.cxx index 4ce715600a9c..43ff45e43314 100644 --- a/sc/source/core/data/dpglobal.cxx +++ b/sc/source/core/data/dpglobal.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -85,7 +85,7 @@ namespace ScDPGlobal { continue; } - return false; + return false; } } } @@ -94,7 +94,7 @@ namespace ScDPGlobal return true; } //end - + } // -------------------------------------------------------------------- // ScDPItemDataPool @@ -127,16 +127,16 @@ sal_Int32 ScDPItemDataPool::getDataId( const ScDPItemData& aData ) DataHash::const_iterator itr = maItemIds.find( aData), itrEnd = maItemIds.end(); if ( itr == itrEnd ) - // not exist + // not exist return -1; - + else //exist return itr->second; } sal_Int32 ScDPItemDataPool::insertData( const ScDPItemData& aData ) -{ +{ sal_Int32 nResult = getDataId( aData ); if( nResult < 0 ) diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 216d90352c9d..46e1cf73f7c6 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.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 @@ -80,8 +80,8 @@ const sal_Int32 SC_DP_DATE_FIRST = -1; const sal_Int32 SC_DP_DATE_LAST = 10000; // ============================================================================ -namespace -{ +namespace +{ BOOL lcl_Search( SCCOL nSourceDim, ScDPTableDataCache* pCache , const std::vector< SCROW >& vIdx, SCROW nNew , SCROW& rIndex) { rIndex = vIdx.size(); @@ -93,7 +93,7 @@ namespace while (nLo <= nHi) { nIndex = (nLo + nHi) / 2; - + const ScDPItemData* pData = pCache->GetItemDataById( nSourceDim, vIdx[nIndex] ); const ScDPItemData* pDataInsert = pCache->GetItemDataById( nSourceDim, nNew ); @@ -116,9 +116,9 @@ namespace void lcl_Insert( SCCOL nSourceDim, ScDPTableDataCache* pCache , std::vector< SCROW >& vIdx, SCROW nNew ) { - SCROW nIndex = 0; - if ( !lcl_Search( nSourceDim, pCache, vIdx, nNew ,nIndex ) ) - vIdx.insert( vIdx.begin()+nIndex, nNew ); + SCROW nIndex = 0; + if ( !lcl_Search( nSourceDim, pCache, vIdx, nNew ,nIndex ) ) + vIdx.insert( vIdx.begin()+nIndex, nNew ); } template<bool bUpdateData> @@ -280,7 +280,7 @@ namespace class ScDPGroupDateFilter : public ScDPCacheTable::FilterBase { public: - ScDPGroupDateFilter(double fMatchValue, sal_Int32 nDatePart, + ScDPGroupDateFilter(double fMatchValue, sal_Int32 nDatePart, const Date* pNullDate, const ScDPNumGroupInfo* pNumInfo); // Wang Xu Ming -- 2009-8-17 @@ -299,7 +299,7 @@ private: // ---------------------------------------------------------------------------- -ScDPGroupDateFilter::ScDPGroupDateFilter(double fMatchValue, sal_Int32 nDatePart, +ScDPGroupDateFilter::ScDPGroupDateFilter(double fMatchValue, sal_Int32 nDatePart, const Date* pNullDate, const ScDPNumGroupInfo* pNumInfo) : mpNullDate(pNullDate), mpNumInfo(pNumInfo), @@ -317,7 +317,7 @@ bool ScDPGroupDateFilter::match( const ScDPItemData & rCellData ) const if ( !rCellData.IsValue() ) return false; -// ScDPCacheCell rCell( rCellData.fValue ); +// ScDPCacheCell rCell( rCellData.fValue ); if (!mpNumInfo) return false; @@ -330,7 +330,7 @@ bool ScDPGroupDateFilter::match( const ScDPItemData & rCellData ) const if ( rCellData.GetValue() > mpNumInfo->End && !approxEqual(rCellData.GetValue(), mpNumInfo->End) ) return static_cast<sal_Int32>(mfMatchValue) == SC_DP_DATE_LAST; - if (mnDatePart == DataPilotFieldGroupBy::HOURS || mnDatePart == DataPilotFieldGroupBy::MINUTES || + if (mnDatePart == DataPilotFieldGroupBy::HOURS || mnDatePart == DataPilotFieldGroupBy::MINUTES || mnDatePart == DataPilotFieldGroupBy::SECONDS) { // handle time @@ -594,7 +594,7 @@ BOOL lcl_DateContained( sal_Int32 nGroupPart, const ScDPItemData& rGroupData, bContained = ( nGroupValue == nCompare ); } break; - + // other parts: everything is contained } @@ -674,16 +674,16 @@ void ScDPDateGroupHelper::FillColumnEntries( SCCOL nSourceDim, ScDPTableDataCach for ( sal_Int32 nValue = nStart; nValue <= nEnd; nValue++ ) { - String aName = lcl_GetDateGroupName( nDatePart, nValue, pFormatter ); + String aName = lcl_GetDateGroupName( nDatePart, nValue, pFormatter ); lcl_InsertValue<false>( nSourceDim, pCache, rEntries, aName, nValue, nDatePart ); } // add first/last entry (min/max) - String aFirstName = lcl_GetSpecialDateName( aNumInfo.Start, true, pFormatter ); + String aFirstName = lcl_GetSpecialDateName( aNumInfo.Start, true, pFormatter ); lcl_InsertValue<true>( nSourceDim, pCache, rEntries, aFirstName, SC_DP_DATE_FIRST, nDatePart ); - String aLastName = lcl_GetSpecialDateName( aNumInfo.End, false, pFormatter ); - lcl_InsertValue<true>( nSourceDim, pCache, rEntries, aLastName, SC_DP_DATE_LAST, nDatePart ); + String aLastName = lcl_GetSpecialDateName( aNumInfo.End, false, pFormatter ); + lcl_InsertValue<true>( nSourceDim, pCache, rEntries, aLastName, SC_DP_DATE_LAST, nDatePart ); } // ----------------------------------------------------------------------- @@ -752,13 +752,13 @@ ScDPGroupDimension::ScDPGroupDimension( const ScDPGroupDimension& rOther ) : nGroupDim( rOther.nGroupDim ), aGroupName( rOther.aGroupName ), pDateHelper( NULL ), - aItems( rOther.aItems ) + aItems( rOther.aItems ) { if ( rOther.pDateHelper ) pDateHelper = new ScDPDateGroupHelper( *rOther.pDateHelper ); } -ScDPGroupDimension& ScDPGroupDimension::operator=( const ScDPGroupDimension& rOther ) +ScDPGroupDimension& ScDPGroupDimension::operator=( const ScDPGroupDimension& rOther ) { nSourceDim = rOther.nSourceDim; nGroupDim = rOther.nGroupDim; @@ -795,8 +795,8 @@ const std::vector< SCROW >& ScDPGroupDimension::GetColumnEntries( const ScDPCac { if ( maMemberEntries.empty() ) { - if ( pDateHelper ) - { + if ( pDateHelper ) + { pDateHelper->FillColumnEntries( (SCCOL)GetSourceDim(), rCacheTable.GetCache(), maMemberEntries, rOriginal ); } else @@ -853,7 +853,7 @@ const ScDPGroupItem* ScDPGroupDimension::GetGroupByIndex( size_t nIndex ) const void ScDPGroupDimension::DisposeData() { - maMemberEntries.clear(); + maMemberEntries.clear(); } // ----------------------------------------------------------------------- @@ -862,7 +862,7 @@ ScDPNumGroupDimension::ScDPNumGroupDimension() : pDateHelper( NULL ), bHasNonInteger( false ), cDecSeparator( 0 ) -{ +{ } ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupInfo& rInfo ) : @@ -872,7 +872,7 @@ ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupInfo& rInfo ) : cDecSeparator( 0 ) { } - + ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupDimension& rOther ) : aGroupInfo( rOther.aGroupInfo ), pDateHelper( NULL ), @@ -947,7 +947,7 @@ const std::vector< SCROW >& ScDPNumGroupDimension::GetNumEntries( SCCOL nSourceD for (size_t nOriginalPos=0; nOriginalPos<nOriginalCount; nOriginalPos++) { const ScDPItemData* pItemData = pCache->GetItemDataById( nSourceDim , rOriginal[nOriginalPos] ); - + if ( pItemData && pItemData ->HasStringData() ) { lcl_Insert( nSourceDim, pCache, maMemberEntries, rOriginal[nOriginalPos] ); @@ -1004,7 +1004,7 @@ const std::vector< SCROW >& ScDPNumGroupDimension::GetNumEntries( SCCOL nSourceD { String aName = lcl_GetNumGroupName( fLoop, aGroupInfo, bHasNonInteger, cDecSeparator, pFormatter ); // create a numerical entry to ensure proper sorting - // (in FillMemberResults this needs special handling) + // (in FillMemberResults this needs special handling) lcl_InsertValue<true>( nSourceDim, pCache, maMemberEntries, aName, fLoop ); ++nLoopCount; fLoop = aGroupInfo.Start + nLoopCount * aGroupInfo.Step; @@ -1017,7 +1017,7 @@ const std::vector< SCROW >& ScDPNumGroupDimension::GetNumEntries( SCCOL nSourceD lcl_InsertValue<true>( nSourceDim, pCache, maMemberEntries, aFirstName, aGroupInfo.Start - aGroupInfo.Step ); String aLastName = lcl_GetSpecialNumGroupName( aGroupInfo.End, false, cDecSeparator, aGroupInfo.DateValues, pFormatter ); - lcl_InsertValue<true>( nSourceDim, pCache, maMemberEntries, aLastName, aGroupInfo.End + aGroupInfo.Step ); + lcl_InsertValue<true>( nSourceDim, pCache, maMemberEntries, aLastName, aGroupInfo.End + aGroupInfo.Step ); } } return maMemberEntries; @@ -1092,7 +1092,7 @@ long ScDPGroupTableData::GetMembersCount( long nDim ) const std::vector< SCROW >& members = GetColumnEntries( nDim ); return members.size(); } -const std::vector< SCROW >& ScDPGroupTableData::GetColumnEntries( long nColumn ) +const std::vector< SCROW >& ScDPGroupTableData::GetColumnEntries( long nColumn ) { if ( nColumn >= nSourceCount ) { @@ -1119,11 +1119,11 @@ const std::vector< SCROW >& ScDPGroupTableData::GetColumnEntries( long nColumn } const ScDPItemData* ScDPGroupTableData::GetMemberById( long nDim, long nId ) -{ +{ if ( nDim >= nSourceCount ) { if ( getIsDataLayoutDimension( nDim) ) - nDim = nSourceCount; + nDim = nSourceCount; else { const ScDPGroupDimension& rGroupDim = aGroups[nDim - nSourceCount]; @@ -1245,7 +1245,7 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector<ScDPCacheTable::Criterion>& ScDPCacheTable::Criterion aCri; aCri.mnFieldIndex = itr->mnFieldIndex; aCri.mpFilter.reset(new ScDPGroupDateFilter( - pFilter->getMatchValue(), pDateHelper->GetDatePart(), + pFilter->getMatchValue(), pDateHelper->GetDatePart(), pDoc->GetFormatTable()->GetNullDate(), &pDateHelper->GetNumInfo())); aNewCriteria.push_back(aCri); @@ -1270,7 +1270,7 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector<ScDPCacheTable::Criterion>& ScDPCacheTable::Criterion aCri; aCri.mnFieldIndex = nSrcDim; // use the source dimension, not the group dimension. aCri.mpFilter.reset(new ScDPGroupDateFilter( - pFilter->getMatchValue(), pDateHelper->GetDatePart(), + pFilter->getMatchValue(), pDateHelper->GetDatePart(), pDoc->GetFormatTable()->GetNullDate(), &pDateHelper->GetNumInfo())); aNewCriteria.push_back(aCri); @@ -1293,13 +1293,13 @@ void ScDPGroupTableData::ModifyFilterCriteria(vector<ScDPCacheTable::Criterion>& // End Comments if (!pGrpItem || !pGrpItem->GetName().IsCaseInsEqual(aName)) continue; - + ScDPCacheTable::Criterion aCri; aCri.mnFieldIndex = nSrcDim; aCri.mpFilter.reset(new ScDPCacheTable::GroupFilter()); - ScDPCacheTable::GroupFilter* pGrpFilter = + ScDPCacheTable::GroupFilter* pGrpFilter = static_cast<ScDPCacheTable::GroupFilter*>(aCri.mpFilter.get()); - + pGrpItem->FillGroupFilter(*pGrpFilter); aNewCriteria.push_back(aCri); } @@ -1373,7 +1373,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt pDateHelper = rGroupDim.GetDateHelper(); if ( !pDateHelper ) // date is handled below { - const ScDPGroupItem* pGroupItem = rGroupDim.GetGroupForData( *GetMemberById( nSourceDim, pItemDataIndex[nDim] )); + const ScDPGroupItem* pGroupItem = rGroupDim.GetGroupForData( *GetMemberById( nSourceDim, pItemDataIndex[nDim] )); if ( pGroupItem ) pItemDataIndex[nDim] = pCache->GetAdditionalItemID( pGroupItem->GetName() ); } @@ -1401,7 +1401,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt } if ( pDateHelper ) - { + { const ScDPItemData* pData = GetCacheTable().GetCache()->GetItemDataById( (SCCOL)nSourceDim, pItemDataIndex[nDim]); if ( pData ->IsValue() ) { @@ -1410,7 +1410,7 @@ void ScDPGroupTableData::FillGroupValues( /*ScDPItemData* pItemData*/ SCROW* pIt &pDateHelper->GetNumInfo() ); // Wang Xu Ming -- 2009-9-7 // DataPilot Migration - Cache&&Performance - //String aName = lcl_GetDateGroupName( pDateHelper, nPartValue, pDoc->GetFormatTable() ); + //String aName = lcl_GetDateGroupName( pDateHelper, nPartValue, pDoc->GetFormatTable() ); ScDPItemData aItemData( pDateHelper->GetDatePart(), String(), nPartValue, ScDPItemData::MK_DATA|ScDPItemData::MK_VAL|ScDPItemData::MK_DATEPART ); pItemDataIndex[nDim] = GetCacheTable().GetCache()->GetAdditionalItemID( aItemData ); // End Comments @@ -1582,7 +1582,7 @@ long ScDPGroupTableData::GetSourceDim( long nDim ) } long ScDPGroupTableData::Compare( long nDim, long nDataId1, long nDataId2) { - if ( getIsDataLayoutDimension(nDim) ) + if ( getIsDataLayoutDimension(nDim) ) return 0; return ScDPItemData::Compare( *GetMemberById(nDim, nDataId1),*GetMemberById(nDim, nDataId2) ); } diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index d8abd8d7dee3..f23567673db7 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.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,8 +43,8 @@ #include "dpgroup.hxx" #include "document.hxx" #include "rechead.hxx" -#include "pivot.hxx" // PIVOT_DATA_FIELD -#include "dapiuno.hxx" // ScDataPilotConversion +#include "pivot.hxx" // PIVOT_DATA_FIELD +#include "dapiuno.hxx" // ScDataPilotConversion #include "miscuno.hxx" #include "scerrors.hxx" #include "refupdat.hxx" @@ -78,7 +78,7 @@ #include <sal/macros.h> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <svl/zforlist.hxx> // IsNumberFormat +#include <svl/zforlist.hxx> // IsNumberFormat #include <vector> #include <stdio.h> @@ -100,35 +100,35 @@ using ::rtl::OUString; // ----------------------------------------------------------------------- -#define SCDPSOURCE_SERVICE "com.sun.star.sheet.DataPilotSource" +#define SCDPSOURCE_SERVICE "com.sun.star.sheet.DataPilotSource" // ----------------------------------------------------------------------- // incompatible versions of data pilot files -#define SC_DP_VERSION_CURRENT 6 +#define SC_DP_VERSION_CURRENT 6 // type of source data -#define SC_DP_SOURCE_SHEET 0 -#define SC_DP_SOURCE_DATABASE 1 -#define SC_DP_SOURCE_SERVICE 2 +#define SC_DP_SOURCE_SHEET 0 +#define SC_DP_SOURCE_DATABASE 1 +#define SC_DP_SOURCE_SERVICE 2 // ----------------------------------------------------------------------- -//! move to a header file -#define DP_PROP_COLUMNGRAND "ColumnGrand" -#define DP_PROP_FUNCTION "Function" -#define DP_PROP_IGNOREEMPTY "IgnoreEmptyRows" -#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" -//#define DP_PROP_ISVISIBLE "IsVisible" -#define DP_PROP_ORIENTATION "Orientation" -#define DP_PROP_ORIGINAL "Original" -#define DP_PROP_POSITION "Position" -#define DP_PROP_REPEATIFEMPTY "RepeatIfEmpty" -#define DP_PROP_ROWGRAND "RowGrand" -#define DP_PROP_SHOWDETAILS "ShowDetails" -#define DP_PROP_SHOWEMPTY "ShowEmpty" -#define DP_PROP_SUBTOTALS "SubTotals" -#define DP_PROP_USEDHIERARCHY "UsedHierarchy" +//! move to a header file +#define DP_PROP_COLUMNGRAND "ColumnGrand" +#define DP_PROP_FUNCTION "Function" +#define DP_PROP_IGNOREEMPTY "IgnoreEmptyRows" +#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" +//#define DP_PROP_ISVISIBLE "IsVisible" +#define DP_PROP_ORIENTATION "Orientation" +#define DP_PROP_ORIGINAL "Original" +#define DP_PROP_POSITION "Position" +#define DP_PROP_REPEATIFEMPTY "RepeatIfEmpty" +#define DP_PROP_ROWGRAND "RowGrand" +#define DP_PROP_SHOWDETAILS "ShowDetails" +#define DP_PROP_SHOWEMPTY "ShowEmpty" +#define DP_PROP_SUBTOTALS "SubTotals" +#define DP_PROP_USEDHIERARCHY "UsedHierarchy" // ----------------------------------------------------------------------- @@ -150,7 +150,7 @@ USHORT lcl_GetDataGetOrientation( const uno::Reference<sheet::XDimensionsSupplie { bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp, rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); - //! error checking -- is "IsDataLayoutDimension" property required?? + //! error checking -- is "IsDataLayoutDimension" property required?? if (bFound) nRet = ScUnoHelpFunctions::GetEnumProperty( xDimProp, rtl::OUString::createFromAscii(DP_PROP_ORIENTATION), @@ -192,7 +192,7 @@ ScDPObject::ScDPObject(const ScDPObject& r) : pSheetDesc( NULL ), pImpDesc( NULL ), pServDesc( NULL ), - mpTableData(static_cast<ScDPTableData*>(NULL)), + mpTableData(static_cast<ScDPTableData*>(NULL)), pOutput( NULL ), bSettingsChanged( FALSE ), bAlive( FALSE ), @@ -255,7 +255,7 @@ void ScDPObject::SetSaveData(const ScDPSaveData& rData) // End Comments } - InvalidateData(); // re-init source from SaveData + InvalidateData(); // re-init source from SaveData } void ScDPObject::SetAutoFormatIndex(const sal_uInt16 nIndex) @@ -265,7 +265,7 @@ void ScDPObject::SetAutoFormatIndex(const sal_uInt16 nIndex) sal_uInt16 ScDPObject::GetAutoFormatIndex() const { - return mnAutoFormatIndex; + return mnAutoFormatIndex; } void ScDPObject::SetHeaderLayout (bool bUseGrid) @@ -289,7 +289,7 @@ void ScDPObject::SetOutRange(const ScRange& rRange) void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc) { if ( pSheetDesc && rDesc == *pSheetDesc ) - return; // nothing to do + return; // nothing to do DELETEZ( pImpDesc ); DELETEZ( pServDesc ); @@ -297,7 +297,7 @@ void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc) delete pImpDesc; pSheetDesc = new ScSheetSourceDesc(rDesc); - // make valid QueryParam + // make valid QueryParam pSheetDesc->aQueryParam.nCol1 = pSheetDesc->aSourceRange.aStart.Col(); pSheetDesc->aQueryParam.nRow1 = pSheetDesc->aSourceRange.aStart.Row(); @@ -305,13 +305,13 @@ void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc) pSheetDesc->aQueryParam.nRow2 = pSheetDesc->aSourceRange.aEnd.Row();; pSheetDesc->aQueryParam.bHasHeader = TRUE; - InvalidateSource(); // new source must be created + InvalidateSource(); // new source must be created } void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) { if ( pImpDesc && rDesc == *pImpDesc ) - return; // nothing to do + return; // nothing to do DELETEZ( pSheetDesc ); DELETEZ( pServDesc ); @@ -319,13 +319,13 @@ void ScDPObject::SetImportDesc(const ScImportSourceDesc& rDesc) delete pImpDesc; pImpDesc = new ScImportSourceDesc(rDesc); - InvalidateSource(); // new source must be created + InvalidateSource(); // new source must be created } void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) { if ( pServDesc && rDesc == *pServDesc ) - return; // nothing to do + return; // nothing to do DELETEZ( pSheetDesc ); DELETEZ( pImpDesc ); @@ -333,7 +333,7 @@ void ScDPObject::SetServiceData(const ScDPServiceDesc& rDesc) delete pServDesc; pServDesc = new ScDPServiceDesc(rDesc); - InvalidateSource(); // new source must be created + InvalidateSource(); // new source must be created } void ScDPObject::WriteSourceDataTo( ScDPObject& rDest ) const @@ -345,7 +345,7 @@ void ScDPObject::WriteSourceDataTo( ScDPObject& rDest ) const else if ( pServDesc ) rDest.SetServiceData( *pServDesc ); - // name/tag are not source data, but needed along with source data + // name/tag are not source data, but needed along with source data rDest.aTableName = aTableName; rDest.aTableTag = aTableTag; @@ -378,7 +378,7 @@ bool ScDPObject::IsDataDescriptionCell(const ScAddress& rPos) long nDataDimCount = pSaveData->GetDataDimensionCount(); if (nDataDimCount != 1) - // There has to be exactly one data dimension for the description to + // There has to be exactly one data dimension for the description to // appear at top-left corner. return false; @@ -421,9 +421,9 @@ void ScDPObject::CreateOutput() aStart.SetRow(nNewRow); pOutput->SetPosition( aStart ); - //! modify aOutRange? + //! modify aOutRange? - bAllowMove = FALSE; // use only once + bAllowMove = FALSE; // use only once } } } @@ -480,18 +480,18 @@ void ScDPObject::CreateObjects() if (!xSource.is()) { - //! cache DPSource and/or Output? + //! cache DPSource and/or Output? DBG_ASSERT( bAlive, "CreateObjects on non-inserted DPObject" ); - DELETEZ( pOutput ); // not valid when xSource is changed + DELETEZ( pOutput ); // not valid when xSource is changed if ( pServDesc ) { xSource = CreateSource( *pServDesc ); } - if ( !xSource.is() ) // database or sheet data, or error in CreateSource + if ( !xSource.is() ) // database or sheet data, or error in CreateSource { DBG_ASSERT( !pServDesc, "DPSource could not be created" ); ScDPTableData* pData = GetTableData(); @@ -510,7 +510,7 @@ void ScDPObject::CreateObjects() } else if (bSettingsChanged) { - DELETEZ( pOutput ); // not valid when xSource is changed + DELETEZ( pOutput ); // not valid when xSource is changed uno::Reference<util::XRefreshable> xRef( xSource, uno::UNO_QUERY ); if (xRef.is()) @@ -556,21 +556,21 @@ void ScDPObject::InvalidateSource() ScRange ScDPObject::GetNewOutputRange( BOOL& rOverflow ) { - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done - rOverflow = pOutput->HasError(); // range overflow or exception from source + rOverflow = pOutput->HasError(); // range overflow or exception from source if ( rOverflow ) return ScRange( aOutRange.aStart ); else { - // don't store the result in aOutRange, because nothing has been output yet + // don't store the result in aOutRange, because nothing has been output yet return pOutput->GetOutputRange(); } } void ScDPObject::Output( const ScAddress& rPos ) { - // clear old output area + // clear old output area pDoc->DeleteAreaTab( aOutRange.aStart.Col(), aOutRange.aStart.Row(), aOutRange.aEnd.Col(), aOutRange.aEnd.Row(), aOutRange.aStart.Tab(), IDF_ALL ); @@ -578,13 +578,13 @@ void ScDPObject::Output( const ScAddress& rPos ) aOutRange.aEnd.Col(), aOutRange.aEnd.Row(), aOutRange.aStart.Tab(), SC_MF_AUTO ); - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done pOutput->SetPosition( rPos ); pOutput->Output(); - // aOutRange is always the range that was last output to the document + // aOutRange is always the range that was last output to the document aOutRange = pOutput->GetOutputRange(); const ScAddress& s = aOutRange.aStart; const ScAddress& e = aOutRange.aEnd; @@ -626,7 +626,7 @@ void ScDPObject::RefreshAfterLoad() pDoc->IsBlockEmpty( nTab, nFirstCol, nFirstRow + nInitial, nFirstCol, nFirstRow + nInitial ) && aOutRange.aEnd.Col() > nFirstCol ) { - BOOL bFilterButton = IsSheetData(); // when available, filter button setting must be checked here + BOOL bFilterButton = IsSheetData(); // when available, filter button setting must be checked here SCROW nSkip = bFilterButton ? 1 : 0; for (SCROW nPos=nSkip; nPos<nInitial; nPos++) @@ -635,7 +635,7 @@ void ScDPObject::RefreshAfterLoad() nHeaderRows = nInitial; } else - nHeaderRows = 0; // nothing found, no drop-down lists + nHeaderRows = 0; // nothing found, no drop-down lists } void ScDPObject::BuildAllDimensionMembers() @@ -746,14 +746,14 @@ void ScDPObject::UpdateReference( UpdateRefMode eUpdateRefMode, aNewDesc.aQueryParam = pSheetDesc->aQueryParam; aNewDesc.aQueryParam.nCol1 = sal::static_int_cast<SCCOL>( aNewDesc.aQueryParam.nCol1 + nDiffX ); aNewDesc.aQueryParam.nCol2 = sal::static_int_cast<SCCOL>( aNewDesc.aQueryParam.nCol2 + nDiffX ); - aNewDesc.aQueryParam.nRow1 += nDiffY; //! used? - aNewDesc.aQueryParam.nRow2 += nDiffY; //! used? + aNewDesc.aQueryParam.nRow1 += nDiffY; //! used? + aNewDesc.aQueryParam.nRow2 += nDiffY; //! used? SCSIZE nEC = aNewDesc.aQueryParam.GetEntryCount(); for (SCSIZE i=0; i<nEC; i++) if (aNewDesc.aQueryParam.GetEntry(i).bDoQuery) aNewDesc.aQueryParam.GetEntry(i).nField += nDiffX; - SetSheetDesc( aNewDesc ); // allocates new pSheetDesc + SetSheetDesc( aNewDesc ); // allocates new pSheetDesc } } } @@ -868,7 +868,7 @@ String ScDPObject::GetDimName( long nDim, BOOL& rIsDataLayout, sal_Int32* pFlags { BOOL bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp, rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); - //! error checking -- is "IsDataLayoutDimension" property required?? + //! error checking -- is "IsDataLayoutDimension" property required?? rtl::OUString aName; try @@ -945,9 +945,9 @@ long ScDPObject::GetDimCount() void ScDPObject::FillPageList( TypedScStrCollection& rStrings, long nField ) { - //! merge members access with ToggleDetails? + //! merge members access with ToggleDetails? - //! convert field index to dimension index? + //! convert field index to dimension index? DBG_ASSERT( xSource.is(), "no source" ); if ( !xSource.is() ) return; @@ -1030,8 +1030,8 @@ void ScDPObject::FillPageList( TypedScStrCollection& rStrings, long nField ) } } - // add "-all-" entry to the top (unsorted) - TypedStrData* pAllData = new TypedStrData( String( ScResId( SCSTR_ALL ) ) ); //! separate string? (also output) + // add "-all-" entry to the top (unsorted) + TypedStrData* pAllData = new TypedStrData( String( ScResId( SCSTR_ALL ) ) ); //! separate string? (also output) if ( !rStrings.AtInsert( 0, pAllData ) ) delete pAllData; } @@ -1040,7 +1040,7 @@ void ScDPObject::GetHeaderPositionData(const ScAddress& rPos, DataPilotTableHead { using namespace ::com::sun::star::sheet::DataPilotTablePositionType; - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done // Reset member values to invalid state. rData.Dimension = rData.Hierarchy = rData.Level = -1; @@ -1064,14 +1064,14 @@ BOOL ScDPObject::GetPivotData( ScDPGetPivotDataField& rTarget, BOOL ScDPObject::IsFilterButton( const ScAddress& rPos ) { - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done return pOutput->IsFilterButton( rPos ); } long ScDPObject::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) { - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done return pOutput->GetHeaderDim( rPos, rOrient ); } @@ -1079,7 +1079,7 @@ long ScDPObject::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) BOOL ScDPObject::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim, Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ) { - CreateOutput(); // create xSource and pOutput if not already done + CreateOutput(); // create xSource and pOutput if not already done return pOutput->GetHeaderDrag( rPos, bMouseLeft, bMouseTop, nDragDim, rPosRect, rOrient, rDimPos ); } @@ -1125,7 +1125,7 @@ bool lcl_Dequote( const String& rSource, xub_StrLen nStartPos, xub_StrLen& rEndP } else aBuffer.append( cNext ); - + ++nPos; } // no closing quote before the end of the string -> error (bRet still false) @@ -1302,7 +1302,7 @@ bool lcl_IsAtStart( const String& rList, const String& rSearch, sal_Int32& rMatc if ( cNext == ' ' || ( bAllowBracket && cNext == '[' ) ) bValid = true; } - + if ( bValid ) { rMatched = nMatchList; @@ -1530,9 +1530,9 @@ BOOL ScDPObject::ParseFilters( ScDPGetPivotDataField& rTarget, void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj) { - CreateObjects(); // create xSource if not already done + CreateObjects(); // create xSource if not already done - // find dimension name + // find dimension name uno::Reference<container::XNamed> xDim; uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions(); @@ -1553,12 +1553,12 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); if (bDataLayout) { - // the elements of the data layout dimension can't be found by their names - // -> don't change anything + // the elements of the data layout dimension can't be found by their names + // -> don't change anything return; } - // query old state + // query old state long nHierCount = 0; uno::Reference<container::XIndexAccess> xHiers; @@ -1617,21 +1617,21 @@ void ScDPObject::ToggleDetails(const DataPilotTableHeaderData& rElemDesc, ScDPOb DBG_ASSERT( bFound, "member not found" ); - //! use Hierarchy and Level in SaveData !!!! + //! use Hierarchy and Level in SaveData !!!! - // modify pDestObj if set, this object otherwise + // modify pDestObj if set, this object otherwise ScDPSaveData* pModifyData = pDestObj ? ( pDestObj->pSaveData ) : pSaveData; DBG_ASSERT( pModifyData, "no data?" ); if ( pModifyData ) { const String aName = rElemDesc.MemberName; pModifyData->GetDimensionByName(aDimName)-> - GetMemberByName(aName)->SetShowDetails( !bShowDetails ); // toggle + GetMemberByName(aName)->SetShowDetails( !bShowDetails ); // toggle if ( pDestObj ) - pDestObj->InvalidateData(); // re-init source from SaveData + pDestObj->InvalidateData(); // re-init source from SaveData else - InvalidateData(); // re-init source from SaveData + InvalidateData(); // re-init source from SaveData } } @@ -1646,10 +1646,10 @@ long lcl_FindName( const rtl::OUString& rString, const uno::Reference<container: if ( pArr[nPos] == rString ) return nPos; } - return -1; // not found + return -1; // not found } -USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask +USHORT lcl_FirstSubTotal( const uno::Reference<beans::XPropertySet>& xDimProp ) // PIVOT_FUNC mask { uno::Reference<sheet::XHierarchiesSupplier> xDimSupp( xDimProp, uno::UNO_QUERY ); if ( xDimProp.is() && xDimSupp.is() ) @@ -1722,8 +1722,8 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, SCSIZE nCount = (nOrient == sheet::DataPilotFieldOrientation_PAGE) ? PIVOT_MAXPAGEFIELD : PIVOT_MAXFIELD; - //! merge multiple occurences (data field with different functions) - //! force data field in one dimension + //! merge multiple occurences (data field with different functions) + //! force data field in one dimension std::vector< long > aPos( nCount, 0 ); @@ -1748,13 +1748,13 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, sheet::GeneralFunction_NONE ); if ( eFunc == sheet::GeneralFunction_AUTO ) { - //! test for numeric data + //! test for numeric data eFunc = sheet::GeneralFunction_SUM; } nMask = ScDataPilotConversion::FunctionBit(eFunc); } else - nMask = lcl_FirstSubTotal( xDimProp ); // from first hierarchy + nMask = lcl_FirstSubTotal( xDimProp ); // from first hierarchy BOOL bDataLayout = ScUnoHelpFunctions::GetBoolProperty( xDimProp, rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); @@ -1780,18 +1780,18 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, BOOL bDupUsed = FALSE; if ( nDupSource >= 0 ) { - // add function bit to previous entry + // add function bit to previous entry SCsCOL nCompCol; if ( bDataLayout ) nCompCol = PIVOT_DATA_FIELD; else - nCompCol = static_cast<SCsCOL>(nDupSource)+nColAdd; //! seek source column from name + nCompCol = static_cast<SCsCOL>(nDupSource)+nColAdd; //! seek source column from name for (SCSIZE nOld=0; nOld<nOutCount && !bDupUsed; nOld++) if ( pFields[nOld].nCol == nCompCol ) { - // add to previous column only if new bits aren't already set there + // add to previous column only if new bits aren't already set there if ( ( pFields[nOld].nFuncMask & nMask ) == 0 ) { pFields[nOld].nFuncMask |= nMask; @@ -1801,17 +1801,17 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, } } - if ( !bDupUsed ) // also for duplicated dim if original has different orientation + if ( !bDupUsed ) // also for duplicated dim if original has different orientation { if ( bDataLayout ) { pFields[nOutCount].nCol = PIVOT_DATA_FIELD; bDataFound = TRUE; } - else if ( nDupSource >= 0 ) // if source was not found (different orientation) - pFields[nOutCount].nCol = static_cast<SCsCOL>(nDupSource)+nColAdd; //! seek from name + else if ( nDupSource >= 0 ) // if source was not found (different orientation) + pFields[nOutCount].nCol = static_cast<SCsCOL>(nDupSource)+nColAdd; //! seek from name else - pFields[nOutCount].nCol = static_cast<SCsCOL>(nDim)+nColAdd; //! seek source column from name + pFields[nOutCount].nCol = static_cast<SCsCOL>(nDim)+nColAdd; //! seek source column from name pFields[nOutCount].nFuncMask = nMask; pFields[nOutCount].nFuncCount = lcl_CountBits( nMask ); @@ -1833,7 +1833,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, } } - // sort by getPosition() value + // sort by getPosition() value for (SCSIZE i=0; i+1<nOutCount; i++) { @@ -1848,7 +1848,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, if ( bAddData && !bDataFound ) { if ( nOutCount >= nCount ) // space for data field? - --nOutCount; //! error? + --nOutCount; //! error? pFields[nOutCount].nCol = PIVOT_DATA_FIELD; pFields[nOutCount].nFuncMask = 0; pFields[nOutCount].nFuncCount = 0; @@ -1860,7 +1860,7 @@ SCSIZE lcl_FillOldFields( PivotField* pFields, BOOL ScDPObject::FillOldParam(ScPivotParam& rParam, BOOL bForFile) const { - ((ScDPObject*)this)->CreateObjects(); // xSource is needed for field numbers + ((ScDPObject*)this)->CreateObjects(); // xSource is needed for field numbers rParam.nCol = aOutRange.aStart.Col(); rParam.nRow = aOutRange.aStart.Row(); @@ -1981,7 +1981,7 @@ BOOL ScDPObject::FillLabelData(ScPivotParam& rParam) BOOL bDuplicated = FALSE; BOOL bData = ScUnoHelpFunctions::GetBoolProperty( xDimProp, rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); - //! error checking -- is "IsDataLayoutDimension" property required?? + //! error checking -- is "IsDataLayoutDimension" property required?? try { @@ -2101,7 +2101,7 @@ BOOL ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< } //------------------------------------------------------------------------ -// convert old pivot tables into new datapilot tables +// convert old pivot tables into new datapilot tables String lcl_GetDimName( const uno::Reference<sheet::XDimensionsSupplier>& xSource, long nDim ) { @@ -2141,7 +2141,7 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, PivotField* pRefRowFields, SCSIZE nRefRowCount, PivotField* pRefPageFields, SCSIZE nRefPageCount ) { - // pDoc or xSource must be set + // pDoc or xSource must be set DBG_ASSERT( pDoc || xSource.is(), "missing string source" ); String aDocStr; @@ -2160,7 +2160,7 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, if ( pDoc ) pDoc->GetString( nCol, nRow, nTab, aDocStr ); else - aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0 + aDocStr = lcl_GetDimName( xSource, nCol ); // cols must start at 0 if ( aDocStr.Len() ) pDim = rSaveData.GetDimensionByName(aDocStr); @@ -2170,13 +2170,13 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, if ( pDim ) { - if ( nOrient == sheet::DataPilotFieldOrientation_DATA ) // set summary function + if ( nOrient == sheet::DataPilotFieldOrientation_DATA ) // set summary function { - // generate an individual entry for each function + // generate an individual entry for each function BOOL bFirst = TRUE; // if a dimension is used for column/row/page and data, - // use duplicated dimensions for all data occurrences + // use duplicated dimensions for all data occurrences if (pRefColFields) for (SCSIZE nRefCol=0; nRefCol<nRefColCount; nRefCol++) if (pRefColFields[nRefCol].nCol == nCol) @@ -2190,8 +2190,8 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, if (pRefPageFields[nRefPage].nCol == nCol) bFirst = FALSE; - // if set via api, a data column may occur several times - // (if the function hasn't been changed yet) -> also look for duplicate data column + // if set via api, a data column may occur several times + // (if the function hasn't been changed yet) -> also look for duplicate data column for (SCSIZE nPrevData=0; nPrevData<i; nPrevData++) if (pFields[nPrevData].nCol == nCol) bFirst = FALSE; @@ -2216,7 +2216,7 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, nMask *= 2; } } - else // set SubTotals + else // set SubTotals { pDim->SetOrientation( nOrient ); @@ -2231,8 +2231,8 @@ void ScDPObject::ConvertOrientation( ScDPSaveData& rSaveData, } pDim->SetSubTotals( nFuncCount, nFuncArray ); - // ShowEmpty was implicit in old tables, - // must be set for data layout dimension (not accessible in dialog) + // ShowEmpty was implicit in old tables, + // must be set for data layout dimension (not accessible in dialog) if ( bOldDefaults || nCol == PIVOT_DATA_FIELD ) pDim->SetShowEmpty( TRUE ); } @@ -2268,7 +2268,7 @@ bool ScDPObject::IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags ) // ----------------------------------------------------------------------- -// static +// static BOOL ScDPObject::HasRegisteredSources() { BOOL bFound = FALSE; @@ -2286,13 +2286,13 @@ BOOL ScDPObject::HasRegisteredSources() return bFound; } -// static +// static uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources() { long nCount = 0; uno::Sequence<rtl::OUString> aSeq(0); - // use implementation names... + // use implementation names... uno::Reference<lang::XMultiServiceFactory> xManager = comphelper::getProcessServiceFactory(); uno::Reference<container::XContentEnumerationAccess> xEnAc( xManager, uno::UNO_QUERY ); @@ -2305,7 +2305,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources() while ( xEnum->hasMoreElements() ) { uno::Any aAddInAny = xEnum->nextElement(); -// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE ) +// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE ) { uno::Reference<uno::XInterface> xIntFac; aAddInAny >>= xIntFac; @@ -2332,7 +2332,7 @@ uno::Sequence<rtl::OUString> ScDPObject::GetRegisteredSources() // use getContext from addincol.cxx uno::Reference<uno::XComponentContext> getContext(uno::Reference<lang::XMultiServiceFactory> xMSF); -// static +// static uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPServiceDesc& rDesc ) { rtl::OUString aImplName = rDesc.aServiceName; @@ -2349,7 +2349,7 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS while ( xEnum->hasMoreElements() && !xRet.is() ) { uno::Any aAddInAny = xEnum->nextElement(); -// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE ) +// if ( aAddInAny.getReflection()->getTypeClass() == TypeClass_INTERFACE ) { uno::Reference<uno::XInterface> xIntFac; aAddInAny >>= xIntFac; @@ -2379,7 +2379,7 @@ uno::Reference<sheet::XDimensionsSupplier> ScDPObject::CreateSource( const ScDPS uno::Reference<lang::XInitialization> xInit( xInterface, uno::UNO_QUERY ); if (xInit.is()) { - // initialize + // initialize uno::Sequence<uno::Any> aSeq(4); uno::Any* pArray = aSeq.getArray(); pArray[0] <<= rtl::OUString( rDesc.aParSource ); @@ -2454,14 +2454,14 @@ BOOL ScDPCollection::RefsEqual( const ScDPCollection& r ) const if ( ! ((const ScDPObject*)At(i))->RefsEqual( *((const ScDPObject*)r.At(i)) ) ) return FALSE; - return TRUE; // all equal + return TRUE; // all equal } void ScDPCollection::WriteRefsTo( ScDPCollection& r ) const { if ( nCount == r.nCount ) { - //! assert equal names? + //! assert equal names? for (USHORT i=0; i<nCount; i++) ((const ScDPObject*)At(i))->WriteRefsTo( *((ScDPObject*)r.At(i)) ); } @@ -2514,9 +2514,9 @@ ScDPObject* ScDPCollection::GetByName(const String& rName) const String ScDPCollection::CreateNewName( USHORT nMin ) const { String aBase = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("DataPilot")); - //! from Resource? + //! from Resource? - for (USHORT nAdd=0; nAdd<=nCount; nAdd++) // nCount+1 tries + for (USHORT nAdd=0; nAdd<=nCount; nAdd++) // nCount+1 tries { String aNewName = aBase; aNewName += String::CreateFromInt32( nMin + nAdd ); @@ -2525,9 +2525,9 @@ String ScDPCollection::CreateNewName( USHORT nMin ) const if (((const ScDPObject*)pItems[i])->GetName() == aNewName) bFound = TRUE; if (!bFound) - return aNewName; // found unused Name + return aNewName; // found unused Name } - return String(); // should not happen + return String(); // should not happen } @@ -2535,10 +2535,10 @@ String ScDPCollection::CreateNewName( USHORT nMin ) const // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance long ScDPObject::GetCacheId() const -{ +{ if ( GetSaveData() ) return GetSaveData()->GetCacheId(); - else + else return mnCacheId; } ULONG ScDPObject::RefreshCache() @@ -2550,8 +2550,8 @@ ULONG ScDPObject::RefreshCache() } CreateObjects(); - ULONG nErrId = 0; - if ( pSheetDesc) + ULONG nErrId = 0; + if ( pSheetDesc) nErrId = pSheetDesc->CheckValidate( pDoc ); if ( nErrId == 0 ) { @@ -2571,7 +2571,7 @@ ULONG ScDPObject::RefreshCache() //cache failed DBG_ASSERT( pCache , " pCache == NULL" ); return STR_ERR_DATAPILOTSOURCE; - } + } nNewId = pCache->GetId(); @@ -2586,7 +2586,7 @@ ULONG ScDPObject::RefreshCache() (*pDPCollection)[i]->SetRefresh(); } - } + } DBG_ASSERT( GetCacheId() >= 0, " GetCacheId() >= 0 " ); } return nErrId; diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 43b2e91ff18f..3d22355bac26 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.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 "docpool.hxx" #include "markdata.hxx" #include "attrib.hxx" -#include "formula/errorcodes.hxx" // errNoValue +#include "formula/errorcodes.hxx" // errNoValue #include "miscuno.hxx" #include "globstr.hrc" #include "stlpool.hxx" @@ -81,39 +81,39 @@ using ::rtl::OUString; // ----------------------------------------------------------------------- -//! move to a header file +//! move to a header file //! use names from unonames.hxx? #define DP_PROP_FUNCTION "Function" -#define DP_PROP_ORIENTATION "Orientation" -#define DP_PROP_POSITION "Position" -#define DP_PROP_USEDHIERARCHY "UsedHierarchy" -#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" -#define DP_PROP_NUMBERFORMAT "NumberFormat" -#define DP_PROP_FILTER "Filter" +#define DP_PROP_ORIENTATION "Orientation" +#define DP_PROP_POSITION "Position" +#define DP_PROP_USEDHIERARCHY "UsedHierarchy" +#define DP_PROP_ISDATALAYOUT "IsDataLayoutDimension" +#define DP_PROP_NUMBERFORMAT "NumberFormat" +#define DP_PROP_FILTER "Filter" #define DP_PROP_COLUMNGRAND "ColumnGrand" #define DP_PROP_ROWGRAND "RowGrand" #define DP_PROP_SUBTOTALS "SubTotals" // ----------------------------------------------------------------------- -//! dynamic!!! -#define SC_DPOUT_MAXLEVELS 256 +//! dynamic!!! +#define SC_DPOUT_MAXLEVELS 256 struct ScDPOutLevelData { - long nDim; - long nHier; - long nLevel; - long nDimPos; - uno::Sequence<sheet::MemberResult> aResult; + long nDim; + long nHier; + long nLevel; + long nDimPos; + uno::Sequence<sheet::MemberResult> aResult; String maName; /// Name is the internal field name. String aCaption; /// Caption is the name visible in the output table. bool mbHasHiddenMember; ScDPOutLevelData() - { - nDim = nHier = nLevel = nDimPos = -1; + { + nDim = nHier = nLevel = nDimPos = -1; mbHasHiddenMember = false; } @@ -122,10 +122,10 @@ struct ScDPOutLevelData ( nDimPos==r.nDimPos && nHier==r.nHier && nLevel<r.nLevel ); } void Swap(ScDPOutLevelData& r) -//! { ScDPOutLevelData aTemp = r; r = *this; *this = aTemp; } +//! { ScDPOutLevelData aTemp = r; r = *this; *this = aTemp; } { ScDPOutLevelData aTemp; aTemp = r; r = *this; *this = aTemp; } - //! bug (73840) in uno::Sequence - copy and then assign doesn't work! + //! bug (73840) in uno::Sequence - copy and then assign doesn't work! }; // ----------------------------------------------------------------------- @@ -145,7 +145,7 @@ void lcl_SetStyleById( ScDocument* pDoc, SCTAB nTab, ScStyleSheet* pStyle = (ScStyleSheet*) pStlPool->Find( aStyleName, SFX_STYLE_FAMILY_PARA ); if (!pStyle) { - // create new style (was in ScPivot::SetStyle) + // create new style (was in ScPivot::SetStyle) pStyle = (ScStyleSheet*) &pStlPool->Make( aStyleName, SFX_STYLE_FAMILY_PARA, SFXSTYLEBIT_USERDEF ); @@ -186,18 +186,18 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount, const uno::Reference<container::XIndexAccess>& xDims ) { if ( rFormats ) - return; // already set + return; // already set - // xLevRes is from the data layout dimension - //! use result sequence from ScDPOutLevelData! + // xLevRes is from the data layout dimension + //! use result sequence from ScDPOutLevelData! uno::Sequence<sheet::MemberResult> aResult = xLevRes->getResults(); long nSize = aResult.getLength(); if (nSize) { - // get names/formats for all data dimensions - //! merge this with the loop to collect ScDPOutLevelData? + // get names/formats for all data dimensions + //! merge this with the loop to collect ScDPOutLevelData? String aDataNames[SC_DPOUT_MAXLEVELS]; UINT32 nDataFormats[SC_DPOUT_MAXLEVELS]; @@ -231,7 +231,7 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount, } } - if ( bAnySet ) // forget everything if all formats are 0 (or no data dimensions) + if ( bAnySet ) // forget everything if all formats are 0 (or no data dimensions) { const sheet::MemberResult* pArray = aResult.getConstArray(); @@ -239,7 +239,7 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount, UINT32* pNumFmt = new UINT32[nSize]; if (nDataCount == 1) { - // only one data dimension -> use its numberformat everywhere + // only one data dimension -> use its numberformat everywhere long nFormat = nDataFormats[0]; for (long nPos=0; nPos<nSize; nPos++) pNumFmt[nPos] = nFormat; @@ -248,14 +248,14 @@ void lcl_FillNumberFormats( UINT32*& rFormats, long& rCount, { for (long nPos=0; nPos<nSize; nPos++) { - // if CONTINUE bit is set, keep previous name - //! keep number format instead! + // if CONTINUE bit is set, keep previous name + //! keep number format instead! if ( !(pArray[nPos].Flags & sheet::MemberResultFlags::CONTINUE) ) aName = String( pArray[nPos].Name ); UINT32 nFormat = 0; for (long i=0; i<nDataCount; i++) - if (aName == aDataNames[i]) //! search more efficiently? + if (aName == aDataNames[i]) //! search more efficiently? { nFormat = nDataFormats[i]; break; @@ -310,7 +310,7 @@ void lcl_SortFields( ScDPOutLevelData* pFields, long nFieldCount ) BOOL lcl_MemberEmpty( const uno::Sequence<sheet::MemberResult>& rSeq ) { - // used to skip levels that have no members + // used to skip levels that have no members long nLen = rSeq.getLength(); const sheet::MemberResult* pArray = rSeq.getConstArray(); @@ -318,7 +318,7 @@ BOOL lcl_MemberEmpty( const uno::Sequence<sheet::MemberResult>& rSeq ) if (pArray[i].Flags & sheet::MemberResultFlags::HASMEMBER) return FALSE; - return TRUE; // no member data -> empty + return TRUE; // no member data -> empty } uno::Sequence<sheet::MemberResult> lcl_GetSelectedPageAsResult( const uno::Reference<beans::XPropertySet>& xDimProp ) @@ -341,7 +341,7 @@ uno::Sequence<sheet::MemberResult> lcl_GetSelectedPageAsResult( const uno::Refer if ( rField.Field == 0 && rField.Operator == sheet::FilterOperator_EQUAL && !rField.IsNumeric ) { rtl::OUString aSelectedPage( rField.StringValue ); - //! different name/caption string? + //! different name/caption string? sheet::MemberResult aResult( aSelectedPage, aSelectedPage, 0 ); aRet = uno::Sequence<sheet::MemberResult>( &aResult, 1 ); } @@ -377,9 +377,9 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS nTabStartCol = nMemberStartCol = nDataStartCol = nTabEndCol = 0; nTabStartRow = nMemberStartRow = nDataStartRow = nTabEndRow = 0; - pColFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS]; - pRowFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS]; - pPageFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS]; + pColFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS]; + pRowFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS]; + pPageFields = new ScDPOutLevelData[SC_DPOUT_MAXLEVELS]; nColFieldCount = 0; nRowFieldCount = 0; nPageFieldCount = 0; @@ -387,7 +387,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS uno::Reference<sheet::XDataPilotResults> xResult( xSource, uno::UNO_QUERY ); if ( xSource.is() && xResult.is() ) { - // get dimension results: + // get dimension results: uno::Reference<container::XIndexAccess> xDims = new ScNameToIndexAccess( xSource->getDimensions() ); @@ -474,7 +474,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS pRowFields[nRowFieldCount].aCaption= aCaption; pRowFields[nRowFieldCount].mbHasHiddenMember = bHasHiddenMember; if (!lcl_MemberEmpty(pRowFields[nRowFieldCount].aResult)) - { + { ++nRowFieldCount; bRowFieldHasMember = true; } @@ -526,7 +526,7 @@ ScDPOutput::ScDPOutput( ScDocument* pD, const uno::Reference<sheet::XDimensionsS lcl_SortFields( pRowFields, nRowFieldCount ); lcl_SortFields( pPageFields, nPageFieldCount ); - // get data results: + // get data results: try { @@ -584,7 +584,7 @@ void ScDPOutput::DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const sheet::Data { pDoc->SetValue( nCol, nRow, nTab, rData.Value ); - // use number formats from source + // use number formats from source DBG_ASSERT( bSizesValid, "DataCell: !bSizesValid" ); UINT32 nFormat = 0; @@ -616,7 +616,7 @@ void ScDPOutput::DataCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const sheet::Data //pDoc->SetString( nCol, nRow, nTab, EMPTY_STRING ); } - // SubTotal formatting is controlled by headers + // SubTotal formatting is controlled by headers } void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, @@ -641,14 +641,14 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, if ( nFlags & sheet::MemberResultFlags::SUBTOTAL ) { -// SvxWeightItem aItem( WEIGHT_BOLD ); // weight is in the style +// SvxWeightItem aItem( WEIGHT_BOLD ); // weight is in the style // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - OutputImpl outputimp( pDoc, nTab, + OutputImpl outputimp( pDoc, nTab, nTabStartCol, nTabStartRow, nMemberStartCol, nMemberStartRow, - nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); + nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); // End Comments - //! limit frames to horizontal or vertical? + //! limit frames to horizontal or vertical? if (bColHeader) { // Wang Xu Ming -- 2009-8-17 @@ -677,14 +677,14 @@ void ScDPOutput::HeaderCell( SCCOL nCol, SCROW nRow, SCTAB nTab, } } -void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, +void ScDPOutput::FieldCell( SCCOL nCol, SCROW nRow, SCTAB nTab, const String& rCaption, bool bInTable, bool bPopup, bool bHasHiddenMember ) { pDoc->SetString( nCol, nRow, nTab, rCaption ); if (bInTable) lcl_SetFrame( pDoc,nTab, nCol,nRow, nCol,nRow, 20 ); - // Button + // Button sal_uInt16 nMergeFlag = SC_MF_BUTTON; if (bPopup) nMergeFlag |= SC_MF_BUTTON_POPUP; @@ -705,8 +705,8 @@ void ScDPOutput::CalcSizes() { if (!bSizesValid) { - // get column size of data from first row - //! allow different sizes (and clear following areas) ??? + // get column size of data from first row + //! allow different sizes (and clear following areas) ??? nRowCount = aData.getLength(); const uno::Sequence<sheet::DataResult>* pRowAry = aData.getConstArray(); @@ -717,14 +717,14 @@ void ScDPOutput::CalcSizes() // Insert an extra header row only when there is no column field. nHeaderSize = 2; - // calculate output positions and sizes + // calculate output positions and sizes - long nPageSize = 0; //! use page fields! + long nPageSize = 0; //! use page fields! if ( bDoFilter || nPageFieldCount ) { - nPageSize += nPageFieldCount + 1; // plus one empty row + nPageSize += nPageFieldCount + 1; // plus one empty row if ( bDoFilter ) - ++nPageSize; // filter button above the page fields + ++nPageSize; // filter button above the page fields } if ( aStartPos.Col() + nRowFieldCount + nColCount - 1 > MAXCOL || @@ -734,7 +734,7 @@ void ScDPOutput::CalcSizes() } nTabStartCol = aStartPos.Col(); - nTabStartRow = aStartPos.Row() + (SCROW)nPageSize; // below page fields + nTabStartRow = aStartPos.Row() + (SCROW)nPageSize; // below page fields nMemberStartCol = nTabStartCol; nMemberStartRow = nTabStartRow + (SCROW) nHeaderSize; nDataStartCol = nMemberStartCol + (SCCOL)nRowFieldCount; @@ -742,14 +742,14 @@ void ScDPOutput::CalcSizes() if ( nColCount > 0 ) nTabEndCol = nDataStartCol + (SCCOL)nColCount - 1; else - nTabEndCol = nDataStartCol; // single column will remain empty + nTabEndCol = nDataStartCol; // single column will remain empty // if page fields are involved, include the page selection cells if ( nPageFieldCount > 0 && nTabEndCol < nTabStartCol + 1 ) nTabEndCol = nTabStartCol + 1; if ( nRowCount > 0 ) nTabEndRow = nDataStartRow + (SCROW)nRowCount - 1; else - nTabEndRow = nDataStartRow; // single row will remain empty + nTabEndRow = nDataStartRow; // single row will remain empty bSizesValid = TRUE; } } @@ -784,7 +784,7 @@ sal_Int32 ScDPOutput::GetPositionType(const ScAddress& rPos) if (bInColHeader) { if (nRow == nTabStartRow) - // first row in the column header area is always used for column + // first row in the column header area is always used for column // field buttons. return DataPilotTablePositionType::OTHER; @@ -803,35 +803,35 @@ void ScDPOutput::Output() SCTAB nTab = aStartPos.Tab(); const uno::Sequence<sheet::DataResult>* pRowAry = aData.getConstArray(); - // calculate output positions and sizes + // calculate output positions and sizes CalcSizes(); - if ( bSizeOverflow || bResultsError ) // does output area exceed sheet limits? - return; // nothing + if ( bSizeOverflow || bResultsError ) // does output area exceed sheet limits? + return; // nothing - // clear whole (new) output area - //! when modifying table, clear old area - //! include IDF_OBJECTS ??? + // clear whole (new) output area + //! when modifying table, clear old area + //! include IDF_OBJECTS ??? pDoc->DeleteAreaTab( aStartPos.Col(), aStartPos.Row(), nTabEndCol, nTabEndRow, nTab, IDF_ALL ); if ( bDoFilter ) lcl_DoFilterButton( pDoc, aStartPos.Col(), aStartPos.Row(), nTab ); - // output data results: - + // output data results: + for (long nRow=0; nRow<nRowCount; nRow++) { - SCROW nRowPos = nDataStartRow + (SCROW)nRow; //! check for overflow + SCROW nRowPos = nDataStartRow + (SCROW)nRow; //! check for overflow const sheet::DataResult* pColAry = pRowAry[nRow].getConstArray(); long nThisColCount = pRowAry[nRow].getLength(); - DBG_ASSERT( nThisColCount == nColCount, "count mismatch" ); //! ??? + DBG_ASSERT( nThisColCount == nColCount, "count mismatch" ); //! ??? for (long nCol=0; nCol<nThisColCount; nCol++) { - SCCOL nColPos = nDataStartCol + (SCCOL)nCol; //! check for overflow + SCCOL nColPos = nDataStartCol + (SCCOL)nCol; //! check for overflow DataCell( nColPos, nRowPos, nTab, pColAry[nCol] ); } } - // output page fields: + // output page fields: for (nField=0; nField<nPageFieldCount; nField++) { @@ -845,26 +845,26 @@ void ScDPOutput::Output() if ( pPageFields[nField].aResult.getLength() == 1 ) aPageValue = pPageFields[nField].aResult[0].Caption; else - aPageValue = String( ScResId( SCSTR_ALL ) ); //! separate string? + aPageValue = String( ScResId( SCSTR_ALL ) ); //! separate string? pDoc->SetString( nFldCol, nHdrRow, nTab, aPageValue ); lcl_SetFrame( pDoc,nTab, nFldCol,nHdrRow, nFldCol,nHdrRow, 20 ); pDoc->ApplyAttr( nFldCol, nHdrRow, nTab, ScMergeFlagAttr(SC_MF_AUTO) ); - //! which style? + //! which style? } - // data description - // (may get overwritten by first row field) + // data description + // (may get overwritten by first row field) String aDesc = aDataDescription; if ( !aDesc.Len() ) { - //! use default string ("result") ? + //! use default string ("result") ? } pDoc->SetString( nTabStartCol, nTabStartRow, nTab, aDesc ); - // set STR_PIVOT_STYLE_INNER for whole data area (subtotals are overwritten) + // set STR_PIVOT_STYLE_INNER for whole data area (subtotals are overwritten) if ( nDataStartRow > nTabStartRow ) lcl_SetStyleById( pDoc, nTab, nTabStartCol, nTabStartRow, nTabEndCol, nDataStartRow-1, @@ -872,26 +872,26 @@ void ScDPOutput::Output() lcl_SetStyleById( pDoc, nTab, nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow, STR_PIVOT_STYLE_INNER ); - // output column headers: + // output column headers: // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance - OutputImpl outputimp( pDoc, nTab, + OutputImpl outputimp( pDoc, nTab, nTabStartCol, nTabStartRow, nMemberStartCol, nMemberStartRow, - nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); + nDataStartCol, nDataStartRow, nTabEndCol, nTabEndRow ); // End Comments for (nField=0; nField<nColFieldCount; nField++) { - SCCOL nHdrCol = nDataStartCol + (SCCOL)nField; //! check for overflow + SCCOL nHdrCol = nDataStartCol + (SCCOL)nField; //! check for overflow FieldCell( nHdrCol, nTabStartRow, nTab, pColFields[nField].aCaption, true, true, pColFields[nField].mbHasHiddenMember ); - SCROW nRowPos = nMemberStartRow + (SCROW)nField; //! check for overflow + SCROW nRowPos = nMemberStartRow + (SCROW)nField; //! check for overflow const uno::Sequence<sheet::MemberResult> rSequence = pColFields[nField].aResult; const sheet::MemberResult* pArray = rSequence.getConstArray(); long nThisColCount = rSequence.getLength(); - DBG_ASSERT( nThisColCount == nColCount, "count mismatch" ); //! ??? + DBG_ASSERT( nThisColCount == nColCount, "count mismatch" ); //! ??? for (long nCol=0; nCol<nThisColCount; nCol++) { - SCCOL nColPos = nDataStartCol + (SCCOL)nCol; //! check for overflow + SCCOL nColPos = nDataStartCol + (SCCOL)nCol; //! check for overflow HeaderCell( nColPos, nRowPos, nTab, pArray[nCol], TRUE, nField ); // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance @@ -908,7 +908,7 @@ void ScDPOutput::Output() // lcl_SetFrame( pDoc,nTab, nColPos,nRowPos, nEndColPos,nTabEndRow, SC_DP_FRAME_INNER_BOLD ); if ( nField == nColFieldCount - 2 ) { - outputimp.AddCol( nColPos ); + outputimp.AddCol( nColPos ); if ( nColPos + 1 == nEndColPos ) outputimp.OutputBlockFrame( nColPos,nRowPos, nEndColPos,nRowPos+1, TRUE ); } @@ -924,30 +924,30 @@ void ScDPOutput::Output() outputimp.AddCol( nColPos ); } if ( nField== 0 && nColFieldCount == 1 ) - outputimp.OutputBlockFrame( nDataStartCol,nTabStartRow, nTabEndCol,nRowPos-1 ); + outputimp.OutputBlockFrame( nDataStartCol,nTabStartRow, nTabEndCol,nRowPos-1 ); // End Comments } - // output row headers: + // output row headers: std::vector<BOOL> vbSetBorder; vbSetBorder.resize( nTabEndRow - nDataStartRow + 1, FALSE ); for (nField=0; nField<nRowFieldCount; nField++) { bool bDataLayout = mbHasDataLayout && (nField == nRowFieldCount-1); - SCCOL nHdrCol = nTabStartCol + (SCCOL)nField; //! check for overflow + SCCOL nHdrCol = nTabStartCol + (SCCOL)nField; //! check for overflow SCROW nHdrRow = nDataStartRow - 1; - FieldCell( nHdrCol, nHdrRow, nTab, pRowFields[nField].aCaption, true, !bDataLayout, + FieldCell( nHdrCol, nHdrRow, nTab, pRowFields[nField].aCaption, true, !bDataLayout, pRowFields[nField].mbHasHiddenMember ); - SCCOL nColPos = nMemberStartCol + (SCCOL)nField; //! check for overflow + SCCOL nColPos = nMemberStartCol + (SCCOL)nField; //! check for overflow const uno::Sequence<sheet::MemberResult> rSequence = pRowFields[nField].aResult; const sheet::MemberResult* pArray = rSequence.getConstArray(); long nThisRowCount = rSequence.getLength(); - DBG_ASSERT( nThisRowCount == nRowCount, "count mismatch" ); //! ??? + DBG_ASSERT( nThisRowCount == nRowCount, "count mismatch" ); //! ??? for (long nRow=0; nRow<nThisRowCount; nRow++) { - SCROW nRowPos = nDataStartRow + (SCROW)nRow; //! check for overflow + SCROW nRowPos = nDataStartRow + (SCROW)nRow; //! check for overflow HeaderCell( nColPos, nRowPos, nTab, pArray[nRow], FALSE, nField ); if ( ( pArray[nRow].Flags & sheet::MemberResultFlags::HASMEMBER ) && !( pArray[nRow].Flags & sheet::MemberResultFlags::SUBTOTAL ) ) @@ -957,7 +957,7 @@ void ScDPOutput::Output() long nEnd = nRow; while ( nEnd+1 < nThisRowCount && ( pArray[nEnd+1].Flags & sheet::MemberResultFlags::CONTINUE ) ) ++nEnd; - SCROW nEndRowPos = nDataStartRow + (SCROW)nEnd; //! check for overflow + SCROW nEndRowPos = nDataStartRow + (SCROW)nEnd; //! check for overflow // Wang Xu Ming -- 2009-8-17 // DataPilot Migration - Cache&&Performance // lcl_SetFrame( pDoc,nTab, nColPos,nRowPos, nColPos,nEndRowPos, SC_DP_FRAME_INNER_BOLD ); @@ -1163,9 +1163,9 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa SCROW nRow = rPos.Row(); SCTAB nTab = rPos.Tab(); if ( nTab != aStartPos.Tab() ) - return; // wrong sheet + return; // wrong sheet - // calculate output positions and sizes + // calculate output positions and sizes CalcSizes(); @@ -1177,12 +1177,12 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa vector<DataPilotFieldFilter> aFilters; GetDataResultPositionData(aFilters, rPos); sal_Int32 nSize = aFilters.size(); - + DataPilotTableResultData aResData; aResData.FieldFilters.realloc(nSize); for (sal_Int32 i = 0; i < nSize; ++i) aResData.FieldFilters[i] = aFilters[i]; - + aResData.DataFieldIndex = 0; Reference<beans::XPropertySet> xPropSet(xSource, UNO_QUERY); if (xPropSet.is()) @@ -1194,10 +1194,10 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa } // Copy appropriate DataResult object from the cached sheet::DataResult table. - if (aData.getLength() > nRow - nDataStartRow && + if (aData.getLength() > nRow - nDataStartRow && aData[nRow-nDataStartRow].getLength() > nCol-nDataStartCol) aResData.Result = aData[nRow-nDataStartRow][nCol-nDataStartCol]; - + rPosData.PositionData = makeAny(aResData); return; } @@ -1242,7 +1242,7 @@ void ScDPOutput::GetPositionData(const ScAddress& rPos, DataPilotTablePositionDa const sheet::MemberResult* pArray = rSequence.getConstArray(); long nItem = nRow - nDataStartRow; - // get origin of "continue" fields + // get origin of "continue" fields while ( nItem > 0 && (pArray[nItem].Flags & sheet::MemberResultFlags::CONTINUE) ) --nItem; @@ -1318,7 +1318,7 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>& DBG_ASSERT(nDataStartCol + rSequence.getLength() - 1 == nTabEndCol, "ScDPOutput::GetDataFieldCellData: error in geometric assumption"); long nItem = nCol - nDataStartCol; - // get origin of "continue" fields + // get origin of "continue" fields while ( nItem > 0 && (pArray[nItem].Flags & sheet::MemberResultFlags::CONTINUE) ) --nItem; @@ -1342,7 +1342,7 @@ bool ScDPOutput::GetDataResultPositionData(vector<sheet::DataPilotFieldFilter>& DBG_ASSERT(nDataStartRow + rSequence.getLength() - 1 == nTabEndRow, "ScDPOutput::GetDataFieldCellData: error in geometric assumption"); long nItem = nRow - nDataStartRow; - // get origin of "continue" fields + // get origin of "continue" fields while ( nItem > 0 && (pArray[nItem].Flags & sheet::MemberResultFlags::CONTINUE) ) --nItem; @@ -1822,9 +1822,9 @@ BOOL ScDPOutput::IsFilterButton( const ScAddress& rPos ) SCROW nRow = rPos.Row(); SCTAB nTab = rPos.Tab(); if ( nTab != aStartPos.Tab() || !bDoFilter ) - return FALSE; // wrong sheet or no button at all + return FALSE; // wrong sheet or no button at all - // filter button is at top left + // filter button is at top left return ( nCol == aStartPos.Col() && nRow == aStartPos.Row() ); } @@ -1834,13 +1834,13 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) SCROW nRow = rPos.Row(); SCTAB nTab = rPos.Tab(); if ( nTab != aStartPos.Tab() ) - return -1; // wrong sheet + return -1; // wrong sheet - // calculate output positions and sizes + // calculate output positions and sizes CalcSizes(); - // test for column header + // test for column header if ( nRow == nTabStartRow && nCol >= nDataStartCol && nCol < nDataStartCol + nColFieldCount ) { @@ -1849,7 +1849,7 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) return pColFields[nField].nDim; } - // test for row header + // test for row header if ( nRow+1 == nDataStartRow && nCol >= nTabStartCol && nCol < nTabStartCol + nRowFieldCount ) { @@ -1858,7 +1858,7 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) return pRowFields[nField].nDim; } - // test for page field + // test for page field SCROW nPageStartRow = aStartPos.Row() + ( bDoFilter ? 1 : 0 ); if ( nCol == aStartPos.Col() && nRow >= nPageStartRow && nRow < nPageStartRow + nPageFieldCount ) @@ -1868,29 +1868,29 @@ long ScDPOutput::GetHeaderDim( const ScAddress& rPos, USHORT& rOrient ) return pPageFields[nField].nDim; } - //! single data field (?) + //! single data field (?) rOrient = sheet::DataPilotFieldOrientation_HIDDEN; - return -1; // invalid + return -1; // invalid } BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMouseTop, long nDragDim, Rectangle& rPosRect, USHORT& rOrient, long& rDimPos ) { - // Rectangle instead of ScRange for rPosRect to allow for negative values + // Rectangle instead of ScRange for rPosRect to allow for negative values SCCOL nCol = rPos.Col(); SCROW nRow = rPos.Row(); SCTAB nTab = rPos.Tab(); if ( nTab != aStartPos.Tab() ) - return FALSE; // wrong sheet + return FALSE; // wrong sheet - // calculate output positions and sizes + // calculate output positions and sizes CalcSizes(); - // test for column header + // test for column header if ( nCol >= nDataStartCol && nCol <= nTabEndCol && nRow + 1 >= nMemberStartRow && nRow < nMemberStartRow + nColFieldCount ) @@ -1901,12 +1901,12 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo nField = 0; bMouseTop = TRUE; } - //! find start of dimension + //! find start of dimension rPosRect = Rectangle( nDataStartCol, nMemberStartRow + nField, nTabEndCol, nMemberStartRow + nField -1 ); - BOOL bFound = FALSE; // is this within the same orientation? + BOOL bFound = FALSE; // is this within the same orientation? BOOL bBeforeDrag = FALSE; BOOL bAfterDrag = FALSE; for (long nPos=0; nPos<nColFieldCount && !bFound; nPos++) @@ -1941,13 +1941,13 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo } rOrient = sheet::DataPilotFieldOrientation_COLUMN; - rDimPos = nField; //!... + rDimPos = nField; //!... return TRUE; } - // test for row header + // test for row header - // special case if no row fields + // special case if no row fields BOOL bSpecial = ( nRow+1 >= nDataStartRow && nRow <= nTabEndRow && nRowFieldCount == 0 && nCol == nTabStartCol && bMouseLeft ); @@ -1955,12 +1955,12 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo nCol + 1 >= nTabStartCol && nCol < nTabStartCol + nRowFieldCount ) ) { long nField = nCol - nTabStartCol; - //! find start of dimension + //! find start of dimension rPosRect = Rectangle( nTabStartCol + nField, nDataStartRow - 1, nTabStartCol + nField - 1, nTabEndRow ); - BOOL bFound = FALSE; // is this within the same orientation? + BOOL bFound = FALSE; // is this within the same orientation? BOOL bBeforeDrag = FALSE; BOOL bAfterDrag = FALSE; for (long nPos=0; nPos<nRowFieldCount && !bFound; nPos++) @@ -1995,11 +1995,11 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo } rOrient = sheet::DataPilotFieldOrientation_ROW; - rDimPos = nField; //!... + rDimPos = nField; //!... return TRUE; } - // test for page fields + // test for page fields SCROW nPageStartRow = aStartPos.Row() + ( bDoFilter ? 1 : 0 ); if ( nCol >= aStartPos.Col() && nCol <= nTabEndCol && @@ -2011,12 +2011,12 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo nField = 0; bMouseTop = TRUE; } - //! find start of dimension + //! find start of dimension rPosRect = Rectangle( aStartPos.Col(), nPageStartRow + nField, nTabEndCol, nPageStartRow + nField - 1 ); - BOOL bFound = FALSE; // is this within the same orientation? + BOOL bFound = FALSE; // is this within the same orientation? BOOL bBeforeDrag = FALSE; BOOL bAfterDrag = FALSE; for (long nPos=0; nPos<nPageFieldCount && !bFound; nPos++) @@ -2051,7 +2051,7 @@ BOOL ScDPOutput::GetHeaderDrag( const ScAddress& rPos, BOOL bMouseLeft, BOOL bMo } rOrient = sheet::DataPilotFieldOrientation_PAGE; - rDimPos = nField; //!... + rDimPos = nField; //!... return TRUE; } diff --git a/sc/source/core/data/dpoutputgeometry.cxx b/sc/source/core/data/dpoutputgeometry.cxx index 99a465188105..3fea590d6b23 100644 --- a/sc/source/core/data/dpoutputgeometry.cxx +++ b/sc/source/core/data/dpoutputgeometry.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/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index f6f6cf216c76..eb44740dedad 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.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 @@ -77,16 +77,16 @@ using ::std::auto_ptr; // ----------------------------------------------------------------------- -#define SC_DPSAVEMODE_NO 0 -#define SC_DPSAVEMODE_YES 1 -#define SC_DPSAVEMODE_DONTKNOW 2 +#define SC_DPSAVEMODE_NO 0 +#define SC_DPSAVEMODE_YES 1 +#define SC_DPSAVEMODE_DONTKNOW 2 // ----------------------------------------------------------------------- void lcl_SetBoolProperty( const uno::Reference<beans::XPropertySet>& xProp, const rtl::OUString& rName, sal_Bool bValue ) { - //! move to ScUnoHelpFunctions? + //! move to ScUnoHelpFunctions? xProp->setPropertyValue( rName, uno::Any( &bValue, getBooleanCppuType() ) ); } @@ -117,8 +117,8 @@ ScDPSaveMember::~ScDPSaveMember() BOOL ScDPSaveMember::operator== ( const ScDPSaveMember& r ) const { - if ( aName != r.aName || - nVisibleMode != r.nVisibleMode || + if ( aName != r.aName || + nVisibleMode != r.nVisibleMode || nShowDetailsMode != r.nShowDetailsMode ) return FALSE; @@ -283,18 +283,18 @@ ScDPSaveDimension::~ScDPSaveDimension() BOOL ScDPSaveDimension::operator== ( const ScDPSaveDimension& r ) const { - if ( aName != r.aName || - bIsDataLayout != r.bIsDataLayout || - bDupFlag != r.bDupFlag || - nOrientation != r.nOrientation || - nFunction != r.nFunction || + if ( aName != r.aName || + bIsDataLayout != r.bIsDataLayout || + bDupFlag != r.bDupFlag || + nOrientation != r.nOrientation || + nFunction != r.nFunction || nUsedHierarchy != r.nUsedHierarchy || nShowEmptyMode != r.nShowEmptyMode || bSubTotalDefault != r.bSubTotalDefault || nSubTotalCount != r.nSubTotalCount ) return FALSE; - if ( nSubTotalCount && ( !pSubTotalFuncs || !r.pSubTotalFuncs ) ) // should not happen + if ( nSubTotalCount && ( !pSubTotalFuncs || !r.pSubTotalFuncs ) ) // should not happen return FALSE; long i; @@ -608,8 +608,8 @@ void ScDPSaveDimension::WriteToSource( const uno::Reference<uno::XInterface>& xD ScUnoHelpFunctions::SetOptionalPropertyValue(xDimProp, SC_UNO_FIELD_SUBTOTALNAME, *pSubTotalName); } - // Level loop outside of maMemberList loop - // because SubTotals have to be set independently of known members + // Level loop outside of maMemberList loop + // because SubTotals have to be set independently of known members long nCount = maMemberHash.size(); @@ -805,11 +805,11 @@ ScDPSaveData& ScDPSaveData::operator= ( const ScDPSaveData& r ) BOOL ScDPSaveData::operator== ( const ScDPSaveData& r ) const { if ( nColumnGrandMode != r.nColumnGrandMode || - nRowGrandMode != r.nRowGrandMode || + nRowGrandMode != r.nRowGrandMode || nIgnoreEmptyMode != r.nIgnoreEmptyMode || nRepeatEmptyMode != r.nRepeatEmptyMode || bFilterButton != r.bFilterButton || - mnCacheId != r.mnCacheId ||/// Wang Xu Ming -- 2009-6-18 DataPilot Migration + mnCacheId != r.mnCacheId ||/// Wang Xu Ming -- 2009-6-18 DataPilot Migration bDrillDown != r.bDrillDown || mbDimensionMembersBuilt != r.mbDimensionMembersBuilt) return FALSE; @@ -883,7 +883,7 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDimensionByName(const String& rName) if ( pDim->GetName() == rName && !pDim->IsDataLayout() ) return pDim; } - return NULL; // don't create new + return NULL; // don't create new } ScDPSaveDimension* ScDPSaveData::GetNewDimensionByName(const String& rName) @@ -925,8 +925,8 @@ ScDPSaveDimension* ScDPSaveData::GetExistingDataLayoutDimension() const ScDPSaveDimension* ScDPSaveData::DuplicateDimension(const String& rName) { - // always insert new - //! check if dimension is there? + // always insert new + //! check if dimension is there? ScDPSaveDimension* pOld = GetDimensionByName( rName ); ScDPSaveDimension* pNew = new ScDPSaveDimension( *pOld ); @@ -1003,12 +1003,12 @@ long ScDPSaveData::GetDataDimensionCount() const void ScDPSaveData::SetPosition( ScDPSaveDimension* pDim, long nNew ) { - // position (nNew) is counted within dimensions of the same orientation + // position (nNew) is counted within dimensions of the same orientation USHORT nOrient = pDim->GetOrientation(); aDimList.Remove( pDim ); - ULONG nCount = aDimList.Count(); // after remove + ULONG nCount = aDimList.Count(); // after remove ULONG nInsPos = 0; while ( nNew > 0 && nInsPos < nCount ) @@ -1076,14 +1076,14 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie if (!xSource.is()) return; - // source options must be first! + // source options must be first! uno::Reference<beans::XPropertySet> xSourceProp( xSource, uno::UNO_QUERY ); DBG_ASSERT( xSourceProp.is(), "no properties at source" ); if ( xSourceProp.is() ) { - // source options are not available for external sources - //! use XPropertySetInfo to test for availability? + // source options are not available for external sources + //! use XPropertySetInfo to test for availability? try { @@ -1107,9 +1107,9 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie // exceptions in the other calls are errors try { - // reset all orientations - //! "forgetSettings" or similar at source ????? - //! reset all duplicated dimensions, or reuse them below !!! + // reset all orientations + //! "forgetSettings" or similar at source ????? + //! reset all duplicated dimensions, or reuse them below !!! DBG_TRACE( "ScDPSaveData::WriteToSource" ); lcl_ResetOrient( xSource ); @@ -1121,10 +1121,10 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie rtl::OUString aName = pDim->GetName(); DBG_TRACESTR(pDim->GetName()); - + BOOL bData = pDim->IsDataLayout(); - //! getByName for ScDPSource, including DataLayoutDimension !!!!!!!! + //! getByName for ScDPSource, including DataLayoutDimension !!!!!!!! uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions(); uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName ); @@ -1140,7 +1140,7 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie { bFound = ScUnoHelpFunctions::GetBoolProperty( xDimProp, rtl::OUString::createFromAscii(DP_PROP_ISDATALAYOUT) ); - //! error checking -- is "IsDataLayoutDimension" property required?? + //! error checking -- is "IsDataLayoutDimension" property required?? } } else @@ -1157,8 +1157,8 @@ void ScDPSaveData::WriteToSource( const uno::Reference<sheet::XDimensionsSupplie String aNewName = pDim->GetName(); // different name for each duplication of a (real) dimension... - for (long j=0; j<=i; j++) //! Test !!!!!! - aNewName += '*'; //! modify name at creation of SaveDimension + for (long j=0; j<=i; j++) //! Test !!!!!! + aNewName += '*'; //! modify name at creation of SaveDimension uno::Reference<util::XCloneable> xCloneable( xIntDim, uno::UNO_QUERY ); DBG_ASSERT( xCloneable.is(), "cannot clone dimension" ); @@ -1205,7 +1205,7 @@ BOOL ScDPSaveData::IsEmpty() const if ( pDim->GetOrientation() != sheet::DataPilotFieldOrientation_HIDDEN && !pDim->IsDataLayout() ) return FALSE; } - return TRUE; // no entries that are not hidden + return TRUE; // no entries that are not hidden } ScDPDimensionSaveData* ScDPSaveData::GetDimensionData() @@ -1348,13 +1348,13 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< return; SCCOL nSrcDim = pCache->GetDimensionIndex( GetName() ); - + if ( nSrcDim == -1 ) return; if ( pSelectedPage ) {//check pSelected page DBG_TRACESTR( (*pSelectedPage) ); - if ( pCache->GetIdByItemData( nSrcDim, *pSelectedPage ) == -1 ) + if ( pCache->GetIdByItemData( nSrcDim, *pSelectedPage ) == -1 ) { delete pSelectedPage; pSelectedPage = NULL; @@ -1363,8 +1363,8 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< }; if ( pReferenceValue && pReferenceValue->ReferenceItemType == DataPilotFieldReferenceItemType::NAMED ) - {//check pReferenceValue -#ifdef DEBUG + {//check pReferenceValue +#ifdef DEBUG switch( pReferenceValue->ReferenceType) { case sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE: //both @@ -1400,7 +1400,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< { //running total has not reference item const String& sReferenceItemName = pReferenceValue->ReferenceItemName; DBG_TRACESTR( sReferenceItemName ); - if ( pCache->GetIdByItemData( nRefDim, sReferenceItemName ) == -1 ) + if ( pCache->GetIdByItemData( nRefDim, sReferenceItemName ) == -1 ) bValid = false; } if ( !bValid ) @@ -1423,7 +1423,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< const String& sFieldDimName = pSortInfo->Field; std::list<String>::const_iterator iter = std::find( deletedDims.begin(), deletedDims.end(), sFieldDimName ); if ( iter != deletedDims.end() && pCache->GetDimensionIndex( sFieldDimName ) == -1 ) - { + { pSortInfo->Mode = DataPilotFieldSortMode::MANUAL; pSortInfo->Field = GetName(); } @@ -1436,7 +1436,7 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< const String& sFieldDimName = pAutoShowInfo->DataField; std::list<String>::const_iterator iter = std::find( deletedDims.begin(), deletedDims.end(), sFieldDimName ); if ( iter != deletedDims.end() && pCache->GetDimensionIndex( sFieldDimName ) == -1 ) - { + { delete pAutoShowInfo; pAutoShowInfo = NULL; } @@ -1448,10 +1448,10 @@ void ScDPSaveDimension::Refresh( const com::sun::star::uno::Reference< for (MemberList::iterator i=maMemberList.begin(); i != maMemberList.end() ; ) { rtl::OUString aMemberName = (*i)->GetName(); - if ( pCache->GetIdByItemData( nSrcDim, aMemberName ) == -1 ) + if ( pCache->GetIdByItemData( nSrcDim, aMemberName ) == -1 ) i = maMemberList.erase( i ); else - i++; + i++; } } } @@ -1462,15 +1462,15 @@ bool operator == (const ::com::sun::star::sheet::DataPilotFieldSortInfo &l, cons } bool operator == (const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &l, const ::com::sun::star::sheet::DataPilotFieldAutoShowInfo &r ) { - return l.IsEnabled == r.IsEnabled && - l.ShowItemsMode == r.ShowItemsMode && + return l.IsEnabled == r.IsEnabled && + l.ShowItemsMode == r.ShowItemsMode && l.ItemCount == r.ItemCount && l.DataField == r.DataField; } bool operator == (const ::com::sun::star::sheet::DataPilotFieldReference &l, const ::com::sun::star::sheet::DataPilotFieldReference &r ) { - return l.ReferenceType == r.ReferenceType && - l.ReferenceField == r.ReferenceField && + return l.ReferenceType == r.ReferenceType && + l.ReferenceField == r.ReferenceField && l.ReferenceItemType == r.ReferenceItemType && l.ReferenceItemName == r.ReferenceItemName; } diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index 6847b3aace87..162de2102efd 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.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,13 +69,13 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::Any; using ::com::sun::star::uno::UNO_QUERY; -#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" -#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" +#define SC_SERVICE_ROWSET "com.sun.star.sdb.RowSet" +#define SC_SERVICE_INTHANDLER "com.sun.star.task.InteractionHandler" -//! move to a header file? -#define SC_DBPROP_DATASOURCENAME "DataSourceName" -#define SC_DBPROP_COMMAND "Command" -#define SC_DBPROP_COMMANDTYPE "CommandType" +//! move to a header file? +#define SC_DBPROP_DATASOURCENAME "DataSourceName" +#define SC_DBPROP_COMMAND "Command" +#define SC_DBPROP_COMMANDTYPE "CommandType" // ----------------------------------------------------------------------- // Wang Xu Ming -- 2009-9-15 // DataPilot Migration - Cache&&Performance @@ -84,7 +84,7 @@ using ::com::sun::star::uno::UNO_QUERY; ScDPTableDataCache* pCache = NULL; ScDPCollection* pDPCollection= pDoc->GetDPCollection(); USHORT nCount = pDPCollection->GetCount(); - + for ( short i=nCount-1; i>=0 ; i--) { if ( const ScImportSourceDesc* pUsedDesc = (*pDPCollection)[i]->GetImportSourceDesc() ) @@ -106,7 +106,7 @@ ScDPTableDataCache* ScImportSourceDesc::CreateCache( ScDocument* pDoc , long nID return NULL; sal_Int32 nSdbType = -1; - + switch ( nType ) { case sheet::DataImportMode_SQL: nSdbType = sdb::CommandType::COMMAND; break; @@ -124,7 +124,7 @@ ScDPTableDataCache* ScImportSourceDesc::CreateCache( ScDocument* pDoc , long nID if ( pCache == NULL ) pCache = new ScDPTableDataCache( pDoc ); - + uno::Reference<sdbc::XRowSet> xRowSet ; try { @@ -196,7 +196,7 @@ ScDPTableDataCache* ScImportSourceDesc::GetCache( ScDocument* pDoc, long nID ) c if ( NULL == pCache && pDoc ) pCache = GetExistDPObjectCache( pDoc); if ( NULL == pCache ) - pCache = CreateCache( pDoc , nID ); + pCache = CreateCache( pDoc , nID ); return pCache; } @@ -205,7 +205,7 @@ long ScImportSourceDesc:: GetCacheId( ScDocument* pDoc, long nID ) const ScDPTableDataCache* pCache = GetCache( pDoc, nID); if ( NULL == pCache ) return -1; - else + else return pCache->GetId(); } @@ -226,7 +226,7 @@ ScDatabaseDPData::~ScDatabaseDPData() void ScDatabaseDPData::DisposeData() { - //! use OpenDatabase here? + //! use OpenDatabase here? aCacheTable.clear(); } @@ -242,7 +242,7 @@ String ScDatabaseDPData::getDimensionName(long nColumn) { if (getIsDataLayoutDimension(nColumn)) { - //! different internal and display names? + //! different internal and display names? //return "Data"; return ScGlobal::GetRscString(STR_PIVOT_DATA); } @@ -258,14 +258,14 @@ BOOL ScDatabaseDPData::getIsDataLayoutDimension(long nColumn) BOOL ScDatabaseDPData::IsDateDimension(long /* nDim */) { - //! later... + //! later... return FALSE; } void ScDatabaseDPData::SetEmptyFlags( BOOL /* bIgnoreEmptyRows */, BOOL /* bRepeatIfEmpty */ ) { - // not used for database data - //! disable flags + // not used for database data + //! disable flags } void ScDatabaseDPData::CreateCacheTable() diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 7da7c956d26f..0d9ff5073282 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.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 @@ String ScSheetDPData::getDimensionName(long nColumn) CreateCacheTable(); if (getIsDataLayoutDimension(nColumn)) { - //! different internal and display names? + //! different internal and display names? //return "Data"; return ScGlobal::GetRscString(STR_PIVOT_DATA); } @@ -165,16 +165,16 @@ ULONG ScSheetDPData::GetNumberFormat(long nDim) else { return GetCacheTable().GetCache()->GetNumberFormat( nDim ); - } + } } -UINT32 ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx ) +UINT32 ScDPTableData::GetNumberFormatByIdx( NfIndexTableOffset eIdx ) { if( !mpDoc ) return 0; if ( SvNumberFormatter* pFormatter = mpDoc->GetFormatTable() ) return pFormatter->GetFormatIndex( eIdx, LANGUAGE_SYSTEM ); - + return 0; } @@ -202,7 +202,7 @@ void ScSheetDPData::CreateCacheTable() // already cached. return; - aCacheTable.fillTable( aQuery, pSpecial, + aCacheTable.fillTable( aQuery, pSpecial, bIgnoreEmptyRows, bRepeatIfEmpty ); } @@ -274,7 +274,7 @@ ScDPTableDataCache* ScSheetSourceDesc::GetCache( ScDocument* pDoc, long nID ) co if ( NULL == pCache && pDoc ) pCache = GetExistDPObjectCache( pDoc ); if ( NULL == pCache ) - pCache = CreateCache( pDoc ); + pCache = CreateCache( pDoc ); return pCache; } @@ -283,7 +283,7 @@ long ScSheetSourceDesc:: GetCacheId( ScDocument* pDoc, long nID ) const ScDPTableDataCache* pCache = GetCache( pDoc, nID); if ( NULL == pCache ) return -1; - else + else return pCache->GetId(); } @@ -296,11 +296,11 @@ ULONG ScSheetSourceDesc::CheckValidate( ScDocument* pDoc ) const { if ( pDoc->IsBlockEmpty( aSrcRange.aStart.Tab(), i, aSrcRange.aStart.Row(),i, aSrcRange.aStart.Row())) - return STR_PIVOT_FIRSTROWEMPTYERR; + return STR_PIVOT_FIRSTROWEMPTYERR; } if( pDoc->IsBlockEmpty( aSrcRange.aStart.Tab(), aSrcRange.aStart.Col(), aSrcRange.aStart.Row()+1, aSrcRange.aEnd.Col(), aSrcRange.aEnd.Row() ) ) { - return STR_PIVOT_ONLYONEROWERR; + return STR_PIVOT_ONLYONEROWERR; } return 0; } diff --git a/sc/source/core/data/dptabdat.cxx b/sc/source/core/data/dptabdat.cxx index c0c2d6d33122..bc3579ea6f65 100644 --- a/sc/source/core/data/dptabdat.cxx +++ b/sc/source/core/data/dptabdat.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 @@ -66,9 +66,9 @@ ScDPTableData::ScDPTableData(ScDocument* pDoc, long nCacheId ) : mnCacheId( nCacheId ), mpDoc ( pDoc ) { - nLastDateVal = nLastHier = nLastLevel = nLastRet = -1; // invalid + nLastDateVal = nLastHier = nLastLevel = nLastRet = -1; // invalid - //! reset before new calculation (in case the base date is changed) + //! reset before new calculation (in case the base date is changed) } ScDPTableData::~ScDPTableData() @@ -80,7 +80,7 @@ long ScDPTableData::GetDatePart( long nDateVal, long nHierarchy, long nLevel ) if ( nDateVal == nLastDateVal && nHierarchy == nLastHier && nLevel == nLastLevel ) return nLastRet; - Date aDate( 30,12,1899 ); //! get from source data (and cache here) + Date aDate( 30,12,1899 ); //! get from source data (and cache here) aDate += nDateVal; long nRet = 0; @@ -89,10 +89,10 @@ long ScDPTableData::GetDatePart( long nDateVal, long nHierarchy, long nLevel ) case SC_DAPI_HIERARCHY_QUARTER: switch (nLevel) { - case 0: nRet = aDate.GetYear(); break; - case 1: nRet = (aDate.GetMonth()-1) / 3 + 1; break; - case 2: nRet = aDate.GetMonth(); break; - case 3: nRet = aDate.GetDay(); break; + case 0: nRet = aDate.GetYear(); break; + case 1: nRet = (aDate.GetMonth()-1) / 3 + 1; break; + case 2: nRet = aDate.GetMonth(); break; + case 3: nRet = aDate.GetDay(); break; default: DBG_ERROR("GetDatePart: wrong level"); } @@ -100,10 +100,10 @@ long ScDPTableData::GetDatePart( long nDateVal, long nHierarchy, long nLevel ) case SC_DAPI_HIERARCHY_WEEK: switch (nLevel) { - //! use settings for different definitions - case 0: nRet = aDate.GetYear(); break; //!... - case 1: nRet = aDate.GetWeekOfYear(); break; - case 2: nRet = (long)aDate.GetDayOfWeek(); break; + //! use settings for different definitions + case 0: nRet = aDate.GetYear(); break; //!... + case 1: nRet = aDate.GetWeekOfYear(); break; + case 2: nRet = (long)aDate.GetDayOfWeek(); break; default: DBG_ERROR("GetDatePart: wrong level"); } @@ -113,9 +113,9 @@ long ScDPTableData::GetDatePart( long nDateVal, long nHierarchy, long nLevel ) } nLastDateVal = nDateVal; - nLastHier = nHierarchy; - nLastLevel = nLevel; - nLastRet = nRet; + nLastHier = nHierarchy; + nLastLevel = nLevel; + nLastRet = nRet; return nRet; } @@ -127,7 +127,7 @@ bool ScDPTableData::IsRepeatIfEmpty() ULONG ScDPTableData::GetNumberFormat(long) { - return 0; // default format + return 0; // default format } BOOL ScDPTableData::IsBaseForGroup(long) const @@ -158,7 +158,7 @@ BOOL ScDPTableData::HasCommonElement( const ScDPItemData&, long, DBG_ERROR("HasCommonElement shouldn't be called for non-group data"); return FALSE; } -void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPCacheTable& rCacheTable, +void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPCacheTable& rCacheTable, const CalcInfo& rInfo, CalcRowData& rData) { // column dimensions @@ -189,7 +189,7 @@ void ScDPTableData::FillRowDataFromCacheTable(sal_Int32 nRow, const ScDPCacheTab void ScDPTableData::ProcessRowData(CalcInfo& rInfo, CalcRowData& rData, bool bAutoShow) { // Wang Xu Ming -- 2009-6-16 - // DataPilot Migration + // DataPilot Migration if (!bAutoShow) { LateInitParams aColParams( rInfo.aColDims, rInfo.aColLevels, FALSE ); @@ -218,7 +218,7 @@ void ScDPTableData::ProcessRowData(CalcInfo& rInfo, CalcRowData& rData, bool bAu // End Comments } - rInfo.pRowRoot->ProcessData(rData.aRowData, rInfo.pColRoot->GetChildDimension(), + rInfo.pRowRoot->ProcessData(rData.aRowData, rInfo.pColRoot->GetChildDimension(), rData.aColData, rData.aValues); } } @@ -239,7 +239,7 @@ void ScDPTableData::CalcResultsFromCacheTable(const ScDPCacheTable& rCacheTable, // Wang Xu Ming -- 2009-6-10 // DataPilot Migration -void ScDPTableData::GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow, +void ScDPTableData::GetItemData(const ScDPCacheTable& rCacheTable, sal_Int32 nRow, const vector<long>& rDims, vector< SCROW/*ScDPItemData*/>& rItemData) // End Comments { @@ -284,7 +284,7 @@ const ScDPItemData* ScDPTableData::GetMemberByIndex( long nDim, long nIndex ) { if ( nIndex >= GetMembersCount( nDim ) ) return NULL; - + const ::std::vector<SCROW>& nMembers = GetCacheTable().getFieldEntries( nDim ); return GetCacheTable().GetCache()->GetItemDataById( (SCCOL) nDim, (SCROW)nMembers[nIndex] ); @@ -292,16 +292,16 @@ const ScDPItemData* ScDPTableData::GetMemberByIndex( long nDim, long nIndex ) const ScDPItemData* ScDPTableData::GetMemberById( long nDim, long nId) { - + return GetCacheTable().GetCache()->GetItemDataById( (SCCOL) nDim, (SCROW)nId); } -SCROW ScDPTableData::GetIdOfItemData( long nDim, const ScDPItemData& rData ) +SCROW ScDPTableData::GetIdOfItemData( long nDim, const ScDPItemData& rData ) { return GetCacheTable().GetCache()->GetIdByItemData((SCCOL) nDim, rData ); } -const std::vector< SCROW >& ScDPTableData::GetColumnEntries( long nColumn ) +const std::vector< SCROW >& ScDPTableData::GetColumnEntries( long nColumn ) { return GetCacheTable().getFieldEntries( nColumn ); } @@ -314,16 +314,16 @@ long ScDPTableData::GetSourceDim( long nDim ) long ScDPTableData::Compare( long nDim, long nDataId1, long nDataId2) { - if ( getIsDataLayoutDimension(nDim) ) + if ( getIsDataLayoutDimension(nDim) ) return 0; - long n1 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId1); - long n2 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId2); - if ( n1 > n2 ) - return 1; - else if ( n1 == n2 ) - return 0; - else + long n1 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId1); + long n2 = GetCacheTable().GetCache()->GetOrder( nDim, nDataId2); + if ( n1 > n2 ) + return 1; + else if ( n1 == n2 ) + return 0; + else return -1; } // End Comments diff --git a/sc/source/core/data/dptablecache.cxx b/sc/source/core/data/dptablecache.cxx index b946dbd4b6a4..bc97696cff2b 100644 --- a/sc/source/core/data/dptablecache.cxx +++ b/sc/source/core/data/dptablecache.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -58,7 +58,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::UNO_QUERY_THROW; // ----------------------------------------------------------------------- -namespace +namespace { BOOL lcl_isDate( ULONG nNumType ) { @@ -92,7 +92,7 @@ namespace rIndex = nLo; return bFound; } - + ScDPItemData* lcl_GetItemValue(const Reference<sdbc::XRow>& xRow, sal_Int32 nType, long nCol, const Date& rNullDate ) { @@ -107,7 +107,7 @@ namespace case sdbc::DataType::BOOLEAN: { nNumType = NUMBERFORMAT_LOGICAL; - fValue = xRow->getBoolean(nCol) ? 1 : 0; + fValue = xRow->getBoolean(nCol) ? 1 : 0; return new ScDPItemData( rStr, fValue,TRUE,nNumType); } //break; @@ -187,7 +187,7 @@ namespace ScDPItemData::ScDPItemData( const String& rS, double fV/* = 0.0*/, BOOL bHV/* = FALSE*/, const ULONG nNumFormatP /*= 0*/ , BOOL bData/* = TRUE*/) : nNumFormat( nNumFormatP ), aString(rS), fValue(fV), mbFlag( (MK_VAL*!!bHV) | (MK_DATA*!!bData) | (MK_ERR*!!FALSE) | (MK_DATE*!!lcl_isDate( nNumFormat ) ) ) -{ +{ } ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nDocTab ): @@ -195,9 +195,9 @@ ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nD { String aDocStr; pDoc->GetString( nCol, nRow, nDocTab, aDocStr ); - + SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); - + ScAddress aPos( nCol, nRow, nDocTab ); ScBaseCell* pCell = pDoc->GetCell( aPos ); @@ -227,7 +227,7 @@ ScDPItemData::ScDPItemData( ScDocument* pDoc, SCROW nRow, USHORT nCol, USHORT nD BOOL ScDPItemData::IsCaseInsEqual( const ScDPItemData& r ) const { //TODO: indified Date? //! pass Transliteration? - //! inline? + //! inline? return IsValue() ? ( r.IsValue() && rtl::math::approxEqual( fValue, r.fValue ) ) : ( !r.IsValue() && ScGlobal::GetpTransliteration()->isEqual( aString, r.aString ) ); @@ -255,7 +255,7 @@ BOOL ScDPItemData::operator==( const ScDPItemData& r ) const // Identify date if ( IsDate() != r.IsDate() ) return FALSE; - else + else if ( r.IsValue() ) return rtl::math::approxEqual( fValue, r.fValue ); else @@ -303,7 +303,7 @@ sal_Int32 ScDPItemData::Compare( const ScDPItemData& rA, // //Wang Xu Ming SODC_17561 #ifdef DEBUG -void ScDPItemData::dump() const +void ScDPItemData::dump() const { DBG_TRACE1( "Numberformat= %o", nNumFormat ); DBG_TRACESTR(aString ); @@ -323,64 +323,64 @@ TypedStrData* ScDPItemData::CreateTypeString( ) sal_uInt8 ScDPItemData::GetType() const { - + if ( IsHasErr() ) return SC_VALTYPE_ERROR; else if ( !IsHasData() ) return SC_VALTYPE_EMPTY; else if ( IsValue()) return SC_VALTYPE_VALUE; - else + else return SC_VALTYPE_STRING; } -BOOL ScDPItemData::IsHasData() const +BOOL ScDPItemData::IsHasData() const { return !!(mbFlag&MK_DATA); } -BOOL ScDPItemData::IsHasErr() const -{ - return !!(mbFlag&MK_ERR); +BOOL ScDPItemData::IsHasErr() const +{ + return !!(mbFlag&MK_ERR); } -BOOL ScDPItemData::IsValue() const -{ +BOOL ScDPItemData::IsValue() const +{ return !!(mbFlag&MK_VAL); } -String ScDPItemData::GetString() const -{ +String ScDPItemData::GetString() const +{ return aString; } -double ScDPItemData::GetValue() const -{ +double ScDPItemData::GetValue() const +{ return fValue; } -ULONG ScDPItemData::GetNumFormat() const -{ +ULONG ScDPItemData::GetNumFormat() const +{ return nNumFormat; } -BOOL ScDPItemData::HasStringData() const +BOOL ScDPItemData::HasStringData() const -{ +{ return IsHasData()&&!IsHasErr()&&!IsValue(); } BOOL ScDPItemData::IsDate() const -{ - return !!(mbFlag&MK_DATE); +{ + return !!(mbFlag&MK_DATE); } BOOL ScDPItemData::HasDatePart() const { - return !!(mbFlag&MK_DATEPART); + return !!(mbFlag&MK_DATEPART); } -void ScDPItemData::SetDate( BOOL b ) +void ScDPItemData::SetDate( BOOL b ) { - b ? ( mbFlag |= MK_DATE ) : ( mbFlag &= ~MK_DATE ); + b ? ( mbFlag |= MK_DATE ) : ( mbFlag &= ~MK_DATE ); } // ----------------------------------------------------------------------- @@ -392,7 +392,7 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const if ( GetColumnCount() == r.GetColumnCount() ) { for ( SCCOL i = 0 ; i < GetColumnCount(); i++ ) - { //check dim names + { //check dim names if ( GetDimensionName( i ) != r.GetDimensionName( i ) ) return FALSE; //check rows count @@ -406,12 +406,12 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const { if ( *( GetDimMemberValues( i )[j] ) == *( r.GetDimMemberValues( i )[j] ) ) continue; - else + else return FALSE; } } - else - return FALSE; + else + return FALSE; //check source table index for ( SCROW k=0 ; k < GetRowCount(); k ++ ) { @@ -419,7 +419,7 @@ BOOL ScDPTableDataCache::operator== ( const ScDPTableDataCache& r ) const continue; else return FALSE; - } + } } } return TRUE; @@ -448,7 +448,7 @@ ScDPTableDataCache::~ScDPTableDataCache() for ( ULONG row = 0 ; row < mpTableDataValues[nCol].size(); row++ ) delete mpTableDataValues[nCol][row]; } - for ( nCol =0; nCol < mrLabelNames.size(); nCol++ ) + for ( nCol =0; nCol < mrLabelNames.size(); nCol++ ) delete mrLabelNames[nCol]; // End Comments @@ -466,15 +466,15 @@ ScDPTableDataCache::~ScDPTableDataCache() // ----------------------------------------------------------------------- void ScDPTableDataCache::AddRow( ScDPItemData* pRow, USHORT nCount ) -{ +{ DBG_ASSERT( pRow , " empty pointer" ); if ( !mrLabelNames.size() ) { mnColumnCount= nCount; mpTableDataValues = new std::vector<ScDPItemData*>[ mnColumnCount ]; - mpSourceData = new std::vector<SCROW>[ mnColumnCount ]; - mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ]; - mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ]; + mpSourceData = new std::vector<SCROW>[ mnColumnCount ]; + mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ]; + mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ]; for ( USHORT i = 0; i < nCount ; i ++ ) AddLabel( new ScDPItemData( pRow[i] ) ); @@ -496,10 +496,10 @@ bool ScDPTableDataCache::IsValid() const namespace { -/** - * While the macro interpret level is incremented, the formula cells are - * (semi-)guaranteed to be interpreted. - */ +/** + * While the macro interpret level is incremented, the formula cells are + * (semi-)guaranteed to be interpreted. + */ class MacroInterpretIncrementer { public: @@ -521,20 +521,20 @@ private: // ----------------------------------------------------------------------- bool ScDPTableDataCache::InitFromDoc( ScDocument* pDoc, const ScRange& rRange ) { - // Make sure the formula cells within the data range are interpreted + // Make sure the formula cells within the data range are interpreted // during this call, for this method may be called from the interpretation // of GETPIVOTDATA, which disables nested formula interpretation without // increasing the macro level. MacroInterpretIncrementer aMacroInc(pDoc); // - SCROW nStartRow = rRange.aStart.Row(); // start of data + SCROW nStartRow = rRange.aStart.Row(); // start of data SCROW nEndRow = rRange.aEnd.Row(); USHORT nStartCol = rRange.aStart.Col(); USHORT nEndCol = rRange.aEnd.Col(); USHORT nDocTab = rRange.aStart.Tab(); - - //init + + //init long nOldColumCount = mnColumnCount; mnColumnCount = nEndCol - nStartCol + 1; if ( IsValid() ) @@ -551,11 +551,11 @@ bool ScDPTableDataCache::InitFromDoc( ScDocument* pDoc, const ScRange& rRange ) delete [] mpIndexOrder; mrLabelNames.clear(); } - + mpTableDataValues = new std::vector<ScDPItemData*>[ mnColumnCount ]; - mpSourceData = new std::vector<SCROW>[ mnColumnCount ]; - mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ]; - mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ]; + mpSourceData = new std::vector<SCROW>[ mnColumnCount ]; + mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ]; + mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ]; //check valid for ( SCROW nRow = nStartRow; nRow <= nEndRow; nRow ++ ) { @@ -602,9 +602,9 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS // Get column titles and types. mrLabelNames.reserve(mnColumnCount); mpTableDataValues = new std::vector<ScDPItemData*>[ mnColumnCount ]; - mpSourceData = new std::vector<SCROW>[ mnColumnCount ]; - mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ]; - mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ]; + mpSourceData = new std::vector<SCROW>[ mnColumnCount ]; + mpGlobalOrder = new std::vector<SCROW>[ mnColumnCount ]; + mpIndexOrder = new std::vector<SCROW>[ mnColumnCount ]; std::vector<sal_Int32> aColTypes(mnColumnCount); @@ -619,7 +619,7 @@ bool ScDPTableDataCache::InitFromDataBase (const Reference<sdbc::XRowSet>& xRowS Reference<sdbc::XRow> xRow(xRowSet, UNO_QUERY_THROW); xRowSet->first(); do - { + { for (sal_Int32 nCol = 0; nCol < mnColumnCount; ++nCol) { ScDPItemData * pNew = lcl_GetItemValue( xRow, aColTypes[nCol], nCol+1, rNullDate ); @@ -650,12 +650,12 @@ ULONG ScDPTableDataCache::GetDimNumType( SCCOL nDim) const } // ----------------------------------------------------------------------- -bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOOL *pSpecial) +bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOOL *pSpecial) { //Copied and modified from ScTable::ValidQuery if (!rParam.GetEntry(0).bDoQuery) return TRUE; - BOOL bMatchWholeCell = mpDoc->GetDocOptions().IsMatchWholeCell(); - + BOOL bMatchWholeCell = mpDoc->GetDocOptions().IsMatchWholeCell(); + //--------------------------------------------------------------- const SCSIZE nFixedBools = 32; @@ -665,8 +665,8 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO BOOL* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new BOOL[nEntryCount] ); BOOL* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new BOOL[nEntryCount] ); - long nPos = -1; - SCSIZE i = 0; + long nPos = -1; + SCSIZE i = 0; CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() : ScGlobal::GetCollator() ); ::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ? @@ -683,8 +683,8 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO if ( nQueryCol > rParam.nCol2 ) nQueryCol = rParam.nCol2; SCCOL nSourceField = nQueryCol - rParam.nCol1; - SCROW nId = GetItemDataId( nSourceField, nRow, FALSE ); - const ScDPItemData* pCellData = GetItemDataById( nSourceField, nId ); + SCROW nId = GetItemDataId( nSourceField, nRow, FALSE ); + const ScDPItemData* pCellData = GetItemDataById( nSourceField, nId ); BOOL bOk = FALSE; BOOL bTestEqual = FALSE; @@ -697,9 +697,9 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO bOk = pCellData->IsHasData(); } else if ( !rEntry.bQueryByString && pCellData->IsValue() ) - { // by Value + { // by Value double nCellVal = pCellData->GetValue(); - + switch (rEntry.eOp) { case SC_EQUAL : @@ -729,8 +729,8 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO || (rEntry.bQueryByString && pCellData->HasStringData() ) ) - { // by String - String aCellStr = pCellData->GetString(); + { // by String + String aCellStr = pCellData->GetString(); BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL) || (rEntry.eOp == SC_NOT_EQUAL))); @@ -870,7 +870,7 @@ bool ScDPTableDataCache::ValidQuery( SCROW nRow, const ScQueryParam &rParam, BOO // ----------------------------------------------------------------------- bool ScDPTableDataCache::IsRowEmpty( SCROW nRow ) const { - return mbEmptyRow[ nRow ]; + return mbEmptyRow[ nRow ]; } @@ -884,10 +884,10 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData) { DBG_ASSERT( IsValid(), " IsValid() == false " ); DBG_ASSERT( nDim < mnColumnCount && nDim >=0 , "dimension out of bound" ); - SCROW nIndex = 0; - - BOOL bInserted = FALSE; + SCROW nIndex = 0; + BOOL bInserted = FALSE; + pitemData->SetDate( lcl_isDate( GetNumType( pitemData->nNumFormat ) ) ); if ( !lcl_Search( mpTableDataValues[nDim], mpGlobalOrder[nDim], *pitemData, nIndex ) ) @@ -909,7 +909,7 @@ BOOL ScDPTableDataCache::AddData(long nDim, ScDPItemData* pitemData) if ( pitemData->IsHasData() ) mbEmptyRow[ nCurRow ] = FALSE; - if ( !bInserted ) + if ( !bInserted ) delete pitemData; return TRUE; @@ -921,7 +921,7 @@ String ScDPTableDataCache::GetDimensionName( USHORT nColumn ) const DBG_ASSERT( /* nColumn>=0 && */ nColumn < mrLabelNames.size()-1 , "ScDPTableDataCache::GetDimensionName"); DBG_ASSERT( mrLabelNames.size() == static_cast <USHORT> (mnColumnCount+1), "ScDPTableDataCache::GetDimensionName"); if ( static_cast<size_t>(nColumn+1) < mrLabelNames.size() ) - { + { return mrLabelNames[nColumn+1]->aString; } else @@ -929,11 +929,11 @@ String ScDPTableDataCache::GetDimensionName( USHORT nColumn ) const } void ScDPTableDataCache::AddLabel(ScDPItemData *pData) -{ +{ DBG_ASSERT( IsValid(), " IsValid() == false " ); if ( mrLabelNames.size() == 0 ) - mrLabelNames.push_back( new ScDPItemData( ScGlobal::GetRscString(STR_PIVOT_DATA) ) ); + mrLabelNames.push_back( new ScDPItemData( ScGlobal::GetRscString(STR_PIVOT_DATA) ) ); //reset name if needed @@ -957,7 +957,7 @@ void ScDPTableDataCache::AddLabel(ScDPItemData *pData) while ( !bFound ); pData->aString = strNewName; - mrLabelNames.push_back( pData ); + mrLabelNames.push_back( pData ); } SCROW ScDPTableDataCache::GetItemDataId(USHORT nDim, SCROW nRow, BOOL bRepeatIfEmpty) const @@ -966,7 +966,7 @@ SCROW ScDPTableDataCache::GetItemDataId(USHORT nDim, SCROW nRow, BOOL bRepeatIfE DBG_ASSERT( /* nDim >= 0 && */ nDim < mnColumnCount, "ScDPTableDataCache::GetItemDataId " ); if ( bRepeatIfEmpty ) - { + { while ( nRow >0 && !mpTableDataValues[nDim][ mpSourceData[nDim][nRow] ]->IsHasData() ) --nRow; } @@ -1004,7 +1004,7 @@ SCROW ScDPTableDataCache::GetSortedItemDataId(SCCOL nDim, SCROW nOrder) const DBG_ASSERT ( IsValid(), "IsValid"); DBG_ASSERT( nDim>=0 && nDim < mnColumnCount, "nDim < mnColumnCount"); DBG_ASSERT( nOrder >= 0 && (size_t) nOrder < mpGlobalOrder[nDim].size(), "nOrder < mpGlobalOrder[nDim].size()" ); - + return mpGlobalOrder[nDim][nOrder]; } @@ -1027,7 +1027,7 @@ ULONG ScDPTableDataCache::GetNumberFormat( long nDim ) const return mpTableDataValues[nDim][0]->nNumFormat; } -BOOL ScDPTableDataCache::IsDateDimension( long nDim ) const +BOOL ScDPTableDataCache::IsDateDimension( long nDim ) const { if ( nDim >= mnColumnCount ) return false; @@ -1061,7 +1061,7 @@ SCCOL ScDPTableDataCache::GetDimensionIndex(String sName) const } SCROW ScDPTableDataCache::GetIdByItemData(long nDim, String sItemData ) const -{ +{ if ( nDim < mnColumnCount && nDim >=0 ) { for ( size_t n = 0; n< mpTableDataValues[nDim].size(); n++ ) @@ -1070,13 +1070,13 @@ SCROW ScDPTableDataCache::GetIdByItemData(long nDim, String sItemData ) const return n; } } - + ScDPItemData rData ( sItemData ); return GetRowCount() +maAdditionalDatas.getDataId(rData); } SCROW ScDPTableDataCache::GetIdByItemData( long nDim, const ScDPItemData& rData ) const -{ +{ if ( nDim < mnColumnCount && nDim >=0 ) { for ( size_t n = 0; n< mpTableDataValues[nDim].size(); n++ ) @@ -1098,7 +1098,7 @@ SCROW ScDPTableDataCache::GetAdditionalItemID( const ScDPItemData& rData ) { return GetRowCount() + maAdditionalDatas.insertData( rData ); } - + SCROW ScDPTableDataCache::GetOrder(long nDim, SCROW nIndex) const { @@ -1122,17 +1122,17 @@ SCROW ScDPTableDataCache::GetOrder(long nDim, SCROW nIndex) const ScDocument* ScDPTableDataCache::GetDoc() const { - return mpDoc; + return mpDoc; }; -long ScDPTableDataCache::GetColumnCount() const +long ScDPTableDataCache::GetColumnCount() const { - return mnColumnCount; + return mnColumnCount; } -long ScDPTableDataCache::GetId() const +long ScDPTableDataCache::GetId() const { - return mnID; + return mnID; } - + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index cc7b986eeb16..a0c15f9fd665 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.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 @@ -42,12 +42,12 @@ #include "global.hxx" #include "subtotal.hxx" #include "globstr.hrc" -#include "datauno.hxx" // ScDataUnoConversion +#include "datauno.hxx" // ScDataUnoConversion #include "document.hxx" // for DumpState only! #include <math.h> -#include <float.h> //! Test !!! +#include <float.h> //! Test !!! #include <algorithm> #include <hash_map> @@ -73,20 +73,20 @@ SV_IMPL_PTRARR( ScDPDataMembers, ScDPDataMemberPtr ); // ----------------------------------------------------------------------- -static USHORT nFuncStrIds[12] = // passend zum enum ScSubTotalFunc -{ - 0, // SUBTOTAL_FUNC_NONE - STR_FUN_TEXT_AVG, // SUBTOTAL_FUNC_AVE - STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT - STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT2 - STR_FUN_TEXT_MAX, // SUBTOTAL_FUNC_MAX - STR_FUN_TEXT_MIN, // SUBTOTAL_FUNC_MIN - STR_FUN_TEXT_PRODUCT, // SUBTOTAL_FUNC_PROD - STR_FUN_TEXT_STDDEV, // SUBTOTAL_FUNC_STD - STR_FUN_TEXT_STDDEV, // SUBTOTAL_FUNC_STDP - STR_FUN_TEXT_SUM, // SUBTOTAL_FUNC_SUM - STR_FUN_TEXT_VAR, // SUBTOTAL_FUNC_VAR - STR_FUN_TEXT_VAR // SUBTOTAL_FUNC_VARP +static USHORT nFuncStrIds[12] = // passend zum enum ScSubTotalFunc +{ + 0, // SUBTOTAL_FUNC_NONE + STR_FUN_TEXT_AVG, // SUBTOTAL_FUNC_AVE + STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT + STR_FUN_TEXT_COUNT, // SUBTOTAL_FUNC_CNT2 + STR_FUN_TEXT_MAX, // SUBTOTAL_FUNC_MAX + STR_FUN_TEXT_MIN, // SUBTOTAL_FUNC_MIN + STR_FUN_TEXT_PRODUCT, // SUBTOTAL_FUNC_PROD + STR_FUN_TEXT_STDDEV, // SUBTOTAL_FUNC_STD + STR_FUN_TEXT_STDDEV, // SUBTOTAL_FUNC_STDP + STR_FUN_TEXT_SUM, // SUBTOTAL_FUNC_SUM + STR_FUN_TEXT_VAR, // SUBTOTAL_FUNC_VAR + STR_FUN_TEXT_VAR // SUBTOTAL_FUNC_VARP }; namespace { template < typename T > @@ -96,7 +96,7 @@ namespace { for ( size_t i = 0 ; i < vec.size(); i++ ) { if ( vec[i] ) - delete vec[i]; + delete vec[i]; } vec.resize( nSize, NULL ); } @@ -419,8 +419,8 @@ ScDPRelativePos::ScDPRelativePos( long nBase, long nDir ) : void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ) { - if (nCount<0) // error? - return; // nothing more... + if (nCount<0) // error? + return; // nothing more... if ( rNext.nType == SC_VALTYPE_EMPTY ) return; @@ -434,35 +434,35 @@ void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, cons if ( eFunc == SUBTOTAL_FUNC_NONE ) return; - if ( eFunc != SUBTOTAL_FUNC_CNT2 ) // CNT2 counts everything, incl. strings and errors + if ( eFunc != SUBTOTAL_FUNC_CNT2 ) // CNT2 counts everything, incl. strings and errors { if ( rNext.nType == SC_VALTYPE_ERROR ) { - nCount = -1; // -1 for error (not for CNT2) + nCount = -1; // -1 for error (not for CNT2) return; } if ( rNext.nType == SC_VALTYPE_STRING ) - return; // ignore + return; // ignore } - ++nCount; // for all functions + ++nCount; // for all functions switch (eFunc) { case SUBTOTAL_FUNC_SUM: case SUBTOTAL_FUNC_AVE: if ( !SubTotal::SafePlus( fVal, rNext.fValue ) ) - nCount = -1; // -1 for error + nCount = -1; // -1 for error break; case SUBTOTAL_FUNC_PROD: - if ( nCount == 1 ) // copy first value (fVal is initialized to 0) + if ( nCount == 1 ) // copy first value (fVal is initialized to 0) fVal = rNext.fValue; else if ( !SubTotal::SafeMult( fVal, rNext.fValue ) ) - nCount = -1; // -1 for error + nCount = -1; // -1 for error break; case SUBTOTAL_FUNC_CNT: case SUBTOTAL_FUNC_CNT2: - // nothing more than incrementing nCount + // nothing more than incrementing nCount break; case SUBTOTAL_FUNC_MAX: if ( nCount == 1 || rNext.fValue > fVal ) @@ -479,11 +479,11 @@ void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, cons { // fAux is used to sum up squares if ( !SubTotal::SafePlus( fVal, rNext.fValue ) ) - nCount = -1; // -1 for error + nCount = -1; // -1 for error double fAdd = rNext.fValue; if ( !SubTotal::SafeMult( fAdd, rNext.fValue ) || !SubTotal::SafePlus( fAux, fAdd ) ) - nCount = -1; // -1 for error + nCount = -1; // -1 for error } break; default: @@ -493,8 +493,8 @@ void ScDPAggData::Update( const ScDPValueData& rNext, ScSubTotalFunc eFunc, cons void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSubState ) { - // calculate the original result - // (without reference value, used as the basis for reference value calculation) + // calculate the original result + // (without reference value, used as the basis for reference value calculation) // called several times at the cross-section of several subtotals - don't calculate twice then if ( IsCalculated() ) @@ -509,7 +509,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub return; } - // check the error conditions for the selected function + // check the error conditions for the selected function BOOL bError = FALSE; switch (eFunc) @@ -518,7 +518,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub case SUBTOTAL_FUNC_PROD: case SUBTOTAL_FUNC_CNT: case SUBTOTAL_FUNC_CNT2: - bError = ( nCount < 0 ); // only real errors + bError = ( nCount < 0 ); // only real errors break; case SUBTOTAL_FUNC_AVE: @@ -526,19 +526,19 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub case SUBTOTAL_FUNC_MIN: case SUBTOTAL_FUNC_STDP: case SUBTOTAL_FUNC_VARP: - bError = ( nCount <= 0 ); // no data is an error + bError = ( nCount <= 0 ); // no data is an error break; case SUBTOTAL_FUNC_STD: case SUBTOTAL_FUNC_VAR: - bError = ( nCount < 2 ); // need at least 2 values + bError = ( nCount < 2 ); // need at least 2 values break; default: DBG_ERROR("invalid function"); } - // calculate the selected function + // calculate the selected function double fResult = 0.0; if ( !bError ) @@ -549,7 +549,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub case SUBTOTAL_FUNC_MIN: case SUBTOTAL_FUNC_SUM: case SUBTOTAL_FUNC_PROD: - // different error conditions are handled above + // different error conditions are handled above fResult = fVal; break; @@ -563,7 +563,7 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub fResult = fVal / (double) nCount; break; - //! use safe mul for fVal * fVal + //! use safe mul for fVal * fVal case SUBTOTAL_FUNC_STD: if ( nCount >= 2 ) @@ -586,13 +586,13 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub } } - BOOL bEmpty = ( nCount == 0 ); // no data + BOOL bEmpty = ( nCount == 0 ); // no data - // store the result - // Empty is checked first, so empty results are shown empty even for "average" etc. - // If these results should be treated as errors in reference value calculations, - // a separate state value (EMPTY_ERROR) is needed. - // Now, for compatibility, empty "average" results are counted as 0. + // store the result + // Empty is checked first, so empty results are shown empty even for "average" etc. + // If these results should be treated as errors in reference value calculations, + // a separate state value (EMPTY_ERROR) is needed. + // Now, for compatibility, empty "average" results are counted as 0. if ( bEmpty ) nCount = SC_DPAGG_RESULT_EMPTY; @@ -602,11 +602,11 @@ void ScDPAggData::Calculate( ScSubTotalFunc eFunc, const ScDPSubTotalState& rSub nCount = SC_DPAGG_RESULT_VALID; if ( bEmpty || bError ) - fResult = 0.0; // default, in case the state is later modified + fResult = 0.0; // default, in case the state is later modified // fprintf(stdout, "ScDPAggData::Calculate: result = %g\n", fResult);fflush(stdout); - fVal = fResult; // used directly from now on - fAux = 0.0; // used for running total or original result of reference value + fVal = fResult; // used directly from now on + fAux = 0.0; // used for running total or original result of reference value } BOOL ScDPAggData::IsCalculated() const @@ -741,7 +741,7 @@ static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) ScSubTotalFunc eRet = SUBTOTAL_FUNC_NONE; if ( pLevel ) { - //! direct access via ScDPLevel + //! direct access via ScDPLevel uno::Sequence<sheet::GeneralFunction> aSeq = pLevel->getSubTotals(); long nSequence = aSeq.getLength(); @@ -766,7 +766,7 @@ static ScSubTotalFunc lcl_GetForceFunc( const ScDPLevel* pLevel, long nFuncNo ) // ----------------------------------------------------------------------- -ScDPResultData::ScDPResultData( ScDPSource* pSrc ) : //! Ref +ScDPResultData::ScDPResultData( ScDPSource* pSrc ) : //! Ref pSource( pSrc ), nMeasCount( 0 ), pMeasFuncs( NULL ), @@ -816,11 +816,11 @@ void ScDPResultData::SetMeasureData( long nCount, const ScSubTotalFunc* pFunctio } else { - // use one dummy measure + // use one dummy measure nMeasCount = 1; pMeasFuncs = new ScSubTotalFunc[1]; pMeasFuncs[0] = SUBTOTAL_FUNC_NONE; - pMeasRefs = new sheet::DataPilotFieldReference[1]; // default ctor is ok + pMeasRefs = new sheet::DataPilotFieldReference[1]; // default ctor is ok pMeasRefOrient = new USHORT[1]; pMeasRefOrient[0] = sheet::DataPilotFieldOrientation_HIDDEN; pMeasNames = new String[1]; @@ -871,13 +871,13 @@ USHORT ScDPResultData::GetMeasureRefOrient(long nMeasure) const String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFunc eForceFunc, bool& rbTotalResult) const { - // with bForce==TRUE, return function instead of "result" for single measure - // with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc + // with bForce==TRUE, return function instead of "result" for single measure + // with eForceFunc != SUBTOTAL_FUNC_NONE, always use eForceFunc rbTotalResult = false; if ( nMeasure < 0 || ( nMeasCount == 1 && !bForce && eForceFunc == SUBTOTAL_FUNC_NONE ) ) { - // for user-specified subtotal function with all measures, - // display only function name + // for user-specified subtotal function with all measures, + // display only function name if ( eForceFunc != SUBTOTAL_FUNC_NONE ) return ScGlobal::GetRscString(nFuncStrIds[eForceFunc]); @@ -900,10 +900,10 @@ String ScDPResultData::GetMeasureString(long nMeasure, BOOL bForce, ScSubTotalFu USHORT nId = nFuncStrIds[eFunc]; if (nId) { - aRet += ScGlobal::GetRscString(nId); // function name + aRet += ScGlobal::GetRscString(nId); // function name aRet.AppendAscii(RTL_CONSTASCII_STRINGPARAM( " - " )); } - aRet += pMeasNames[nMeasure]; // field name + aRet += pMeasNames[nMeasure]; // field name return aRet; } @@ -941,7 +941,7 @@ BOOL ScDPResultData::IsInGroup( const ScDPItemData& rGroupData, long nGroupIndex const ScDPItemData* pData = pSource->GetItemDataById( nGroupIndex , nBaseDataId); if ( pData ) return pSource->GetData()->IsInGroup( rGroupData, nGroupIndex, *pData , nBaseIndex ); - else + else return FALSE; } BOOL ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex, @@ -950,7 +950,7 @@ BOOL ScDPResultData::IsInGroup( SCROW nGroupDataId, long nGroupIndex, const ScDPItemData* pGroupData = pSource->GetItemDataById( nGroupIndex , nGroupDataId); if ( pGroupData ) return pSource->GetData()->IsInGroup( *pGroupData, nGroupIndex, rBaseData , nBaseIndex ); - else + else return FALSE; } @@ -969,17 +969,17 @@ const ScDPSource* ScDPResultData::GetSource() const return pSource; } -ResultMembers* ScDPResultData::GetDimResultMembers( long nDim , ScDPDimension* pDim, ScDPLevel* pLevel) const +ResultMembers* ScDPResultData::GetDimResultMembers( long nDim , ScDPDimension* pDim, ScDPLevel* pLevel) const { - if ( mpDimMembers[ nDim ] == NULL ) + if ( mpDimMembers[ nDim ] == NULL ) { - //long nDimSource = pDim->GetDimension(); - + //long nDimSource = pDim->GetDimension(); + ResultMembers* pResultMembers = new ResultMembers(); // global order is used to initialize aMembers, so it doesn't have to be looked at later const ScMemberSortOrder& rGlobalOrder = pLevel->GetGlobalOrder(); - + ScDPMembers* pMembers = pLevel->GetMembersObject(); long nMembCount = pMembers->getCount(); for ( long i=0; i<nMembCount; i++ ) @@ -1018,7 +1018,7 @@ ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, const ScDPPare // pParentLevel/pMemberDesc is 0 for root members } -ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, +ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, BOOL bForceSub ) : pResultData( pData ), pChildDimension( NULL ), @@ -1043,7 +1043,7 @@ String ScDPResultMember::GetName() const if (pMemberDesc) return pMemberDesc->GetNameStr(); else - return ScGlobal::GetRscString(STR_PIVOT_TOTAL); // root member + return ScGlobal::GetRscString(STR_PIVOT_TOTAL); // root member } void ScDPResultMember::FillItemData( ScDPItemData& rData ) const @@ -1057,7 +1057,7 @@ void ScDPResultMember::FillItemData( ScDPItemData& rData ) const BOOL ScDPResultMember::IsNamedItem( SCROW nIndex ) const { - //! store ScDPMember pointer instead of ScDPMember ??? + //! store ScDPMember pointer instead of ScDPMember ??? const ScDPMember* pMemberDesc = GetDPMember(); if (pMemberDesc) return ((ScDPMember*)pMemberDesc)->IsNamedItem( nIndex ); @@ -1083,11 +1083,11 @@ bool ScDPResultMember::IsValidEntry( const vector< SCROW >& aMembers ) const return true; } -void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, +void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, size_t nPos, ScDPInitState& rInitState , BOOL bInitChild /*= TRUE */) { - // with LateInit, initialize only those members that have data + // with LateInit, initialize only those members that have data if ( pResultData->IsLateInit() ) return; @@ -1096,7 +1096,7 @@ void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vect if (nPos >= ppDim.size()) return; - // skip child dimension if details are not shown + // skip child dimension if details are not shown if ( GetDPMember() && !GetDPMember()->getShowDetails() ) { // Wang Xu Ming -- 2009-6-16 @@ -1111,17 +1111,17 @@ void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vect pChildDimension->InitFrom( ppDim, ppLev, nPos, rInitState , FALSE ); return; } - else + else { //find next dim nPos ++; nMemberStep ++; } } // End Comments - bHasHiddenDetails = TRUE; // only if there is a next dimension + bHasHiddenDetails = TRUE; // only if there is a next dimension return; } - + if ( bInitChild ) { pChildDimension = new ScDPResultDimension( pResultData ); @@ -1129,11 +1129,11 @@ void ScDPResultMember::InitFrom( const vector<ScDPDimension*>& ppDim, const vect } } -void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev*/, +void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev*/, const vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState ) { - // without LateInit, everything has already been initialized + // without LateInit, everything has already been initialized if ( !pResultData->IsLateInit() ) return; @@ -1143,7 +1143,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD // No next dimension. Bail out. return; - // skip child dimension if details are not shown + // skip child dimension if details are not shown if ( GetDPMember() && !GetDPMember()->getShowDetails() ) { // Wang Xu Ming -- 2009-6-16 @@ -1165,7 +1165,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD rParams.SetInitChild( bWasInitChild ); return; } - else + else { //find next dim nPos ++; nMemberStep ++; @@ -1176,7 +1176,7 @@ void ScDPResultMember::LateInitFrom( LateInitParams& rParams/*const vector<ScDPD return; } - // LateInitFrom is called several times... + // LateInitFrom is called several times... if ( rParams.GetInitChild() ) { if ( !pChildDimension ) @@ -1211,7 +1211,7 @@ long ScDPResultMember::GetSize(long nMeasure) const { if ( !IsVisible() ) return 0; - const ScDPLevel* pParentLevel = GetParentLevel(); + const ScDPLevel* pParentLevel = GetParentLevel(); long nExtraSpace = 0; if ( pParentLevel && pParentLevel->IsAddEmpty() ) ++nExtraSpace; @@ -1246,18 +1246,18 @@ long ScDPResultMember::GetSize(long nMeasure) const BOOL ScDPResultMember::IsVisible() const { - // not initialized -> shouldn't be there at all - // (allocated only to preserve ordering) - const ScDPLevel* pParentLevel = GetParentLevel(); + // not initialized -> shouldn't be there at all + // (allocated only to preserve ordering) + const ScDPLevel* pParentLevel = GetParentLevel(); return ( bHasElements || ( pParentLevel && pParentLevel->getShowEmpty() ) ) && IsValid() && bInitialized; } BOOL ScDPResultMember::IsValid() const { - // non-Valid members are left out of calculation + // non-Valid members are left out of calculation - // was member set no invisible at the DataPilotSource? - const ScDPMember* pMemberDesc =GetDPMember(); + // was member set no invisible at the DataPilotSource? + const ScDPMember* pMemberDesc =GetDPMember(); if ( pMemberDesc && !pMemberDesc->getIsVisible() ) return FALSE; @@ -1280,13 +1280,13 @@ long ScDPResultMember::GetSubTotalCount( long* pUserSubStart ) const if ( pUserSubStart ) *pUserSubStart = 0; // default - const ScDPLevel* pParentLevel = GetParentLevel(); + const ScDPLevel* pParentLevel = GetParentLevel(); - if ( bForceSubTotal ) // set if needed for root members - return 1; // grand total is always "automatic" + if ( bForceSubTotal ) // set if needed for root members + return 1; // grand total is always "automatic" else if ( pParentLevel ) { - //! direct access via ScDPLevel + //! direct access via ScDPLevel uno::Sequence<sheet::GeneralFunction> aSeq = pParentLevel->getSubTotals(); long nSequence = aSeq.getLength(); @@ -1328,8 +1328,8 @@ void ScDPResultMember::ProcessData( const vector< SCROW >& aChildMembers, const // show only own values if there's no child dimension (innermost). if ( !nUserSubCount || !pChildDimension ) nUserSubCount = 1; - - const ScDPLevel* pParentLevel = GetParentLevel(); + + const ScDPLevel* pParentLevel = GetParentLevel(); for (long nUserPos=0; nUserPos<nUserSubCount; nUserPos++) // including hidden "automatic" { @@ -1344,10 +1344,10 @@ void ScDPResultMember::ProcessData( const vector< SCROW >& aChildMembers, const } } -/** +/** * Parse subtotal string and replace all occurrences of '?' with the caption * string. Do ensure that escaped characters are not translated. - */ + */ static String lcl_parseSubtotalName(const String& rSubStr, const String& rCaption) { String aNewStr; @@ -1376,8 +1376,8 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS const String* pMemberName, const String* pMemberCaption ) { - // IsVisible() test is in ScDPResultDimension::FillMemberResults - // (not on data layout dimension) + // IsVisible() test is in ScDPResultDimension::FillMemberResults + // (not on data layout dimension) long nSize = GetSize(nMeasure); sheet::MemberResult* pArray = pSequences->getArray(); @@ -1385,7 +1385,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS BOOL bIsNumeric = FALSE; String aName; - if ( pMemberName ) // if pMemberName != NULL, use instead of real member name + if ( pMemberName ) // if pMemberName != NULL, use instead of real member name aName = *pMemberName; else { @@ -1394,7 +1394,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS aName = aItemData.GetString(); bIsNumeric = aItemData.IsValue(); } - const ScDPDimension* pParentDim = GetParentDim(); + const ScDPDimension* pParentDim = GetParentDim(); if ( bIsNumeric && pParentDim && pResultData->IsNumOrDateGroup( pParentDim->GetDimension() ) ) { // Numeric group dimensions use numeric entries for proper sorting, @@ -1414,7 +1414,7 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS } } - if ( pMemberCaption ) // use pMemberCaption if != NULL + if ( pMemberCaption ) // use pMemberCaption if != NULL aCaption = *pMemberCaption; if (!aCaption.Len()) aCaption = ScGlobal::GetRscString(STR_EMPTYDATA); @@ -1424,18 +1424,18 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS else pArray[rPos].Flags &= ~sheet::MemberResultFlags::NUMERIC; - if ( nSize && !bRoot ) // root is overwritten by first dimension + if ( nSize && !bRoot ) // root is overwritten by first dimension { pArray[rPos].Name = rtl::OUString(aName); pArray[rPos].Caption = rtl::OUString(aCaption); - pArray[rPos].Flags |= sheet::MemberResultFlags::HASMEMBER; + pArray[rPos].Flags |= sheet::MemberResultFlags::HASMEMBER; - // set "continue" flag (removed for subtotals later) + // set "continue" flag (removed for subtotals later) for (long i=1; i<nSize; i++) pArray[rPos+i].Flags |= sheet::MemberResultFlags::CONTINUE; } - - const ScDPLevel* pParentLevel = GetParentLevel(); + + const ScDPLevel* pParentLevel = GetParentLevel(); long nExtraSpace = 0; if ( pParentLevel && pParentLevel->IsAddEmpty() ) ++nExtraSpace; @@ -1454,11 +1454,11 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS if ( bTitleLine ) // in tabular layout the title is on a separate row ++rPos; // -> fill child dimension one row below - if (bRoot) // same sequence for root member + if (bRoot) // same sequence for root member pChildDimension->FillMemberResults( pSequences, rPos, nMeasure ); else //pChildDimension->FillMemberResults( pSequences + 1, rPos, nMeasure ); - pChildDimension->FillMemberResults( pSequences + nMemberStep/*1*/, rPos, nMeasure ); + pChildDimension->FillMemberResults( pSequences + nMemberStep/*1*/, rPos, nMeasure ); if ( bTitleLine ) // title row is included in GetSize, so the following --rPos; // positions are calculated with the normal values @@ -1520,8 +1520,8 @@ void ScDPResultMember::FillMemberResults( uno::Sequence<sheet::MemberResult>* pS if ( nMeasure == SC_DPMEASURE_ALL ) { - // data layout dimension is (direct/indirect) child of this. - // data layout dimension must have name for all entries. + // data layout dimension is (direct/indirect) child of this. + // data layout dimension must have name for all entries. uno::Sequence<sheet::MemberResult>* pLayoutSeq = pSequences; if (!bRoot) @@ -1552,9 +1552,9 @@ void ScDPResultMember::FillDataResults( const ScDPResultMember* pRefMember, uno::Sequence< uno::Sequence<sheet::DataResult> >& rSequence, long& rRow, long nMeasure ) const { - // IsVisible() test is in ScDPResultDimension::FillDataResults - // (not on data layout dimension) - const ScDPLevel* pParentLevel = GetParentLevel(); + // IsVisible() test is in ScDPResultDimension::FillDataResults + // (not on data layout dimension) + const ScDPLevel* pParentLevel = GetParentLevel(); long nStartRow = rRow; long nExtraSpace = 0; @@ -1609,7 +1609,7 @@ void ScDPResultMember::FillDataResults( const ScDPResultMember* pRefMember, if ( pDataRoot ) { - ScDPSubTotalState aSubState; // initial state + ScDPSubTotalState aSubState; // initial state for (long nUserPos=nUserSubStart; nUserPos<nUserSubCount; nUserPos++) { @@ -1892,7 +1892,7 @@ long lcl_GetSubTotalPos( const ScDPSubTotalState& rSubState ) void ScDPDataMember::UpdateValues( const vector<ScDPValueData>& aValues, const ScDPSubTotalState& rSubState ) { - //! find out how many and which subtotals are used + //! find out how many and which subtotals are used ScDPAggData* pAgg = &aAggregate; @@ -1919,13 +1919,13 @@ void ScDPDataMember::ProcessData( const vector< SCROW >& aChildMembers, const ve { if ( pResultData->IsLateInit() && !pChildDimension && pResultMember && pResultMember->GetChildDimension() ) { - // if this DataMember doesn't have a child dimension because the ResultMember's - // child dimension wasn't there yet during this DataMembers's creation, - // create the child dimension now + // if this DataMember doesn't have a child dimension because the ResultMember's + // child dimension wasn't there yet during this DataMembers's creation, + // create the child dimension now InitFrom( pResultMember->GetChildDimension() ); } - ScDPSubTotalState aLocalSubState(rSubState); // keep row state, modify column + ScDPSubTotalState aLocalSubState(rSubState); // keep row state, modify column long nUserSubCount = pResultMember ? pResultMember->GetSubTotalCount() : 0; @@ -1947,7 +1947,7 @@ void ScDPDataMember::ProcessData( const vector< SCROW >& aChildMembers, const ve } if (pChildDimension) - pChildDimension->ProcessData( aChildMembers, aValues, rSubState ); // with unmodified subtotal state + pChildDimension->ProcessData( aChildMembers, aValues, rSubState ); // with unmodified subtotal state } BOOL ScDPDataMember::HasData( long nMeasure, const ScDPSubTotalState& rSubState ) const @@ -1956,11 +1956,11 @@ BOOL ScDPDataMember::HasData( long nMeasure, const ScDPSubTotalState& rSubState rSubState.eColForce != rSubState.eRowForce ) return FALSE; - // #74542# HasData can be different between measures! + // #74542# HasData can be different between measures! const ScDPAggData* pAgg = GetConstAggData( nMeasure, rSubState ); if (!pAgg) - return FALSE; //! error? + return FALSE; //! error? return pAgg->HasData(); } @@ -1978,7 +1978,7 @@ double ScDPDataMember::GetAggregate( long nMeasure, const ScDPSubTotalState& rSu { const ScDPAggData* pAgg = GetConstAggData( nMeasure, rSubState ); if (!pAgg) - return DBL_MAX; //! error? + return DBL_MAX; //! error? return pAgg->GetResult(); } @@ -2030,7 +2030,7 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember, { DBG_ASSERT( pRefMember == pResultMember || !pResultMember, "bla" ); - if ( pRefMember->IsVisible() ) //! here or in ScDPDataDimension::FillDataRow ??? + if ( pRefMember->IsVisible() ) //! here or in ScDPDataDimension::FillDataRow ??? { long nStartCol = rCol; @@ -2049,8 +2049,8 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember, BOOL bSubTotalInTitle = pRefMember->IsSubTotalInTitle( nMeasure ); - // leave space for children even if the DataMember hasn't been initialized - // (pDataChild is null then, this happens when no values for it are in this row) + // leave space for children even if the DataMember hasn't been initialized + // (pDataChild is null then, this happens when no values for it are in this row) BOOL bHasChild = ( pRefChild != NULL ); if ( bHasChild ) @@ -2078,7 +2078,7 @@ void ScDPDataMember::FillDataRow( const ScDPResultMember* pRefMember, nUserSubStart = 0; } - ScDPSubTotalState aLocalSubState(rSubState); // keep row state, modify column + ScDPSubTotalState aLocalSubState(rSubState); // keep row state, modify column long nMemberMeasure = nMeasure; long nSubSize = pResultData->GetCountForMeasure(nMeasure); @@ -2481,7 +2481,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, if ( bRefDimInCol ) { aRefItemPos.nBasePos = pColVisible[nColPos]; // without sort order applied - pSelectMember = ScDPResultDimension::GetColReferenceMember( pRefPos, pRefName, + pSelectMember = ScDPResultDimension::GetColReferenceMember( pRefPos, pRefName, nColPos, rRunning ); } else @@ -2610,7 +2610,7 @@ void ScDPDataMember::UpdateRunningTotals( const ScDPResultMember* pRefMember, if ( nRowTotal == 0.0 || nColTotal == 0.0 ) pAggData->SetError(); else - pAggData->SetResult( + pAggData->SetResult( ( pAggData->GetResult() * nGrandTotal ) / ( nRowTotal * nColTotal ) ); } @@ -2781,7 +2781,7 @@ ScDPResultMember *ScDPResultDimension::FindMember( SCROW iData ) const return NULL; } -void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, +void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLev, size_t nPos, ScDPInitState& rInitState, BOOL bInitChild /*= TRUE */ ) { if (nPos >= ppDim.size() || nPos >= ppLev.size()) @@ -2800,7 +2800,7 @@ void ScDPResultDimension::InitFrom( const vector<ScDPDimension*>& ppDim, const v } bIsDataLayout = pThisDim->getIsDataLayoutDimension(); // member - aDimensionName = pThisDim->getName(); // member + aDimensionName = pThisDim->getName(); // member // Check the autoshow setting. If it's enabled, store the settings. const sheet::DataPilotFieldAutoShowInfo& rAutoInfo = pThisLevel->GetAutoShow(); @@ -2857,7 +2857,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S return; #ifdef DBG_UTIL DBG_ASSERT( nPos <= pItemData.size(), ByteString::CreateFromInt32( pItemData.size()).GetBuffer() ); -#endif +#endif ScDPDimension* pThisDim = rParams.GetDim( nPos ); ScDPLevel* pThisLevel = rParams.GetLevel( nPos ); SCROW rThisData = pItemData[nPos]; @@ -2871,7 +2871,7 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S if ( !bInitialized ) { // init some values - // create all members at the first call (preserve order) + // create all members at the first call (preserve order) bIsDataLayout = pThisDim->getIsDataLayoutDimension(); aDimensionName = pThisDim->getName(); @@ -2906,14 +2906,14 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S #endif pMembers->SetHasHideDetailsMembers( FALSE ); } - + bool bNewAllMembers =(!rParams.IsRow()) || nPos == 0 || bLateInitAllMembers ; - + if (bNewAllMembers ) - { + { // global order is used to initialize aMembers, so it doesn't have to be looked at later if ( !bInitialized ) - { //init all members + { //init all members const ScMemberSortOrder& rGlobalOrder = pThisLevel->GetGlobalOrder(); ScDPGroupCompare aCompare( pResultData, rInitState, nDimSource ); @@ -2932,21 +2932,21 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S } bInitialized = TRUE; // don't call again, even if no members were included } - // initialize only specific member (or all if "show empty" flag is set) + // initialize only specific member (or all if "show empty" flag is set) if ( bLateInitAllMembers ) { long nCount = maMemberArray.size(); for (long i=0; i<nCount; i++) { ScDPResultMember* pResultMember = maMemberArray[i]; - - // check show empty + + // check show empty BOOL bAllChildren = FALSE; if( bShowEmpty ) { if ( pResultMember->IsNamedItem( rThisData ) ) bAllChildren = FALSE; - else + else bAllChildren = TRUE; } rParams.SetInitAllChildren( bAllChildren ); @@ -2962,14 +2962,14 @@ void ScDPResultDimension::LateInitFrom( LateInitParams& rParams/* const vector<S { //DBG_TRACE( "ScDPResultDimension::LateInitFrom"); // DBG_TRACESTR( pResultMember->GetDPMember()->GetNameStr()); - + rInitState.AddMember( nDimSource, pResultMember->GetDataId() ); pResultMember->LateInitFrom( rParams, pItemData, nPos+1, rInitState ); rInitState.RemoveMember(); } } } - else + else InitWithMembers( rParams, pItemData, nPos, rInitState ); } @@ -2981,12 +2981,12 @@ long ScDPResultDimension::GetSize(long nMeasure) const { DBG_ASSERT(nMeasure == SC_DPMEASURE_ALL || pResultData->GetMeasureCount() == 1, "DataLayout dimension twice?"); - // repeat first member... - nTotal = nMemberCount * maMemberArray[0]->GetSize(0); // all measures have equal size + // repeat first member... + nTotal = nMemberCount * maMemberArray[0]->GetSize(0); // all measures have equal size } else { - // add all members + // add all members for (long nMem=0; nMem<nMemberCount; nMem++) nTotal += maMemberArray[nMem]->GetSize(nMeasure); } @@ -3011,7 +3011,7 @@ bool ScDPResultDimension::IsValidEntry( const vector< SCROW >& aMembers ) const } void ScDPResultDimension::ProcessData( const vector< SCROW >& aMembers, - const ScDPResultDimension* pDataDim, + const ScDPResultDimension* pDataDim, const vector< SCROW >& aDataMembers, const vector<ScDPValueData>& aValues ) const { @@ -3045,7 +3045,7 @@ void ScDPResultDimension::FillMemberResults( uno::Sequence<sheet::MemberResult>* long nSorted = aMemberOrder.empty() ? i : aMemberOrder[i]; ScDPResultMember* pMember = maMemberArray[nSorted]; - // in data layout dimension, use first member with different measures/names + // in data layout dimension, use first member with different measures/names if ( bIsDataLayout ) { bool bTotalResult = false; @@ -3548,8 +3548,8 @@ void ScDPDataDimension::InitFrom( const ScDPResultDimension* pDim ) if ( !pResultData->IsLateInit() ) { - // with LateInit, pResMem hasn't necessarily been initialized yet, - // so InitFrom for the new result member is called from its ProcessData method + // with LateInit, pResMem hasn't necessarily been initialized yet, + // so InitFrom for the new result member is called from its ProcessData method const ScDPResultDimension* pChildDim = pResMem->GetChildDimension(); if ( pChildDim ) @@ -3612,7 +3612,7 @@ void ScDPDataDimension::FillDataRow( const ScDPResultDimension* pRefDim, } const ScDPResultMember* pRefMember = pRefDim->GetMember(nMemberPos); - if ( pRefMember->IsVisible() ) //! here or in ScDPDataMember::FillDataRow ??? + if ( pRefMember->IsVisible() ) //! here or in ScDPDataMember::FillDataRow ??? { const ScDPDataMember* pDataMember = aMembers[(USHORT)nMemberPos]; pDataMember->FillDataRow( pRefMember, rSequence, nMemberCol, nMemberMeasure, bIsSubTotalRow, rSubState ); @@ -3899,10 +3899,10 @@ void ScDPResultVisibilityData::fillFieldFilters(vector<ScDPCacheTable::Criterion continue; long nDimIndex = itrField->second; - aCri.mnFieldIndex = static_cast<sal_Int32>(nDimIndex); + aCri.mnFieldIndex = static_cast<sal_Int32>(nDimIndex); aCri.mpFilter.reset(new ScDPCacheTable::GroupFilter(/*mrSharedString*/)); - - ScDPCacheTable::GroupFilter* pGrpFilter = + + ScDPCacheTable::GroupFilter* pGrpFilter = static_cast<ScDPCacheTable::GroupFilter*>(aCri.mpFilter.get()); const VisibleMemberType& rMem = itr->second; @@ -3930,7 +3930,7 @@ size_t ScDPResultVisibilityData::MemberHash::operator() (const ScDPItemData& r) } // Wang Xu Ming -- 2009-6-10 // DataPilot Migration -SCROW ScDPResultMember::GetDataId( ) const +SCROW ScDPResultMember::GetDataId( ) const { const ScDPMember* pMemberDesc = GetDPMember(); if (pMemberDesc) @@ -3941,9 +3941,9 @@ SCROW ScDPResultMember::GetDataId( ) const ScDPResultMember* ScDPResultDimension::AddMember(const ScDPParentDimData &aData ) { ScDPResultMember* pMember = new ScDPResultMember( pResultData, aData, FALSE ); - SCROW nDataIndex = pMember->GetDataId(); + SCROW nDataIndex = pMember->GetDataId(); maMemberArray.push_back( pMember ); - + if ( maMemberHash.end() == maMemberHash.find( nDataIndex ) ) maMemberHash.insert( std::pair< SCROW, ScDPResultMember *>( nDataIndex, pMember ) ); return pMember; @@ -3954,7 +3954,7 @@ ResultMembers* ScDPResultDimension::GetResultMember( ScDPDimension* pThisDim, Sc ResultMembers* pResultMembers = new ResultMembers(); // global order is used to initialize aMembers, so it doesn't have to be looked at later const ScMemberSortOrder& rGlobalOrder = pThisLevel->GetGlobalOrder(); - + ScDPMembers* pMembers = pThisLevel->GetMembersObject(); long nMembCount = pMembers->getCount(); for ( long i=0; i<nMembCount; i++ ) @@ -3978,7 +3978,7 @@ ScDPResultMember* ScDPResultDimension::InsertMember(ScDPParentDimData *pMemberDa ScDPResultMember* pNew = new ScDPResultMember( pResultData, *pMemberData, FALSE ); maMemberArray.insert( maMemberArray.begin()+nInsert, pNew ); - SCROW nDataIndex = pMemberData->mpMemberDesc->GetItemDataId(); + SCROW nDataIndex = pMemberData->mpMemberDesc->GetItemDataId(); if ( maMemberHash.end() == maMemberHash.find( nDataIndex ) ) maMemberHash.insert( std::pair< SCROW, ScDPResultMember *>( nDataIndex, pNew ) ); return pNew; @@ -3986,8 +3986,8 @@ ScDPResultMember* ScDPResultDimension::InsertMember(ScDPParentDimData *pMemberDa return maMemberArray[ nInsert ]; } -void ScDPResultDimension:: InitWithMembers( LateInitParams& rParams, - const ::std::vector< SCROW >& pItemData, +void ScDPResultDimension:: InitWithMembers( LateInitParams& rParams, + const ::std::vector< SCROW >& pItemData, size_t nPos, ScDPInitState& rInitState ) { @@ -4001,14 +4001,14 @@ void ScDPResultDimension:: InitWithMembers( LateInitParams& rParams, { long nDimSource = pThisDim->GetDimension(); //! check GetSourceDim? - // create all members at the first call (preserve order) + // create all members at the first call (preserve order) ResultMembers* pMembers = pResultData->GetDimResultMembers(nDimSource, pThisDim, pThisLevel); ScDPGroupCompare aCompare( pResultData, rInitState, nDimSource ); - // initialize only specific member (or all if "show empty" flag is set) + // initialize only specific member (or all if "show empty" flag is set) ScDPResultMember* pResultMember = NULL; - if ( bInitialized ) + if ( bInitialized ) pResultMember = FindMember( nDataID ); - else + else bInitialized = TRUE; if ( pResultMember == NULL ) @@ -4083,7 +4083,7 @@ void ScDPResultDimension::CheckShowEmpty( BOOL bShow ) for (long i=0; i<nCount; i++) { pMember = maMemberArray.at(i); - pMember->CheckShowEmpty( bShow ); + pMember->CheckShowEmpty( bShow ); } } @@ -4105,7 +4105,7 @@ void ScDPResultMember::CheckShowEmpty( BOOL bShow ) ScDPResultDimension* pChildDim = GetChildDimension(); if (pChildDim ) pChildDim->CheckShowEmpty( TRUE ); - } + } } }// End Comments diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 4b9adca7e9c3..f6ef0df5d1fc 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.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,7 +57,7 @@ #include "dptabdat.hxx" #include "global.hxx" #include "collect.hxx" -#include "datauno.hxx" // ScDataUnoConversion +#include "datauno.hxx" // ScDataUnoConversion #include "miscuno.hxx" #include "unonames.hxx" @@ -87,7 +87,7 @@ using ::rtl::OUString; // ----------------------------------------------------------------------- -#define SC_MINCOUNT_LIMIT 1000000 +#define SC_MINCOUNT_LIMIT 1000000 // ----------------------------------------------------------------------- @@ -104,11 +104,11 @@ SC_SIMPLE_SERVICE_INFO( ScDPMember, "ScDPMember", "com.sun.star.sheet. // ----------------------------------------------------------------------- // property maps for PropertySetInfo -// DataDescription / NumberFormat are internal +// DataDescription / NumberFormat are internal // ----------------------------------------------------------------------- -//! move to a header? +//! move to a header? BOOL lcl_GetBoolFromAny( const uno::Any& aAny ) { if ( aAny.getValueTypeClass() == uno::TypeClass_BOOLEAN ) @@ -130,7 +130,7 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) : nRowDimCount( 0 ), nDataDimCount( 0 ), nPageDimCount( 0 ), - bColumnGrand( TRUE ), // default is true + bColumnGrand( TRUE ), // default is true bRowGrand( TRUE ), bIgnoreEmptyRows( FALSE ), bRepeatIfEmpty( FALSE ), @@ -149,9 +149,9 @@ ScDPSource::ScDPSource( ScDPTableData* pD ) : ScDPSource::~ScDPSource() { if (pDimensions) - pDimensions->release(); // ref-counted + pDimensions->release(); // ref-counted - //! free lists + //! free lists delete[] pColResults; delete[] pRowResults; @@ -235,12 +235,12 @@ BOOL lcl_TestSubTotal( BOOL& rAllowed, long nColumn, long* pArray, long nCount, for (long i=0; i<nCount; i++) if (pArray[i] == nColumn) { - // no subtotals for data layout dim, no matter where + // no subtotals for data layout dim, no matter where if ( pSource->IsDataLayoutDimension(nColumn) ) rAllowed = FALSE; else { - // no subtotals if no other dim but data layout follows + // no subtotals if no other dim but data layout follows long nNextIndex = i+1; if ( nNextIndex < nCount && pSource->IsDataLayoutDimension(pArray[nNextIndex]) ) ++nNextIndex; @@ -248,14 +248,14 @@ BOOL lcl_TestSubTotal( BOOL& rAllowed, long nColumn, long* pArray, long nCount, rAllowed = FALSE; } - return TRUE; // found + return TRUE; // found } return FALSE; } BOOL ScDPSource::SubTotalAllowed(long nColumn) { - //! cache this at ScDPResultData + //! cache this at ScDPResultData BOOL bAllowed = TRUE; if ( lcl_TestSubTotal( bAllowed, nColumn, nColDims, nColDimCount, this ) ) return bAllowed; @@ -278,7 +278,7 @@ void lcl_RemoveDim( long nRemove, long* pDims, long& rCount ) void ScDPSource::SetOrientation(long nColumn, USHORT nNew) { - //! change to no-op if new orientation is equal to old? + //! change to no-op if new orientation is equal to old? // remove from old list lcl_RemoveDim( nColumn, nColDims, nColDimCount ); @@ -306,7 +306,7 @@ void ScDPSource::SetOrientation(long nColumn, USHORT nNew) case sheet::DataPilotFieldOrientation_HIDDEN: break; // End Comments - default: + default: DBG_ERROR( "ScDPSource::SetOrientation: unexpected orientation" ); break; } @@ -327,7 +327,7 @@ BOOL ScDPSource::IsDateDimension(long nDim) return pData->IsDateDimension(nDim); } -UINT32 ScDPSource::GetNumberFormat(long nDim) +UINT32 ScDPSource::GetNumberFormat(long nDim) { return pData->GetNumberFormat( nDim ); } @@ -337,7 +337,7 @@ ScDPDimensions* ScDPSource::GetDimensionsObject() if (!pDimensions) { pDimensions = new ScDPDimensions(this); - pDimensions->acquire(); // ref-counted + pDimensions->acquire(); // ref-counted } return pDimensions; } @@ -356,7 +356,7 @@ ScDPDimension* ScDPSource::AddDuplicated(long /* nSource */, const String& rNewN { DBG_ASSERT( pDimensions, "AddDuplicated without dimensions?" ); - // re-use + // re-use long nOldDimCount = pDimensions->getCount(); for (long i=0; i<nOldDimCount; i++) @@ -364,20 +364,20 @@ ScDPDimension* ScDPSource::AddDuplicated(long /* nSource */, const String& rNewN ScDPDimension* pDim = pDimensions->getByIndex(i); if (pDim && String(pDim->getName()) == rNewName) { - //! test if pDim is a duplicate of source + //! test if pDim is a duplicate of source return pDim; } } SetDupCount( nDupCount + 1 ); - pDimensions->CountChanged(); // uses nDupCount + pDimensions->CountChanged(); // uses nDupCount return pDimensions->getByIndex( pDimensions->getCount() - 1 ); } long ScDPSource::GetSourceDim(long nDim) { - // original source dimension or data layout dimension? + // original source dimension or data layout dimension? if ( nDim <= pData->GetColumnCount() ) return nDim; @@ -399,26 +399,26 @@ long ScDPSource::GetSourceDim(long nDim) uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResults() throw(uno::RuntimeException) { - CreateRes_Impl(); // create pColResRoot and pRowResRoot + CreateRes_Impl(); // create pColResRoot and pRowResRoot - if ( bResultOverflow ) // set in CreateRes_Impl + if ( bResultOverflow ) // set in CreateRes_Impl { - // no results available + // no results available throw uno::RuntimeException(); } long nColCount = pColResRoot->GetSize(pResData->GetColStartMeasure()); long nRowCount = pRowResRoot->GetSize(pResData->GetRowStartMeasure()); - // allocate full sequence - //! leave out empty rows??? + // allocate full sequence + //! leave out empty rows??? uno::Sequence< uno::Sequence<sheet::DataResult> > aSeq( nRowCount ); uno::Sequence<sheet::DataResult>* pRowAry = aSeq.getArray(); for (long nRow = 0; nRow < nRowCount; nRow++) { uno::Sequence<sheet::DataResult> aColSeq( nColCount ); - // use default values of DataResult + // use default values of DataResult pRowAry[nRow] = aColSeq; } @@ -436,13 +436,13 @@ void SAL_CALL ScDPSource::refresh() throw(uno::RuntimeException) void SAL_CALL ScDPSource::addRefreshListener( const uno::Reference<util::XRefreshListener >& ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); //! exception? + DBG_ERROR("not implemented"); //! exception? } void SAL_CALL ScDPSource::removeRefreshListener( const uno::Reference<util::XRefreshListener >& ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); //! exception? + DBG_ERROR("not implemented"); //! exception? } Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<sheet::DataPilotFieldFilter>& aFilters) @@ -501,7 +501,7 @@ Sequence< Sequence<Any> > SAL_CALL ScDPSource::getDrillDownData(const Sequence<s String ScDPSource::getDataDescription() { - CreateRes_Impl(); // create pResData + CreateRes_Impl(); // create pResData String aRet; if ( pResData->GetMeasureCount() == 1 ) @@ -510,7 +510,7 @@ String ScDPSource::getDataDescription() aRet = pResData->GetMeasureString( 0, TRUE, SUBTOTAL_FUNC_NONE, bTotalResult ); } - // empty for more than one measure + // empty for more than one measure return aRet; } @@ -557,7 +557,7 @@ void ScDPSource::setRepeatIfEmpty(BOOL bSet) pData->SetEmptyFlags( bIgnoreEmptyRows, bRepeatIfEmpty ); } -void ScDPSource::validate() //! ??? +void ScDPSource::validate() //! ??? { CreateRes_Impl(); } @@ -566,7 +566,7 @@ void ScDPSource::disposeData() { if ( pResData ) { - // reset all data... + // reset all data... DELETEZ(pColResRoot); DELETEZ(pRowResRoot); @@ -581,22 +581,22 @@ void ScDPSource::disposeData() if ( pDimensions ) { - pDimensions->release(); // ref-counted - pDimensions = NULL; // settings have to be applied (from SaveData) again! + pDimensions->release(); // ref-counted + pDimensions = NULL; // settings have to be applied (from SaveData) again! } SetDupCount( 0 ); - //! Test ???? + //! Test ???? nColDimCount = nRowDimCount = nDataDimCount = nPageDimCount = 0; - pData->DisposeData(); // cached entries etc. + pData->DisposeData(); // cached entries etc. bResultOverflow = FALSE; } long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPLevel*>& ppLevel, long nLevels ) { - // Calculate the product of the member count for those consecutive levels that - // have the "show all" flag, one following level, and the data layout dimension. + // Calculate the product of the member count for those consecutive levels that + // have the "show all" flag, one following level, and the data layout dimension. long nTotal = 1; long nDataCount = 1; @@ -615,7 +615,7 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL BOOL bDo = FALSE; if ( ppDim[nPos]->getIsDataLayoutDimension() ) { - // data layout dim doesn't interfere with "show all" flags + // data layout dim doesn't interfere with "show all" flags nDataCount = ppLevel[nPos]->GetMembersObject()->getCount(); if ( nDataCount == 0 ) nDataCount = 1; @@ -625,7 +625,7 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL bDo = TRUE; if ( !ppLevel[nPos]->getShowEmpty() ) { - // this level is counted, following ones are not + // this level is counted, following ones are not bWasShowAll = FALSE; } } @@ -634,21 +634,21 @@ long lcl_CountMinMembers(const vector<ScDPDimension*>& ppDim, const vector<ScDPL long nThisCount = ppLevel[nPos]->GetMembersObject()->getMinMembers(); if ( nThisCount == 0 ) { - nTotal = 1; // empty level -> start counting from here - //! start with visible elements in this level? + nTotal = 1; // empty level -> start counting from here + //! start with visible elements in this level? } else { if ( nTotal >= LONG_MAX / nThisCount ) - return LONG_MAX; // overflow + return LONG_MAX; // overflow nTotal *= nThisCount; } } } - // always include data layout dim, even after restarting + // always include data layout dim, even after restarting if ( nTotal >= LONG_MAX / nDataCount ) - return LONG_MAX; // overflow + return LONG_MAX; // overflow nTotal *= nDataCount; return nTotal; @@ -679,10 +679,10 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool ScDPLevels* pLevels = pDim->GetHierarchiesObject()->getByIndex(nHierarchy)->GetLevelsObject(); long nCount = pLevels->getCount(); - //! Test + //! Test if ( pDim->getIsDataLayoutDimension() && nDataDimCount < 2 ) nCount = 0; - //! Test + //! Test for (long j = 0; j < nCount; ++j) { @@ -690,7 +690,7 @@ void ScDPSource::FillCalcInfo(bool bIsRow, ScDPTableData::CalcInfo& rInfo, bool pLevel->EvaluateSortOrder(); // no layout flags for column fields, only for row fields - pLevel->SetEnableLayout( bIsRow ); + pLevel->SetEnableLayout( bIsRow ); if ( pLevel->GetAutoShow().IsEnabled ) rHasAutoShow = TRUE; @@ -757,7 +757,7 @@ void ScDPSource::FilterCacheTableByPageDimensions() ScDPCacheTable::Criterion aFilter; aFilter.mnFieldIndex = static_cast<sal_Int32>(nField); aFilter.mpFilter.reset(new ScDPCacheTable::GroupFilter(/*rSharedString*/)); - ScDPCacheTable::GroupFilter* pGrpFilter = + ScDPCacheTable::GroupFilter* pGrpFilter = static_cast<ScDPCacheTable::GroupFilter*>(aFilter.mpFilter.get()); for (long j = 0; j < nMemCount; ++j) { @@ -799,7 +799,7 @@ void ScDPSource::CreateRes_Impl() if ( nDataDimCount > 1 && ( nDataOrient != sheet::DataPilotFieldOrientation_COLUMN && nDataOrient != sheet::DataPilotFieldOrientation_ROW ) ) { - // if more than one data dimension, data layout orientation must be set + // if more than one data dimension, data layout orientation must be set SetOrientation( pData->GetColumnCount(), sheet::DataPilotFieldOrientation_ROW ); nDataOrient = sheet::DataPilotFieldOrientation_ROW; } @@ -820,8 +820,8 @@ void ScDPSource::CreateRes_Impl() ScDPTableData::CalcInfo aInfo; - // LateInit (initialize only those rows/children that are used) can be used unless - // any data dimension needs reference values from column/row dimensions + // LateInit (initialize only those rows/children that are used) can be used unless + // any data dimension needs reference values from column/row dimensions BOOL bLateInit = TRUE; // Go through all data dimensions (i.e. fields) and build their meta data @@ -836,7 +836,7 @@ void ScDPSource::CreateRes_Impl() sheet::GeneralFunction eUser = (sheet::GeneralFunction)pDim->getFunction(); if (eUser == sheet::GeneralFunction_AUTO) { - //! test for numeric data + //! test for numeric data eUser = sheet::GeneralFunction_SUM; } @@ -845,7 +845,7 @@ void ScDPSource::CreateRes_Impl() // Get reference field/item information. pDataRefValues[i] = pDim->GetReferenceValue(); - nDataRefOrient[i] = sheet::DataPilotFieldOrientation_HIDDEN; // default if not used + nDataRefOrient[i] = sheet::DataPilotFieldOrientation_HIDDEN; // default if not used sal_Int32 eRefType = pDataRefValues[i].ReferenceType; if ( eRefType == sheet::DataPilotFieldReferenceType::ITEM_DIFFERENCE || eRefType == sheet::DataPilotFieldReferenceType::ITEM_PERCENTAGE || @@ -857,24 +857,24 @@ void ScDPSource::CreateRes_Impl() if ( nColumn >= 0 ) { nDataRefOrient[i] = GetOrientation( nColumn ); - // need fully initialized results to find reference values - // (both in column or row dimensions), so updated values or - // differences to 0 can be displayed even for empty results. + // need fully initialized results to find reference values + // (both in column or row dimensions), so updated values or + // differences to 0 can be displayed even for empty results. bLateInit = FALSE; } } - pDataNames[i] = String( pDim->getName() ); //! label? + pDataNames[i] = String( pDim->getName() ); //! label? - // asterisk is added to duplicated dimension names by ScDPSaveData::WriteToSource - //! modify user visible strings as in ScDPResultData::GetMeasureString instead! + // asterisk is added to duplicated dimension names by ScDPSaveData::WriteToSource + //! modify user visible strings as in ScDPResultData::GetMeasureString instead! pDataNames[i].EraseTrailingChars('*'); - //! if the name is overridden by user, a flag must be set - //! so the user defined name replaces the function string and field name. + //! if the name is overridden by user, a flag must be set + //! so the user defined name replaces the function string and field name. - //! the complete name (function and field) must be stored at the dimension + //! the complete name (function and field) must be stored at the dimension long nSource = ((ScDPDimension*)pDim)->GetSourceDim(); if (nSource >= 0) @@ -941,16 +941,16 @@ void ScDPSource::CreateRes_Impl() pLevels->getByIndex(j)->GetMembersObject(); // initialize for groups } - // pre-check: calculate minimum number of result columns / rows from - // levels that have the "show all" flag set + // pre-check: calculate minimum number of result columns / rows from + // levels that have the "show all" flag set long nMinColMembers = lcl_CountMinMembers( aInfo.aColDims, aInfo.aColLevels, nColLevelCount ); long nMinRowMembers = lcl_CountMinMembers( aInfo.aRowDims, aInfo.aRowLevels, nRowLevelCount ); if ( nMinColMembers > MAXCOLCOUNT/*SC_MINCOUNT_LIMIT*/ || nMinRowMembers > SC_MINCOUNT_LIMIT ) { - // resulting table is too big -> abort before calculating - // (this relies on late init, so no members are allocated in InitFrom above) + // resulting table is too big -> abort before calculating + // (this relies on late init, so no members are allocated in InitFrom above) bResultOverflow = TRUE; } @@ -1073,10 +1073,10 @@ void ScDPSource::FillMemberResults() { CreateRes_Impl(); - if ( bResultOverflow ) // set in CreateRes_Impl + if ( bResultOverflow ) // set in CreateRes_Impl { - // no results available -> abort (leave empty) - // exception is thrown in ScDPSource::getResults + // no results available -> abort (leave empty) + // exception is thrown in ScDPSource::getResults return; } @@ -1146,11 +1146,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPSource::getPropertySetInfo( static SfxItemPropertyMapEntry aDPSourceMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_COLGRAND), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_DATADESC), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_IGNOREEM), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only - {MAP_CHAR_LEN(SC_UNO_REPEATIF), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only - {MAP_CHAR_LEN(SC_UNO_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_COLGRAND), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_DATADESC), 0, &getCppuType((rtl::OUString*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_IGNOREEM), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only + {MAP_CHAR_LEN(SC_UNO_REPEATIF), 0, &getBooleanCppuType(), 0, 0 }, // for sheet data only + {MAP_CHAR_LEN(SC_UNO_ROWGRAND), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_ROWFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 }, {MAP_CHAR_LEN(SC_UNO_COLUMNFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 }, {MAP_CHAR_LEN(SC_UNO_DATAFIELDCOUNT), 0, &getCppuType(static_cast<sal_Int32*>(0)), READONLY, 0 }, @@ -1185,7 +1185,7 @@ void SAL_CALL ScDPSource::setPropertyValue( const rtl::OUString& aPropertyName, else { DBG_ERROR("unknown property"); - //! THROW( UnknownPropertyException() ); + //! THROW( UnknownPropertyException() ); } } @@ -1203,7 +1203,7 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa lcl_SetBoolInAny( aRet, getIgnoreEmptyRows() ); else if ( aNameStr.EqualsAscii( SC_UNO_REPEATIF ) ) lcl_SetBoolInAny( aRet, getRepeatIfEmpty() ); - else if ( aNameStr.EqualsAscii( SC_UNO_DATADESC ) ) // read-only + else if ( aNameStr.EqualsAscii( SC_UNO_DATADESC ) ) // read-only aRet <<= rtl::OUString( getDataDescription() ); else if ( aNameStr.EqualsAscii( SC_UNO_ROWFIELDCOUNT ) ) // read-only aRet <<= static_cast<sal_Int32>(nRowDimCount); @@ -1219,7 +1219,7 @@ uno::Any SAL_CALL ScDPSource::getPropertyValue( const rtl::OUString& aPropertyNa else { DBG_ERROR("unknown property"); - //! THROW( UnknownPropertyException() ); + //! THROW( UnknownPropertyException() ); } return aRet; } @@ -1232,7 +1232,7 @@ ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) : pSource( pSrc ), ppDims( NULL ) { - //! hold pSource + //! hold pSource // include data layout dimension and duplicated dimensions nDimCount = pSource->GetData()->GetColumnCount() + 1 + pSource->GetDupCount(); @@ -1240,13 +1240,13 @@ ScDPDimensions::ScDPDimensions( ScDPSource* pSrc ) : ScDPDimensions::~ScDPDimensions() { - //! release pSource + //! release pSource if (ppDims) { for (long i=0; i<nDimCount; i++) if ( ppDims[i] ) - ppDims[i]->release(); // ref-counted + ppDims[i]->release(); // ref-counted delete[] ppDims; } } @@ -1261,13 +1261,13 @@ void ScDPDimensions::CountChanged() long nCopy = Min( nNewCount, nDimCount ); ScDPDimension** ppNew = new ScDPDimension*[nNewCount]; - for (i=0; i<nCopy; i++) // copy existing dims + for (i=0; i<nCopy; i++) // copy existing dims ppNew[i] = ppDims[i]; - for (i=nCopy; i<nNewCount; i++) // clear additional pointers + for (i=nCopy; i<nNewCount; i++) // clear additional pointers ppNew[i] = NULL; - for (i=nCopy; i<nDimCount; i++) // delete old dims if count is decreased + for (i=nCopy; i<nDimCount; i++) // delete old dims if count is decreased if ( ppDims[i] ) - ppDims[i]->release(); // ref-counted + ppDims[i]->release(); // ref-counted delete[] ppDims; ppDims = ppNew; @@ -1328,7 +1328,7 @@ sal_Bool SAL_CALL ScDPDimensions::hasElements() throw(uno::RuntimeException) long ScDPDimensions::getCount() const { - // in tabular data, every column of source data is a dimension + // in tabular data, every column of source data is a dimension return nDimCount; } @@ -1346,13 +1346,13 @@ ScDPDimension* ScDPDimensions::getByIndex(long nIndex) const if ( !ppDims[nIndex] ) { ppDims[nIndex] = new ScDPDimension( pSource, nIndex ); - ppDims[nIndex]->acquire(); // ref-counted + ppDims[nIndex]->acquire(); // ref-counted } return ppDims[nIndex]; } - return NULL; //! exception? + return NULL; //! exception? } // ----------------------------------------------------------------------- @@ -1362,7 +1362,7 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) : nDim( nD ), pHierarchies( NULL ), nUsedHier( 0 ), - nFunction( SUBTOTAL_FUNC_SUM ), // sum is default + nFunction( SUBTOTAL_FUNC_SUM ), // sum is default mpLayoutName(NULL), mpSubtotalName(NULL), nSourceDim( -1 ), @@ -1370,15 +1370,15 @@ ScDPDimension::ScDPDimension( ScDPSource* pSrc, long nD ) : pSelectedData( NULL ), mbHasHiddenMember(false) { - //! hold pSource + //! hold pSource } ScDPDimension::~ScDPDimension() { - //! release pSource + //! release pSource if ( pHierarchies ) - pHierarchies->release(); // ref-counted + pHierarchies->release(); // ref-counted delete pSelectedData; } @@ -1388,7 +1388,7 @@ ScDPHierarchies* ScDPDimension::GetHierarchiesObject() if (!pHierarchies) { pHierarchies = new ScDPHierarchies( pSource, nDim ); - pHierarchies->acquire(); // ref-counted + pHierarchies->acquire(); // ref-counted } return pHierarchies; } @@ -1419,7 +1419,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPDimension::getHierarchies() void SAL_CALL ScDPDimension::setName( const ::rtl::OUString& rNewName ) throw(uno::RuntimeException) { - // used after cloning + // used after cloning aName = String( rNewName ); } @@ -1440,7 +1440,7 @@ long ScDPDimension::getPosition() const void ScDPDimension::setPosition(long /* nNew */) { - //! ... + //! ... } BOOL ScDPDimension::getIsDataLayoutDimension() const @@ -1473,13 +1473,13 @@ ScDPDimension* ScDPDimension::CreateCloneObject() { DBG_ASSERT( nSourceDim < 0, "recursive duplicate - not implemented" ); - //! set new name here, or temporary name ??? + //! set new name here, or temporary name ??? String aNewName = aName; ScDPDimension* pNew = pSource->AddDuplicated( nDim, aNewName ); - pNew->aName = aNewName; //! here or in source? - pNew->nSourceDim = nDim; //! recursive? + pNew->aName = aNewName; //! here or in source? + pNew->nSourceDim = nDim; //! recursive? return pNew; } @@ -1505,7 +1505,7 @@ const ScDPItemData& ScDPDimension::GetSelectedData() { // find the named member to initialize pSelectedData from it, with name and value - long nLevel = 0; // same as in ScDPObject::FillPageList + long nLevel = 0; // same as in ScDPObject::FillPageList long nHierarchy = getUsedHierarchy(); if ( nHierarchy >= GetHierarchiesObject()->getCount() ) @@ -1530,7 +1530,7 @@ const ScDPItemData& ScDPDimension::GetSelectedData() } if ( !pSelectedData ) - pSelectedData = new ScDPItemData( aSelectedPage, 0.0, FALSE ); // default - name only + pSelectedData = new ScDPItemData( aSelectedPage, 0.0, FALSE ); // default - name only } return *pSelectedData; @@ -1558,16 +1558,16 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPDimension::getPropertySetIn static SfxItemPropertyMapEntry aDPDimensionMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_FILTER), 0, &getCppuType((uno::Sequence<sheet::TableFilterField>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_FILTER), 0, &getCppuType((uno::Sequence<sheet::TableFilterField>*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_FLAGS), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_FUNCTION), 0, &getCppuType((sheet::GeneralFunction*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_ISDATALA), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_NUMBERFO), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_ORIENTAT), 0, &getCppuType((sheet::DataPilotFieldOrientation*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_ORIGINAL), 0, &getCppuType((uno::Reference<container::XNamed>*)0), beans::PropertyAttribute::READONLY, 0 }, - {MAP_CHAR_LEN(SC_UNO_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_REFVALUE), 0, &getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_USEDHIER), 0, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_FUNCTION), 0, &getCppuType((sheet::GeneralFunction*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_ISDATALA), 0, &getBooleanCppuType(), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_NUMBERFO), 0, &getCppuType((sal_Int32*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_ORIENTAT), 0, &getCppuType((sheet::DataPilotFieldOrientation*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_ORIGINAL), 0, &getCppuType((uno::Reference<container::XNamed>*)0), beans::PropertyAttribute::READONLY, 0 }, + {MAP_CHAR_LEN(SC_UNO_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_REFVALUE), 0, &getCppuType((sheet::DataPilotFieldReference*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_USEDHIER), 0, &getCppuType((sal_Int32*)0), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_FIELD_SUBTOTALNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_HAS_HIDDEN_MEMBER), 0, &getBooleanCppuType(), 0, 0 }, @@ -1639,7 +1639,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam DBG_ERROR("Filter property is not a single string"); throw lang::IllegalArgumentException(); } - DELETEZ( pSelectedData ); // invalid after changing aSelectedPage + DELETEZ( pSelectedData ); // invalid after changing aSelectedPage } else if (aNameStr.EqualsAscii(SC_UNO_LAYOUTNAME)) { @@ -1658,7 +1658,7 @@ void SAL_CALL ScDPDimension::setPropertyValue( const rtl::OUString& aPropertyNam else { DBG_ERROR("unknown property"); - //! THROW( UnknownPropertyException() ); + //! THROW( UnknownPropertyException() ); } } @@ -1684,7 +1684,7 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert } else if ( aNameStr.EqualsAscii( SC_UNO_REFVALUE ) ) aRet <<= aReferenceValue; - else if ( aNameStr.EqualsAscii( SC_UNO_ISDATALA ) ) // read-only properties + else if ( aNameStr.EqualsAscii( SC_UNO_ISDATALA ) ) // read-only properties lcl_SetBoolInAny( aRet, getIsDataLayoutDimension() ); else if ( aNameStr.EqualsAscii( SC_UNO_NUMBERFO ) ) { @@ -1745,7 +1745,7 @@ uno::Any SAL_CALL ScDPDimension::getPropertyValue( const rtl::OUString& aPropert else { DBG_ERROR("unknown property"); - //! THROW( UnknownPropertyException() ); + //! THROW( UnknownPropertyException() ); } return aRet; } @@ -1759,10 +1759,10 @@ ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) : nDim( nD ), ppHiers( NULL ) { - //! hold pSource + //! hold pSource #if 0 - // date columns have 3 hierarchies (flat/quarter/week), other columns only one + // date columns have 3 hierarchies (flat/quarter/week), other columns only one long nSrcDim = pSource->GetSourceDim( nDim ); if ( pSource->IsDateDimension( nSrcDim ) ) nHierCount = SC_DAPI_DATE_HIERARCHIES; @@ -1776,13 +1776,13 @@ ScDPHierarchies::ScDPHierarchies( ScDPSource* pSrc, long nD ) : ScDPHierarchies::~ScDPHierarchies() { - //! release pSource + //! release pSource if (ppHiers) { for (long i=0; i<nHierCount; i++) if ( ppHiers[i] ) - ppHiers[i]->release(); // ref-counted + ppHiers[i]->release(); // ref-counted delete[] ppHiers; } } @@ -1845,8 +1845,8 @@ long ScDPHierarchies::getCount() const ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const { - // pass hierarchy index to new object in case the implementation - // will be extended to more than one hierarchy + // pass hierarchy index to new object in case the implementation + // will be extended to more than one hierarchy if ( nIndex >= 0 && nIndex < nHierCount ) { @@ -1859,13 +1859,13 @@ ScDPHierarchy* ScDPHierarchies::getByIndex(long nIndex) const if ( !ppHiers[nIndex] ) { ppHiers[nIndex] = new ScDPHierarchy( pSource, nDim, nIndex ); - ppHiers[nIndex]->acquire(); // ref-counted + ppHiers[nIndex]->acquire(); // ref-counted } return ppHiers[nIndex]; } - return NULL; //! exception? + return NULL; //! exception? } // ----------------------------------------------------------------------- @@ -1876,15 +1876,15 @@ ScDPHierarchy::ScDPHierarchy( ScDPSource* pSrc, long nD, long nH ) : nHier( nH ), pLevels( NULL ) { - //! hold pSource + //! hold pSource } ScDPHierarchy::~ScDPHierarchy() { - //! release pSource + //! release pSource if (pLevels) - pLevels->release(); // ref-counted + pLevels->release(); // ref-counted } ScDPLevels* ScDPHierarchy::GetLevelsObject() @@ -1892,7 +1892,7 @@ ScDPLevels* ScDPHierarchy::GetLevelsObject() if (!pLevels) { pLevels = new ScDPLevels( pSource, nDim, nHier ); - pLevels->acquire(); // ref-counted + pLevels->acquire(); // ref-counted } return pLevels; } @@ -1905,18 +1905,18 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPHierarchy::getLevels() ::rtl::OUString SAL_CALL ScDPHierarchy::getName() throw(uno::RuntimeException) { - String aRet; //! globstr-ID !!!! + String aRet; //! globstr-ID !!!! switch (nHier) { case SC_DAPI_HIERARCHY_FLAT: aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("flat")); - break; //! name ??????? + break; //! name ??????? case SC_DAPI_HIERARCHY_QUARTER: aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Quarter")); - break; //! name ??????? + break; //! name ??????? case SC_DAPI_HIERARCHY_WEEK: aRet = String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Week")); - break; //! name ??????? + break; //! name ??????? default: DBG_ERROR( "ScDPHierarchy::getName: unexpected hierarchy" ); break; @@ -1926,7 +1926,7 @@ uno::Reference<container::XNameAccess> SAL_CALL ScDPHierarchy::getLevels() void SAL_CALL ScDPHierarchy::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); //! exception? + DBG_ERROR("not implemented"); //! exception? } // ----------------------------------------------------------------------- @@ -1937,18 +1937,18 @@ ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) : nHier( nH ), ppLevs( NULL ) { - //! hold pSource + //! hold pSource - // text columns have only one level + // text columns have only one level long nSrcDim = pSource->GetSourceDim( nDim ); if ( pSource->IsDateDimension( nSrcDim ) ) { switch ( nHier ) { - case SC_DAPI_HIERARCHY_FLAT: nLevCount = SC_DAPI_FLAT_LEVELS; break; - case SC_DAPI_HIERARCHY_QUARTER: nLevCount = SC_DAPI_QUARTER_LEVELS; break; - case SC_DAPI_HIERARCHY_WEEK: nLevCount = SC_DAPI_WEEK_LEVELS; break; + case SC_DAPI_HIERARCHY_FLAT: nLevCount = SC_DAPI_FLAT_LEVELS; break; + case SC_DAPI_HIERARCHY_QUARTER: nLevCount = SC_DAPI_QUARTER_LEVELS; break; + case SC_DAPI_HIERARCHY_WEEK: nLevCount = SC_DAPI_WEEK_LEVELS; break; default: DBG_ERROR("wrong hierarchy"); nLevCount = 0; @@ -1960,13 +1960,13 @@ ScDPLevels::ScDPLevels( ScDPSource* pSrc, long nD, long nH ) : ScDPLevels::~ScDPLevels() { - //! release pSource + //! release pSource if (ppLevs) { for (long i=0; i<nLevCount; i++) if ( ppLevs[i] ) - ppLevs[i]->release(); // ref-counted + ppLevs[i]->release(); // ref-counted delete[] ppLevs; } } @@ -2040,13 +2040,13 @@ ScDPLevel* ScDPLevels::getByIndex(long nIndex) const if ( !ppLevs[nIndex] ) { ppLevs[nIndex] = new ScDPLevel( pSource, nDim, nHier, nIndex ); - ppLevs[nIndex]->acquire(); // ref-counted + ppLevs[nIndex]->acquire(); // ref-counted } return ppLevs[nIndex]; } - return NULL; //! exception? + return NULL; //! exception? } // ----------------------------------------------------------------------- @@ -2094,16 +2094,16 @@ ScDPLevel::ScDPLevel( ScDPSource* pSrc, long nD, long nH, long nL ) : nAutoMeasure( 0 ), bEnableLayout( FALSE ) { - //! hold pSource - // aSubTotals is empty + //! hold pSource + // aSubTotals is empty } ScDPLevel::~ScDPLevel() { - //! release pSource + //! release pSource if ( pMembers ) - pMembers->release(); // ref-counted + pMembers->release(); // ref-counted } void ScDPLevel::EvaluateSortOrder() @@ -2176,7 +2176,7 @@ ScDPMembers* ScDPLevel::GetMembersObject() if (!pMembers) { pMembers = new ScDPMembers( pSource, nDim, nHier, nLev ); - pMembers->acquire(); // ref-counted + pMembers->acquire(); // ref-counted } return pMembers; } @@ -2192,7 +2192,7 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R if (pRes) return *pRes; - return uno::Sequence<sheet::MemberResult>(0); //! Error? + return uno::Sequence<sheet::MemberResult>(0); //! Error? } ::rtl::OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException) @@ -2200,7 +2200,7 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R long nSrcDim = pSource->GetSourceDim( nDim ); if ( pSource->IsDateDimension( nSrcDim ) ) { - String aRet; //! globstr-ID !!!! + String aRet; //! globstr-ID !!!! if ( nHier == SC_DAPI_HIERARCHY_QUARTER ) { @@ -2254,12 +2254,12 @@ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::R void SAL_CALL ScDPLevel::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); //! exception? + DBG_ERROR("not implemented"); //! exception? } uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const { - //! separate functions for settings and evaluation? + //! separate functions for settings and evaluation? long nSrcDim = pSource->GetSourceDim( nDim ); if ( !pSource->SubTotalAllowed( nSrcDim ) ) @@ -2271,7 +2271,7 @@ uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const void ScDPLevel::setSubTotals(const uno::Sequence<sheet::GeneralFunction>& rNew) { aSubTotals = rNew; - //! set "manual change" flag? + //! set "manual change" flag? } BOOL ScDPLevel::getShowEmpty() const @@ -2294,11 +2294,11 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo() static SfxItemPropertyMapEntry aDPLevelMap_Impl[] = { //! change type of AutoShow/Layout/Sorting to API struct when available - {MAP_CHAR_LEN(SC_UNO_AUTOSHOW), 0, &getCppuType((sheet::DataPilotFieldAutoShowInfo*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_LAYOUT), 0, &getCppuType((sheet::DataPilotFieldLayoutInfo*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_SHOWEMPT), 0, &getBooleanCppuType(), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_SORTING), 0, &getCppuType((sheet::DataPilotFieldSortInfo*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_SUBTOTAL), 0, &getCppuType((uno::Sequence<sheet::GeneralFunction>*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_AUTOSHOW), 0, &getCppuType((sheet::DataPilotFieldAutoShowInfo*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_LAYOUT), 0, &getCppuType((sheet::DataPilotFieldLayoutInfo*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_SHOWEMPT), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_SORTING), 0, &getCppuType((sheet::DataPilotFieldSortInfo*)0), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_SUBTOTAL), 0, &getCppuType((uno::Sequence<sheet::GeneralFunction>*)0), 0, 0 }, {0,0,0,0,0,0} }; static uno::Reference<beans::XPropertySetInfo> aRef = @@ -2329,7 +2329,7 @@ void SAL_CALL ScDPLevel::setPropertyValue( const rtl::OUString& aPropertyName, c else { DBG_ERROR("unknown property"); - //! THROW( UnknownPropertyException() ); + //! THROW( UnknownPropertyException() ); } } @@ -2343,7 +2343,7 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam lcl_SetBoolInAny( aRet, getShowEmpty() ); else if ( aNameStr.EqualsAscii( SC_UNO_SUBTOTAL ) ) { - uno::Sequence<sheet::GeneralFunction> aSeq = getSubTotals(); //! avoid extra copy? + uno::Sequence<sheet::GeneralFunction> aSeq = getSubTotals(); //! avoid extra copy? aRet <<= aSeq; } else if ( aNameStr.EqualsAscii( SC_UNO_SORTING ) ) @@ -2369,7 +2369,7 @@ uno::Any SAL_CALL ScDPLevel::getPropertyValue( const rtl::OUString& aPropertyNam else { DBG_ERROR("unknown property"); - //! THROW( UnknownPropertyException() ); + //! THROW( UnknownPropertyException() ); } return aRet; } @@ -2385,7 +2385,7 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) : nLev( nL ), ppMbrs( NULL ) { - //! hold pSource + //! hold pSource long nSrcDim = pSource->GetSourceDim( nDim ); if ( pSource->IsDataLayoutDimension(nSrcDim) ) @@ -2427,12 +2427,12 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) : nMbrCount = nLastYear + 1 - nFirstYear; } else - nMbrCount = 0; // no values + nMbrCount = 0; // no values } break; - case SC_DAPI_LEVEL_QUARTER: nMbrCount = 4; break; - case SC_DAPI_LEVEL_MONTH: nMbrCount = 12; break; - case SC_DAPI_LEVEL_DAY: nMbrCount = 31; break; + case SC_DAPI_LEVEL_QUARTER: nMbrCount = 4; break; + case SC_DAPI_LEVEL_MONTH: nMbrCount = 12; break; + case SC_DAPI_LEVEL_DAY: nMbrCount = 31; break; default: DBG_ERROR( "ScDPMembers::ScDPMembers: unexpected level" ); break; @@ -2442,9 +2442,9 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) : { switch (nLev) { - case SC_DAPI_LEVEL_YEAR: nMbrCount = 1; break; //! get years from source - case SC_DAPI_LEVEL_WEEK: nMbrCount = 53; break; - case SC_DAPI_LEVEL_WEEKDAY: nMbrCount = 7; break; + case SC_DAPI_LEVEL_YEAR: nMbrCount = 1; break; //! get years from source + case SC_DAPI_LEVEL_WEEK: nMbrCount = 53; break; + case SC_DAPI_LEVEL_WEEKDAY: nMbrCount = 7; break; default: DBG_ERROR( "ScDPMembers::ScDPMembers: unexpected level" ); break; @@ -2457,13 +2457,13 @@ ScDPMembers::ScDPMembers( ScDPSource* pSrc, long nD, long nH, long nL ) : ScDPMembers::~ScDPMembers() { - //! release pSource + //! release pSource if (ppMbrs) { for (long i=0; i<nMbrCount; i++) if ( ppMbrs[i] ) - ppMbrs[i]->release(); // ref-counted + ppMbrs[i]->release(); // ref-counted delete[] ppMbrs; } } @@ -2556,22 +2556,22 @@ long ScDPMembers::getMinMembers() const { for (long i=0; i<nMbrCount; i++) { - // count only visible with details (default is true for both) + // count only visible with details (default is true for both) const ScDPMember* pMbr = ppMbrs[i]; if ( !pMbr || ( pMbr->getIsVisible() && pMbr->getShowDetails() ) ) ++nVisCount; } } else - nVisCount = nMbrCount; // default for all + nVisCount = nMbrCount; // default for all return nVisCount; } ScDPMember* ScDPMembers::getByIndex(long nIndex) const { - // result of GetColumnEntries must not change between ScDPMembers ctor - // and all calls to getByIndex + // result of GetColumnEntries must not change between ScDPMembers ctor + // and all calls to getByIndex if ( nIndex >= 0 && nIndex < nMbrCount ) { @@ -2595,10 +2595,10 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const long nVal = 0; String aName; - if ( nLev == SC_DAPI_LEVEL_YEAR ) // YEAR is in both hierarchies + if ( nLev == SC_DAPI_LEVEL_YEAR ) // YEAR is in both hierarchies { - //! cache year range here! - + //! cache year range here! + // Wang Xu Ming - DataPilot migration double fFirstVal = pSource->GetData()->GetMemberByIndex( nSrcDim, 0 )->GetValue(); long nFirstYear = pSource->GetData()->GetDatePart( @@ -2610,24 +2610,24 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const } else if ( nHier == SC_DAPI_HIERARCHY_WEEK && nLev == SC_DAPI_LEVEL_WEEKDAY ) { - nVal = nIndex; // DayOfWeek is 0-based + nVal = nIndex; // DayOfWeek is 0-based aName = ScGlobal::GetCalendar()->getDisplayName( ::com::sun::star::i18n::CalendarDisplayIndex::DAY, sal::static_int_cast<sal_Int16>(nVal), 0 ); } else if ( nHier == SC_DAPI_HIERARCHY_QUARTER && nLev == SC_DAPI_LEVEL_MONTH ) { - nVal = nIndex; // Month is 0-based + nVal = nIndex; // Month is 0-based aName = ScGlobal::GetCalendar()->getDisplayName( ::com::sun::star::i18n::CalendarDisplayIndex::MONTH, sal::static_int_cast<sal_Int16>(nVal), 0 ); } else - nVal = nIndex + 1; // Quarter, Day, Week are 1-based + nVal = nIndex + 1; // Quarter, Day, Week are 1-based if ( !aName.Len() ) aName = String::CreateFromInt32(nVal); - + ScDPItemData rData( aName, nVal, TRUE, 0 ) ; pNew = new ScDPMember( pSource, nDim, nHier, nLev, pSource->GetCache()->GetAdditionalItemID(rData)); } @@ -2636,7 +2636,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const const std::vector< SCROW >& memberIndexs = pSource->GetData()->GetColumnEntries( nSrcDim ); pNew = new ScDPMember( pSource, nDim, nHier, nLev, memberIndexs[nIndex] ); } - pNew->acquire(); // ref-counted + pNew->acquire(); // ref-counted ppMbrs[nIndex] = pNew; } @@ -2645,7 +2645,7 @@ ScDPMember* ScDPMembers::getByIndex(long nIndex) const return ppMbrs[nIndex]; } - return NULL; //! exception? + return NULL; //! exception? } // ----------------------------------------------------------------------- @@ -2662,12 +2662,12 @@ ScDPMember::ScDPMember( ScDPSource* pSrc, long nD, long nH, long nL, bVisible( TRUE ), bShowDet( TRUE ) { - //! hold pSource + //! hold pSource } ScDPMember::~ScDPMember() { - //! release pSource + //! release pSource } BOOL ScDPMember::IsNamedItem( const ScDPItemData& r ) const @@ -2679,7 +2679,7 @@ BOOL ScDPMember::IsNamedItem( const ScDPItemData& r ) const (long)::rtl::math::approxFloor( r.GetValue() ), nHier, nLev ); - // fValue is converted from integer, so simple comparison works + // fValue is converted from integer, so simple comparison works return nComp == GetItemData().GetValue(); } @@ -2690,7 +2690,7 @@ BOOL ScDPMember::IsNamedItem( SCROW nIndex ) const { long nSrcDim = pSource->GetSourceDim( nDim ); if ( nHier != SC_DAPI_HIERARCHY_FLAT && pSource->IsDateDimension( nSrcDim ) ) - { + { const ScDPItemData* pData = pSource->GetCache()->GetItemDataById( (SCCOL) nSrcDim, nIndex ); if ( pData->IsValue() ) { @@ -2732,7 +2732,7 @@ sal_Int32 ScDPMember::Compare( const ScDPMember& rOther ) const void ScDPMember::FillItemData( ScDPItemData& rData ) const { - //! handle date hierarchy... + //! handle date hierarchy... rData = GetItemData() ; } @@ -2754,7 +2754,7 @@ String ScDPMember::GetNameStr() const void SAL_CALL ScDPMember::setName( const ::rtl::OUString& /* rNewName */ ) throw(uno::RuntimeException) { - DBG_ERROR("not implemented"); //! exception? + DBG_ERROR("not implemented"); //! exception? } BOOL ScDPMember::getIsVisible() const @@ -2765,7 +2765,7 @@ BOOL ScDPMember::getIsVisible() const void ScDPMember::setIsVisible(BOOL bSet) { bVisible = bSet; - //! set "manual change" flag + //! set "manual change" flag } BOOL ScDPMember::getShowDetails() const @@ -2776,7 +2776,7 @@ BOOL ScDPMember::getShowDetails() const void ScDPMember::setShowDetails(BOOL bSet) { bShowDet = bSet; - //! set "manual change" flag + //! set "manual change" flag } sal_Int32 ScDPMember::getPosition() const @@ -2798,9 +2798,9 @@ uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo( static SfxItemPropertyMapEntry aDPMemberMap_Impl[] = { - {MAP_CHAR_LEN(SC_UNO_ISVISIBL), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_ISVISIBL), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_POSITION), 0, &getCppuType((sal_Int32*)0), 0, 0 }, - {MAP_CHAR_LEN(SC_UNO_SHOWDETA), 0, &getBooleanCppuType(), 0, 0 }, + {MAP_CHAR_LEN(SC_UNO_SHOWDETA), 0, &getBooleanCppuType(), 0, 0 }, {MAP_CHAR_LEN(SC_UNO_LAYOUTNAME), 0, &getCppuType(static_cast<rtl::OUString*>(0)), 0, 0 }, {0,0,0,0,0,0} }; @@ -2834,7 +2834,7 @@ void SAL_CALL ScDPMember::setPropertyValue( const rtl::OUString& aPropertyName, else { DBG_ERROR("unknown property"); - //! THROW( UnknownPropertyException() ); + //! THROW( UnknownPropertyException() ); } } @@ -2855,7 +2855,7 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const rtl::OUString& aPropertyNa else { DBG_ERROR("unknown property"); - //! THROW( UnknownPropertyException() ); + //! THROW( UnknownPropertyException() ); } return aRet; } @@ -2876,7 +2876,7 @@ const ScDPItemData& ScDPMember::GetItemData() const const ScDPItemData* ScDPSource::GetItemDataById(long nDim, long nId) { - long nSrcDim = GetSourceDim( nDim ); + long nSrcDim = GetSourceDim( nDim ); const ScDPItemData* pItemData = GetData()->GetMemberById( nSrcDim, nId ); if ( !pItemData ) { //todo: @@ -2890,7 +2890,7 @@ const ScDPItemData* ScDPSource::GetItemDataById(long nDim, long nId) SCROW ScDPSource::GetMemberId( long nDim, const ScDPItemData& rData ) { long nSrcDim = GetSourceDim( nDim ); - return GetCache()->GetIdByItemData( nSrcDim, rData ); + return GetCache()->GetIdByItemData( nSrcDim, rData ); } const ScDPItemData* ScDPMembers::GetSrcItemDataByIndex( SCROW nIndex) @@ -2898,7 +2898,7 @@ const ScDPItemData* ScDPMembers::GetSrcItemDataByIndex( SCROW nIndex) const std::vector< SCROW >& memberIds = pSource->GetData()->GetColumnEntries( nDim ); if ( nIndex >= (long )(memberIds.size()) || nIndex < 0 ) return NULL; - SCROW nId = memberIds[ nIndex ]; + SCROW nId = memberIds[ nIndex ]; return pSource->GetItemDataById( nDim, nId ); } diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx index 541318df0c8c..a0c2c4bdfff7 100644 --- a/sc/source/core/data/drawpage.cxx +++ b/sc/source/core/data/drawpage.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/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 72b943cba343..7ad749b04a83 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.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 @@ -85,15 +85,15 @@ #include <vcl/field.hxx> -#define DET_ARROW_OFFSET 1000 +#define DET_ARROW_OFFSET 1000 -// Abstand zur naechsten Zelle beim Loeschen (bShrink), damit der Anker -// immer an der richtigen Zelle angezeigt wird -//#define SHRINK_DIST 3 -// und noch etwas mehr, damit das Objekt auch sichtbar in der Zelle liegt -#define SHRINK_DIST 25 +// Abstand zur naechsten Zelle beim Loeschen (bShrink), damit der Anker +// immer an der richtigen Zelle angezeigt wird +//#define SHRINK_DIST 3 +// und noch etwas mehr, damit das Objekt auch sichtbar in der Zelle liegt +#define SHRINK_DIST 25 -#define SHRINK_DIST_TWIPS 15 +#define SHRINK_DIST_TWIPS 15 using namespace ::com::sun::star; @@ -107,9 +107,9 @@ static E3dObjFactory* pF3d = NULL; static USHORT nInst = 0; SfxObjectShell* ScDrawLayer::pGlobalDrawPersist = NULL; -//REMOVE SvPersist* ScDrawLayer::pGlobalDrawPersist = NULL; +//REMOVE SvPersist* ScDrawLayer::pGlobalDrawPersist = NULL; -BOOL bDrawIsInUndo = FALSE; //! Member +BOOL bDrawIsInUndo = FALSE; //! Member // ----------------------------------------------------------------------- @@ -171,7 +171,7 @@ __EXPORT ScTabSizeChangedHint::~ScTabSizeChangedHint() // ----------------------------------------------------------------------- -#define MAXMM 10000000 +#define MAXMM 10000000 inline long TwipsToHmm (long nVal) { @@ -220,11 +220,11 @@ void lcl_ReverseTwipsToMM( Rectangle& rRect ) ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : FmFormModel( SvtPathOptions().GetPalettePath(), - NULL, // SfxItemPool* Pool + NULL, // SfxItemPool* Pool pGlobalDrawPersist ? pGlobalDrawPersist : ( pDocument ? pDocument->GetDocumentShell() : NULL ), - TRUE ), // bUseExtColorTable (is set below) + TRUE ), // bUseExtColorTable (is set below) aName( rName ), pDoc( pDocument ), pUndoGroup( NULL ), @@ -232,7 +232,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : bAdjustEnabled( TRUE ), bHyphenatorSet( FALSE ) { - pGlobalDrawPersist = NULL; // nur einmal benutzen + pGlobalDrawPersist = NULL; // nur einmal benutzen SfxObjectShell* pObjSh = pDocument ? pDocument->GetDocumentShell() : NULL; if ( pObjSh ) @@ -248,7 +248,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : SetColorTable( XColorTable::GetStdColorTable() ); SetSwapGraphics(TRUE); -// SetSwapAsynchron(TRUE); // an der View +// SetSwapAsynchron(TRUE); // an der View SetScaleUnit(MAP_100TH_MM); SfxItemPool& rPool = GetItemPool(); @@ -270,7 +270,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : rPool.GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( FALSE, EE_PARA_ASIANCJKSPACING ) ); } - rPool.FreezeIdRanges(); // the pool is also used directly + rPool.FreezeIdRanges(); // the pool is also used directly SdrLayerAdmin& rAdmin = GetLayerAdmin(); rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("vorne")), SC_LAYER_FRONT); @@ -280,7 +280,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : rAdmin.NewLayer(String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("hidden")), SC_LAYER_HIDDEN); // "Controls" is new - must also be created when loading - // Link fuer URL-Fields setzen + // Link fuer URL-Fields setzen ScModule* pScMod = SC_MOD(); Outliner& rOutliner = GetDrawOutliner(); rOutliner.SetCalcFieldValueHdl( LINK( pScMod, ScModule, CalcFieldValueHdl ) ); @@ -296,7 +296,7 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : if ( pHitOutlinerPool ) pHitOutlinerPool->SetPoolDefaultItem(SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT )); // 12Pt - // URL-Buttons haben keinen Handler mehr, machen alles selber + // URL-Buttons haben keinen Handler mehr, machen alles selber if( !nInst++ ) { @@ -337,7 +337,7 @@ void ScDrawLayer::UseHyphenator() SdrPage* __EXPORT ScDrawLayer::AllocPage(bool bMasterPage) { - // don't create basic until it is needed + // don't create basic until it is needed StarBASIC* pBasic = NULL; ScDrawPage* pPage = new ScDrawPage( *this, pBasic, bMasterPage); return pPage; @@ -357,14 +357,14 @@ BOOL ScDrawLayer::HasObjects() const void ScDrawLayer::UpdateBasic() { - // don't create basic until it is needed - //! remove this method? + // don't create basic until it is needed + //! remove this method? } SdrModel* __EXPORT ScDrawLayer::AllocModel() const { - // #103849# Allocated model (for clipboard etc) must not have a pointer - // to the original model's document, pass NULL as document: + // #103849# Allocated model (for clipboard etc) must not have a pointer + // to the original model's document, pass NULL as document: return new ScDrawLayer( NULL, aName ); } @@ -406,11 +406,11 @@ void ScDrawLayer::ScRemovePage( SCTAB nTab ) if (bRecording) { SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab)); - AddCalcUndo(new SdrUndoDelPage(*pPage)); // Undo-Action wird Owner der Page - RemovePage( static_cast<sal_uInt16>(nTab) ); // nur austragen, nicht loeschen + AddCalcUndo(new SdrUndoDelPage(*pPage)); // Undo-Action wird Owner der Page + RemovePage( static_cast<sal_uInt16>(nTab) ); // nur austragen, nicht loeschen } else - DeletePage( static_cast<sal_uInt16>(nTab) ); // einfach weg damit + DeletePage( static_cast<sal_uInt16>(nTab) ); // einfach weg damit } void ScDrawLayer::ScRenamePage( SCTAB nTab, const String& rNewName ) @@ -427,7 +427,7 @@ void ScDrawLayer::ScMovePage( USHORT nOldPos, USHORT nNewPos ) void ScDrawLayer::ScCopyPage( USHORT nOldPos, USHORT nNewPos, BOOL bAlloc ) { - //! remove argument bAlloc (always FALSE) + //! remove argument bAlloc (always FALSE) if (bDrawIsInUndo) return; @@ -519,12 +519,12 @@ void ScDrawLayer::SetPageSize( USHORT nPageNo, const Size& rSize, bool bUpdateNo if ( rSize != pPage->GetSize() ) { pPage->SetSize( rSize ); - Broadcast( ScTabSizeChangedHint( static_cast<SCTAB>(nPageNo) ) ); // SetWorkArea() an den Views + Broadcast( ScTabSizeChangedHint( static_cast<SCTAB>(nPageNo) ) ); // SetWorkArea() an den Views } // Detektivlinien umsetzen (an neue Hoehen/Breiten anpassen) - // auch wenn Groesse gleich geblieben ist - // (einzelne Zeilen/Spalten koennen geaendert sein) + // auch wenn Groesse gleich geblieben ist + // (einzelne Zeilen/Spalten koennen geaendert sein) BOOL bNegativePage = pDoc && pDoc->IsNegativePage( static_cast<SCTAB>(nPageNo) ); @@ -582,15 +582,15 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b TwipsToMM( aPos.X() ); TwipsToMM( aPos.Y() ); - // Berechnung und Werte wie in detfunc.cxx + // Berechnung und Werte wie in detfunc.cxx Size aSize( (long)( TwipsToHmm( pDoc->GetColWidth( nCol1, nTab1) ) ), (long)( TwipsToHmm( pDoc->GetRowHeight( nRow1, nTab1) ) ) ); Rectangle aRect( aPos, aSize ); - aRect.Left() -= 250; - aRect.Right() += 250; - aRect.Top() -= 70; - aRect.Bottom() += 70; + aRect.Left() -= 250; + aRect.Right() += 250; + aRect.Top() -= 70; + aRect.Bottom() += 70; if ( bNegativePage ) MirrorRectRTL( aRect ); @@ -603,7 +603,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b } else if( bArrow ) { - //! nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden) + //! nicht mehrere Undos fuer ein Objekt erzeugen (hinteres kann dann weggelassen werden) SCCOL nLastCol; SCROW nLastRow; @@ -618,7 +618,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b TwipsToMM( aPos.Y() ); Point aStartPos = aPos; if ( bNegativePage ) - aStartPos.X() = -aStartPos.X(); // don't modify aPos - used below + aStartPos.X() = -aStartPos.X(); // don't modify aPos - used below if ( pObj->GetPoint( 0 ) != aStartPos ) { if (bRecording) @@ -652,7 +652,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b TwipsToMM( aPos.Y() ); Point aEndPos = aPos; if ( bNegativePage ) - aEndPos.X() = -aEndPos.X(); // don't modify aPos - used below + aEndPos.X() = -aEndPos.X(); // don't modify aPos - used below if ( pObj->GetPoint( 1 ) != aEndPos ) { if (bRecording) @@ -678,7 +678,7 @@ void ScDrawLayer::RecalcPos( SdrObject* pObj, const ScDrawObjData& rData, bool b } } } - else // Referenz-Rahmen + else // Referenz-Rahmen { DBG_ASSERT( bValid1, "ScDrawLayer::RecalcPos - invalid start position" ); Point aPos( pDoc->GetColOffset( nCol1, nTab1 ), pDoc->GetRowOffset( nRow1, nTab1 ) ); @@ -759,7 +759,7 @@ BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) co if ( bNegativePage ) { - nStartX = -nStartX; // positions are negative, swap start/end so the same comparisons work + nStartX = -nStartX; // positions are negative, swap start/end so the same comparisons work nEndX = -nEndX; ::std::swap( nStartX, nEndX ); } @@ -801,7 +801,7 @@ BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) co if ( bNegativePage ) { - nStartX = -nStartX; // reverse transformation, so the same cell address calculation works + nStartX = -nStartX; // reverse transformation, so the same cell address calculation works nEndX = -nEndX; ::std::swap( nStartX, nEndX ); } @@ -823,7 +823,7 @@ BOOL ScDrawLayer::GetPrintArea( ScRange& rRange, BOOL bSetHor, BOOL bSetVer ) co rRange.aStart.SetCol( i>0 ? (i-1) : 0 ); nWidth = 0; - for (i=0; i<=MAXCOL && nWidth<=nEndX; i++) //! bei Start anfangen + for (i=0; i<=MAXCOL && nWidth<=nEndX; i++) //! bei Start anfangen nWidth += pDoc->GetColWidth(i,nTab); rRange.aEnd.SetCol( i>0 ? (i-1) : 0 ); } @@ -886,12 +886,12 @@ SdrUndoGroup* ScDrawLayer::GetCalcUndo() return pRet; } -// MoveAreaTwips: all measures are kept in twips +// MoveAreaTwips: all measures are kept in twips void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, const Point& rMove, const Point& rTopLeft ) { if (!rMove.X() && !rMove.Y()) - return; // nix + return; // nix SdrPage* pPage = GetPage(static_cast<sal_uInt16>(nTab)); DBG_ASSERT(pPage,"Page nicht gefunden"); @@ -903,9 +903,9 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, // fuer Shrinking! Rectangle aNew( rArea ); BOOL bShrink = FALSE; - if ( rMove.X() < 0 || rMove.Y() < 0 ) // verkleinern + if ( rMove.X() < 0 || rMove.Y() < 0 ) // verkleinern { - if ( rTopLeft != rArea.TopLeft() ) // sind gleich beim Verschieben von Zellen + if ( rTopLeft != rArea.TopLeft() ) // sind gleich beim Verschieben von Zellen { bShrink = TRUE; aNew.Left() = rTopLeft.X(); @@ -918,14 +918,14 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, { if( GetAnchor( pObject ) == SCA_CELL ) { - if ( GetObjData( pObject ) ) // Detektiv-Pfeil ? + if ( GetObjData( pObject ) ) // Detektiv-Pfeil ? { // hier nichts } - else if ( pObject->ISA( SdrEdgeObj ) ) // Verbinder? + else if ( pObject->ISA( SdrEdgeObj ) ) // Verbinder? { - // hier auch nichts - //! nicht verbundene Enden wie bei Linien (s.u.) behandeln? + // hier auch nichts + //! nicht verbundene Enden wie bei Linien (s.u.) behandeln? } else if ( pObject->IsPolyObj() && pObject->GetPointCount()==2 ) { @@ -940,7 +940,7 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, } else if (bShrink && aNew.IsInside(aPoint)) { - // Punkt ist in betroffener Zelle - Test auf geloeschten Bereich + // Punkt ist in betroffener Zelle - Test auf geloeschten Bereich if ( rMove.X() && aPoint.X() >= rArea.Left() + rMove.X() ) { aPoint.X() = rArea.Left() + rMove.X() - SHRINK_DIST_TWIPS; @@ -968,7 +968,7 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, // aOldMMPos: not converted, millimeters Point aOldMMPos = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft(); lcl_ReverseTwipsToMM( aObjRect ); - Point aTopLeft = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft(); // logical left + Point aTopLeft = bNegativePage ? aObjRect.TopRight() : aObjRect.TopLeft(); // logical left Size aMoveSize; BOOL bDoMove = FALSE; if (rArea.IsInside(aTopLeft)) @@ -978,7 +978,7 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, } else if (bShrink && aNew.IsInside(aTopLeft)) { - // Position ist in betroffener Zelle - Test auf geloeschten Bereich + // Position ist in betroffener Zelle - Test auf geloeschten Bereich if ( rMove.X() && aTopLeft.X() >= rArea.Left() + rMove.X() ) { aMoveSize.Width() = rArea.Left() + rMove.X() - SHRINK_DIST - aTopLeft.X(); @@ -1005,10 +1005,10 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, if ( aTopLeft.Y() + aMoveSize.Height() < 0 ) aMoveSize.Height() = -aTopLeft.Y(); - // get corresponding move size in millimeters: + // get corresponding move size in millimeters: Point aNewPos( aTopLeft.X() + aMoveSize.Width(), aTopLeft.Y() + aMoveSize.Height() ); lcl_TwipsToMM( aNewPos ); - aMoveSize = Size( aNewPos.X() - aOldMMPos.X(), aNewPos.Y() - aOldMMPos.Y() ); // millimeters + aMoveSize = Size( aNewPos.X() - aOldMMPos.X(), aNewPos.Y() - aOldMMPos.Y() ); // millimeters AddCalcUndo( new SdrUndoMoveObj( *pObject, aMoveSize ) ); pObject->Move( aMoveSize ); @@ -1016,12 +1016,12 @@ void ScDrawLayer::MoveAreaTwips( SCTAB nTab, const Rectangle& rArea, else if ( rArea.IsInside( bNegativePage ? aObjRect.BottomLeft() : aObjRect.BottomRight() ) && !pObject->IsResizeProtect() ) { - // geschuetzte Groessen werden nicht veraendert - // (Positionen schon, weil sie ja an der Zelle "verankert" sind) + // geschuetzte Groessen werden nicht veraendert + // (Positionen schon, weil sie ja an der Zelle "verankert" sind) AddCalcUndo( new SdrUndoGeoObj( *pObject ) ); long nOldSizeX = aObjRect.Right() - aObjRect.Left() + 1; long nOldSizeY = aObjRect.Bottom() - aObjRect.Top() + 1; - long nLogMoveX = rMove.X() * ( bNegativePage ? -1 : 1 ); // logical direction + long nLogMoveX = rMove.X() * ( bNegativePage ? -1 : 1 ); // logical direction pObject->Resize( aOldMMPos, Fraction( nOldSizeX+nLogMoveX, nOldSizeX ), Fraction( nOldSizeY+rMove.Y(), nOldSizeY ) ); } @@ -1045,7 +1045,7 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR Rectangle aRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab ); lcl_ReverseTwipsToMM( aRect ); - //! use twips directly? + //! use twips directly? Point aMove; @@ -1063,22 +1063,22 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR if ( bNegativePage ) aMove.X() = -aMove.X(); - Point aTopLeft = aRect.TopLeft(); // Anfang beim Verkleinern + Point aTopLeft = aRect.TopLeft(); // Anfang beim Verkleinern if (bInsDel) { - if ( aMove.X() != 0 && nDx < 0 ) // nDx counts cells, sign is independent of RTL + if ( aMove.X() != 0 && nDx < 0 ) // nDx counts cells, sign is independent of RTL aTopLeft.X() += aMove.X(); if ( aMove.Y() < 0 ) aTopLeft.Y() += aMove.Y(); } - // drawing objects are now directly included in cut&paste - // -> only update references when inserting/deleting (or changing widths or heights) + // drawing objects are now directly included in cut&paste + // -> only update references when inserting/deleting (or changing widths or heights) if ( bInsDel ) MoveAreaTwips( nTab, aRect, aMove, aTopLeft ); // - // Detektiv-Pfeile: Zellpositionen anpassen + // Detektiv-Pfeile: Zellpositionen anpassen // MoveCells( nTab, nCol1,nRow1, nCol2,nRow2, nDx,nDy, bUpdateNoteCaptionPos ); @@ -1105,7 +1105,7 @@ void ScDrawLayer::WidthChanged( SCTAB nTab, SCCOL nCol, long nDifTwips ) aRect.Top() = 0; aRect.Bottom() = MAXMM; - //! aTopLeft ist falsch, wenn mehrere Spalten auf einmal ausgeblendet werden + //! aTopLeft ist falsch, wenn mehrere Spalten auf einmal ausgeblendet werden BOOL bNegativePage = pDoc->IsNegativePage( nTab ); if ( bNegativePage ) @@ -1138,7 +1138,7 @@ void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips ) aRect.Left() = 0; aRect.Right() = MAXMM; - //! aTopLeft ist falsch, wenn mehrere Zeilen auf einmal ausgeblendet werden + //! aTopLeft ist falsch, wenn mehrere Zeilen auf einmal ausgeblendet werden BOOL bNegativePage = pDoc->IsNegativePage( nTab ); if ( bNegativePage ) @@ -1150,7 +1150,7 @@ void ScDrawLayer::HeightChanged( SCTAB nTab, SCROW nRow, long nDifTwips ) MoveAreaTwips( nTab, aRect, Point( 0,nDifTwips ), aTopLeft ); } -BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, bool bIncludeNotes ) +BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow ) { DBG_ASSERT( pDoc, "ScDrawLayer::HasObjectsInRows without document" ); if ( !pDoc ) @@ -1190,10 +1190,8 @@ BOOL ScDrawLayer::HasObjectsInRows( SCTAB nTab, SCROW nStartRow, SCROW nEndRow, SdrObject* pObject = aIter.Next(); while ( pObject && !bFound ) { - aObjRect = pObject->GetSnapRect(); //! GetLogicRect ? - // #i116164# note captions are handled separately, don't have to be included for each single row height change - if ( (aTestRect.IsInside(aObjRect.TopLeft()) || aTestRect.IsInside(aObjRect.BottomLeft())) && - (bIncludeNotes || !IsNoteCaption(pObject)) ) + aObjRect = pObject->GetSnapRect(); //! GetLogicRect ? + if (aTestRect.IsInside(aObjRect.TopLeft()) || aTestRect.IsInside(aObjRect.BottomLeft())) bFound = TRUE; pObject = aIter.Next(); @@ -1216,8 +1214,8 @@ void ScDrawLayer::DeleteObjectsInArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, pPage->RecalcObjOrdNums(); - long nDelCount = 0; - ULONG nObjCount = pPage->GetObjCount(); + long nDelCount = 0; + ULONG nObjCount = pPage->GetObjCount(); if (nObjCount) { Rectangle aDelRect = pDoc->GetMMRect( nCol1, nRow1, nCol2, nRow2, nTab ); @@ -1272,11 +1270,11 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark ) if (pPage) { pPage->RecalcObjOrdNums(); - long nDelCount = 0; - ULONG nObjCount = pPage->GetObjCount(); + long nDelCount = 0; + ULONG nObjCount = pPage->GetObjCount(); if (nObjCount) { - // Rechteck um die ganze Selektion + // Rechteck um die ganze Selektion Rectangle aMarkBound = pDoc->GetMMRect( aMarkRange.aStart.Col(), aMarkRange.aStart.Row(), aMarkRange.aEnd.Col(), aMarkRange.aEnd.Row(), nTab ); @@ -1303,7 +1301,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark ) pObject = aIter.Next(); } - // Objekte loeschen (rueckwaerts) + // Objekte loeschen (rueckwaerts) long i; if (bRecording) @@ -1325,7 +1323,7 @@ void ScDrawLayer::DeleteObjectsInSelection( const ScMarkData& rMark ) void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& rRange ) { - // copy everything in the specified range into the same page (sheet) in the clipboard doc + // copy everything in the specified range into the same page (sheet) in the clipboard doc SdrPage* pSrcPage = GetPage(static_cast<sal_uInt16>(nTab)); if (pSrcPage) @@ -1343,12 +1341,12 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& { if ( !pDestModel ) { - pDestModel = pClipDoc->GetDrawLayer(); // does the document already have a drawing layer? + pDestModel = pClipDoc->GetDrawLayer(); // does the document already have a drawing layer? if ( !pDestModel ) { - // allocate drawing layer in clipboard document only if there are objects to copy + // allocate drawing layer in clipboard document only if there are objects to copy - pClipDoc->InitDrawLayer(); //! create contiguous pages + pClipDoc->InitDrawLayer(); //! create contiguous pages pDestModel = pClipDoc->GetDrawLayer(); } if (pDestModel) @@ -1369,8 +1367,8 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& pNewObject->NbcMove(Size(0,0)); pDestPage->InsertObject( pNewObject ); - // no undo needed in clipboard document - // charts are not updated + // no undo needed in clipboard document + // charts are not updated } } @@ -1381,7 +1379,7 @@ void ScDrawLayer::CopyToClip( ScDocument* pClipDoc, SCTAB nTab, const Rectangle& BOOL lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange& rClipRange ) { - // check if every range of rRangesVector is completely in rClipRange + // check if every range of rRangesVector is completely in rClipRange ::std::vector< ScRangeList >::const_iterator aIt = rRangesVector.begin(); for( ;aIt!=rRangesVector.end(); ++aIt ) @@ -1393,12 +1391,12 @@ BOOL lcl_IsAllInRange( const ::std::vector< ScRangeList >& rRangesVector, const ScRange aRange = *rRanges.GetObject(i); if ( !rClipRange.In( aRange ) ) { - return FALSE; // at least one range is not valid + return FALSE; // at least one range is not valid } } } - return TRUE; // everything is fine + return TRUE; // everything is fine } BOOL lcl_MoveRanges( ::std::vector< ScRangeList >& rRangesVector, const ScRange& rSourceRange, const ScAddress& rDestPos ) @@ -1437,7 +1435,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const if (!pClipModel) return; - if (bDrawIsInUndo) //! can this happen? + if (bDrawIsInUndo) //! can this happen? { DBG_ERROR("CopyFromClip, bDrawIsInUndo"); return; @@ -1516,7 +1514,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const aVerFract = Fraction( nDestHeight, nSourceHeight ); bResize = TRUE; } - Point aRefPos = rDestRange.TopLeft(); // for resizing (after moving) + Point aRefPos = rDestRange.TopLeft(); // for resizing (after moving) while (pOldObject) { @@ -1531,7 +1529,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const pNewObject->SetPage(pDestPage); if ( bMirrorObj ) - MirrorRTL( pNewObject ); // first mirror, then move + MirrorRTL( pNewObject ); // first mirror, then move pNewObject->NbcMove( aMove ); if ( bResize ) @@ -1541,7 +1539,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const if (bRecording) AddCalcUndo( new SdrUndoInsertObj( *pNewObject ) ); - //#i110034# handle chart data references (after InsertObject) + //#i110034# handle chart data references (after InsertObject) if ( pNewObject->GetObjIdentifier() == OBJ_OLE2 ) { @@ -1614,7 +1612,7 @@ void ScDrawLayer::CopyFromClip( ScDrawLayer* pClipModel, SCTAB nSourceTab, const uno::Reference< chart::XChartDocument > xNewChartDoc( xNewChart, uno::UNO_QUERY ); if( xOldChartDoc.is() && xNewChartDoc.is() ) xNewChartDoc->attachData( xOldChartDoc->getData() ); - + // (see ScDocument::UpdateChartListenerCollection, PastingDrawFromOtherDoc) } } @@ -1634,8 +1632,8 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj ) { UINT16 nIdent = pObj->GetObjIdentifier(); - // don't mirror OLE or graphics, otherwise ask the object - // if it can be mirrored + // don't mirror OLE or graphics, otherwise ask the object + // if it can be mirrored BOOL bCanMirror = ( nIdent != OBJ_GRAF && nIdent != OBJ_OLE2 ); if (bCanMirror) { @@ -1654,9 +1652,9 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj ) } else { - // Move instead of mirroring: - // New start position is negative of old end position - // -> move by sum of start and end position + // Move instead of mirroring: + // New start position is negative of old end position + // -> move by sum of start and end position Rectangle aObjRect = pObj->GetLogicRect(); Size aMoveSize( -(aObjRect.Left() + aObjRect.Right()), 0 ); if (bRecording) @@ -1668,7 +1666,7 @@ void ScDrawLayer::MirrorRTL( SdrObject* pObj ) // static void ScDrawLayer::MirrorRectRTL( Rectangle& rRect ) { - // mirror and swap left/right + // mirror and swap left/right long nTemp = rRect.Left(); rRect.Left() = -rRect.Right(); rRect.Right() = -nTemp; @@ -1721,10 +1719,10 @@ String ScDrawLayer::GetVisibleName( SdrObject* pObj ) String aName = pObj->GetName(); if ( pObj->GetObjIdentifier() == OBJ_OLE2 ) { - // #95575# For OLE, the user defined name (GetName) is used - // if it's not empty (accepting possibly duplicate names), - // otherwise the persist name is used so every object appears - // in the Navigator at all. + // #95575# For OLE, the user defined name (GetName) is used + // if it's not empty (accepting possibly duplicate names), + // otherwise the persist name is used so every object appears + // in the Navigator at all. if ( !aName.Len() ) aName = static_cast<SdrOle2Obj*>(pObj)->GetPersistName(); @@ -1734,8 +1732,8 @@ String ScDrawLayer::GetVisibleName( SdrObject* pObj ) inline sal_Bool IsNamedObject( SdrObject* pObj, const String& rName ) { - // TRUE if rName is the object's Name or PersistName - // (used to find a named object) + // TRUE if rName is the object's Name or PersistName + // (used to find a named object) return ( pObj->GetName() == rName || ( pObj->GetObjIdentifier() == OBJ_OLE2 && @@ -1795,7 +1793,7 @@ String ScDrawLayer::GetNewGraphicName( long* pnCounter ) const void ScDrawLayer::EnsureGraphicNames() { - // make sure all graphic objects have names (after Excel import etc.) + // make sure all graphic objects have names (after Excel import etc.) sal_uInt16 nTabCount = GetPageCount(); for (sal_uInt16 nTab=0; nTab<nTabCount; nTab++) @@ -1842,7 +1840,7 @@ ScAnchorType ScDrawLayer::GetAnchor( const SdrObject* pObj ) return ( aAnchor.Y() != 0 ) ? SCA_PAGE : SCA_CELL; } -ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate ) // static +ScDrawObjData* ScDrawLayer::GetObjData( SdrObject* pObj, BOOL bCreate ) // static { USHORT nCount = pObj ? pObj->GetUserDataCount() : 0; for( USHORT i = 0; i < nCount; i++ ) @@ -1886,7 +1884,7 @@ ScDrawObjData* ScDrawLayer::GetNoteCaptionData( SdrObject* pObj, SCTAB nTab ) return (pData && pData->mbNote) ? pData : 0; } -ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static +ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static { USHORT nCount = pObj->GetUserDataCount(); for( USHORT i = 0; i < nCount; i++ ) @@ -1900,28 +1898,28 @@ ScIMapInfo* ScDrawLayer::GetIMapInfo( SdrObject* pObj ) // static } // static: -IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, +IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, const Point& rWinPoint, const Window& rCmpWnd ) { - const MapMode aMap100( MAP_100TH_MM ); - MapMode aWndMode = rCmpWnd.GetMapMode(); - Point aRelPoint( rCmpWnd.LogicToLogic( rWinPoint, &aWndMode, &aMap100 ) ); - Rectangle aLogRect = rCmpWnd.LogicToLogic( pObj->GetLogicRect(), &aWndMode, &aMap100 ); - ScIMapInfo* pIMapInfo = GetIMapInfo( pObj ); - IMapObject* pIMapObj = NULL; + const MapMode aMap100( MAP_100TH_MM ); + MapMode aWndMode = rCmpWnd.GetMapMode(); + Point aRelPoint( rCmpWnd.LogicToLogic( rWinPoint, &aWndMode, &aMap100 ) ); + Rectangle aLogRect = rCmpWnd.LogicToLogic( pObj->GetLogicRect(), &aWndMode, &aMap100 ); + ScIMapInfo* pIMapInfo = GetIMapInfo( pObj ); + IMapObject* pIMapObj = NULL; if ( pIMapInfo ) { - Size aGraphSize; - ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap(); - Graphic aGraphic; - BOOL bObjSupported = FALSE; + Size aGraphSize; + ImageMap& rImageMap = (ImageMap&) pIMapInfo->GetImageMap(); + Graphic aGraphic; + BOOL bObjSupported = FALSE; if ( pObj->ISA( SdrGrafObj ) ) // einfaches Grafik-Objekt { - const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj; - const GeoStat& rGeo = pGrafObj->GetGeoStat(); - const Graphic& rGraphic = pGrafObj->GetGraphic(); + const SdrGrafObj* pGrafObj = (const SdrGrafObj*) pObj; + const GeoStat& rGeo = pGrafObj->GetGeoStat(); + const Graphic& rGraphic = pGrafObj->GetGraphic(); // Drehung rueckgaengig if ( rGeo.nDrehWink ) @@ -1984,7 +1982,7 @@ ScMacroInfo* ScDrawLayer::GetMacroInfo( SdrObject* pObj, BOOL bCreate ) return 0; } -void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static +void ScDrawLayer::SetGlobalDrawPersist(SfxObjectShell* pPersist) // static { DBG_ASSERT(!pGlobalDrawPersist,"SetGlobalDrawPersist mehrfach"); pGlobalDrawPersist = pPersist; @@ -2006,7 +2004,7 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream uno::Reference< embed::XStorage > xStorage = pDoc->GetDocumentShell() ? pDoc->GetDocumentShell()->GetStorage() : NULL; - SvStream* pRet = NULL; + SvStream* pRet = NULL; if( xStorage.is() ) { @@ -2045,17 +2043,17 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream } } // the following code seems to be related to binary format -//REMOVE else -//REMOVE { -//REMOVE pRet = pStor->OpenStream( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_SCSTREAM)), -//REMOVE STREAM_READ | STREAM_WRITE | STREAM_TRUNC ); +//REMOVE else +//REMOVE { +//REMOVE pRet = pStor->OpenStream( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(STRING_SCSTREAM)), +//REMOVE STREAM_READ | STREAM_WRITE | STREAM_TRUNC ); //REMOVE -//REMOVE if( pRet ) -//REMOVE { -//REMOVE pRet->SetVersion( pStor->GetVersion() ); -//REMOVE pRet->SetKey( pStor->GetKey() ); -//REMOVE } -//REMOVE } +//REMOVE if( pRet ) +//REMOVE { +//REMOVE pRet->SetVersion( pStor->GetVersion() ); +//REMOVE pRet->SetKey( pStor->GetKey() ); +//REMOVE } +//REMOVE } rStreamInfo.mbDeleteAfterUse = ( pRet != NULL ); } @@ -2063,14 +2061,14 @@ SvStream* __EXPORT ScDrawLayer::GetDocumentStream(SdrDocumentStreamInfo& rStream return pRet; } -//REMOVE void ScDrawLayer::ReleasePictureStorage() -//REMOVE { -//REMOVE xPictureStorage.Clear(); -//REMOVE } +//REMOVE void ScDrawLayer::ReleasePictureStorage() +//REMOVE { +//REMOVE xPictureStorage.Clear(); +//REMOVE } SdrLayerID __EXPORT ScDrawLayer::GetControlExportLayerId( const SdrObject & ) const { - // Layer fuer Export von Form-Controls in Versionen vor 5.0 - immer SC_LAYER_FRONT + // Layer fuer Export von Form-Controls in Versionen vor 5.0 - immer SC_LAYER_FRONT return SC_LAYER_FRONT; } diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index 9715c7f69833..0bd0da8c1e74 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.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 @@ -36,7 +36,7 @@ #include "scitems.hxx" #include <editeng/boxitem.hxx> #include <editeng/bolnitem.hxx> -#include <editeng/editdata.hxx> // can be removed if table has a bLayoutRTL flag +#include <editeng/editdata.hxx> // can be removed if table has a bLayoutRTL flag #include <editeng/shaditem.hxx> #include "fillinfo.hxx" @@ -84,7 +84,7 @@ inline const SvxBorderLine* GetNullOrLine( const SvxBoxItem* pBox, FillInfoLineP return NULL; } -// aehnlich wie in output.cxx +// aehnlich wie in output.cxx void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, ScDocument* pDoc, RowInfo* pRowInfo, @@ -100,7 +100,7 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, SCCOL nLastCol; SCROW nLastRow; - while (bHOver) // nY konstant + while (bHOver) // nY konstant { --rStartX; if (rStartX >= (SCsCOL) nX1 && !pDoc->ColHidden(rStartX, nTab, nLastCol)) @@ -122,7 +122,7 @@ void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, --rStartY; if (nArrY>0) - --nArrY; // lokale Kopie ! + --nArrY; // lokale Kopie ! if (rStartX >= (SCsCOL) nX1 && rStartY >= (SCsROW) nY1 && !pDoc->ColHidden(rStartX, nTab, nLastCol) && @@ -208,7 +208,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX nBlockStartY = aTmpRange.aStart.Row(); nBlockEndX = aTmpRange.aEnd.Col(); nBlockEndY = aTmpRange.aEnd.Row(); - ExtendHidden( nBlockStartX, nBlockStartY, nBlockEndX, nBlockEndY, nTab ); //? noetig ? + ExtendHidden( nBlockStartX, nBlockStartY, nBlockEndX, nBlockEndY, nTab ); //? noetig ? if (pMarkData->IsMarkNegative()) bSkipMarks = TRUE; else @@ -216,7 +216,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX } } - // zuerst nur die Eintraege fuer die ganze Spalte + // zuerst nur die Eintraege fuer die ganze Spalte nArrY=0; SCROW nYExtra = nY2+1; @@ -227,7 +227,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX if (nSignedY >= 0) nY = (SCROW) nSignedY; else - nY = MAXROW+1; // ungueltig + nY = MAXROW+1; // ungueltig if (nY > nDocHeightEndRow) { @@ -240,38 +240,38 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX if ( nArrY==0 || nDocHeight || nY > MAXROW ) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; - pThisRowInfo->pCellInfo = NULL; // wird unten belegt + pThisRowInfo->pCellInfo = NULL; // wird unten belegt USHORT nHeight = (USHORT) ( nDocHeight * nScaleY ); if (!nHeight) nHeight = 1; - pThisRowInfo->nRowNo = nY; //! Fall < 0 ? - pThisRowInfo->nHeight = nHeight; - pThisRowInfo->bEmptyBack = TRUE; - pThisRowInfo->bEmptyText = TRUE; - pThisRowInfo->bChanged = TRUE; - pThisRowInfo->bAutoFilter = FALSE; - pThisRowInfo->bPushButton = FALSE; - pThisRowInfo->nRotMaxCol = SC_ROTMAX_NONE; + pThisRowInfo->nRowNo = nY; //! Fall < 0 ? + pThisRowInfo->nHeight = nHeight; + pThisRowInfo->bEmptyBack = TRUE; + pThisRowInfo->bEmptyText = TRUE; + pThisRowInfo->bChanged = TRUE; + pThisRowInfo->bAutoFilter = FALSE; + pThisRowInfo->bPushButton = FALSE; + pThisRowInfo->nRotMaxCol = SC_ROTMAX_NONE; ++nArrY; if (nArrY >= ROWINFO_MAX) { DBG_ERROR("Zu grosser Bereich bei FillInfo" ); - nYExtra = nSignedY; // Ende - nY2 = nYExtra - 1; // Bereich anpassen + nYExtra = nSignedY; // Ende + nY2 = nYExtra - 1; // Bereich anpassen } } else - if (nSignedY==(SCsROW) nYExtra) // zusaetzliche Zeile verdeckt ? + if (nSignedY==(SCsROW) nYExtra) // zusaetzliche Zeile verdeckt ? ++nYExtra; } - nArrCount = nArrY; // incl. Dummys + nArrCount = nArrY; // incl. Dummys - // rotierter Text... + // rotierter Text... - // Attribut im Dokument ueberhaupt verwendet? + // Attribut im Dokument ueberhaupt verwendet? BOOL bAnyItem = FALSE; USHORT nRotCount = pPool->GetItemCount( ATTR_ROTATE_VALUE ); for (USHORT nItem=0; nItem<nRotCount; nItem++) @@ -285,33 +285,33 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX if ( bAnyItem && HasAttrib( 0,nY1,nTab, MAXCOL,nY2+1,nTab, HASATTR_ROTATE | HASATTR_CONDITIONAL ) ) { - //! Conditionals auch bei HASATTR_ROTATE abfragen ???? + //! Conditionals auch bei HASATTR_ROTATE abfragen ???? DBG_ASSERT( nArrCount>2, "nArrCount zu klein" ); -// FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-2, nX1, nX2 ); +// FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-2, nX1, nX2 ); FindMaxRotCol( nTab, &pRowInfo[1], nArrCount-1, nX1, nX2 ); - // FindMaxRotCol setzt nRotMaxCol + // FindMaxRotCol setzt nRotMaxCol for (nArrY=0; nArrY<nArrCount; nArrY++) if (pRowInfo[nArrY].nRotMaxCol != SC_ROTMAX_NONE && pRowInfo[nArrY].nRotMaxCol > nRotMax) nRotMax = pRowInfo[nArrY].nRotMaxCol; } - // Zell-Infos erst nach dem Test auf gedrehte allozieren - // bis nRotMax wegen nRotateDir Flag + // Zell-Infos erst nach dem Test auf gedrehte allozieren + // bis nRotMax wegen nRotateDir Flag for (nArrY=0; nArrY<nArrCount; nArrY++) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; nY = pThisRowInfo->nRowNo; - pThisRowInfo->pCellInfo = new CellInfo[ nRotMax+1+2 ]; // vom Aufrufer zu loeschen ! + pThisRowInfo->pCellInfo = new CellInfo[ nRotMax+1+2 ]; // vom Aufrufer zu loeschen ! - for (nArrX=0; nArrX<=nRotMax+2; nArrX++) // Zell-Infos vorbelegen + for (nArrX=0; nArrX<=nRotMax+2; nArrX++) // Zell-Infos vorbelegen { if (nArrX>0) nX = nArrX-1; else - nX = MAXCOL+1; // ungueltig + nX = MAXCOL+1; // ungueltig CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX]; pInfo->bEmptyCellText = TRUE; @@ -323,21 +323,21 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX pInfo->bMarked = FALSE; pInfo->nWidth = 0; - pInfo->nClipMark = SC_CLIPMARK_NONE; - pInfo->bMerged = FALSE; + pInfo->nClipMark = SC_CLIPMARK_NONE; + pInfo->bMerged = FALSE; pInfo->bHOverlapped = FALSE; pInfo->bVOverlapped = FALSE; - pInfo->bAutoFilter = FALSE; - pInfo->bPushButton = FALSE; + pInfo->bAutoFilter = FALSE; + pInfo->bPushButton = FALSE; pInfo->bPopupButton = false; pInfo->bFilterActive = false; - pInfo->nRotateDir = SC_ROTDIR_NONE; + pInfo->nRotateDir = SC_ROTDIR_NONE; - pInfo->bPrinted = FALSE; // view-intern - pInfo->bHideGrid = FALSE; // view-intern - pInfo->bEditEngine = FALSE; // view-intern + pInfo->bPrinted = FALSE; // view-intern + pInfo->bHideGrid = FALSE; // view-intern + pInfo->bEditEngine = FALSE; // view-intern - pInfo->pBackground = NULL; //! weglassen? + pInfo->pBackground = NULL; //! weglassen? pInfo->pPatternAttr = NULL; pInfo->pConditionSet= NULL; @@ -345,13 +345,13 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX pInfo->mpTLBRLine = NULL; pInfo->mpBLTRLine = NULL; - pInfo->pShadowAttr = pDefShadow; + pInfo->pShadowAttr = pDefShadow; pInfo->pHShadowOrigin = NULL; pInfo->pVShadowOrigin = NULL; } } - for (nArrX=nX2+3; nArrX<=nRotMax+2; nArrX++) // restliche Breiten eintragen + for (nArrX=nX2+3; nArrX<=nRotMax+2; nArrX++) // restliche Breiten eintragen { nX = nArrX-1; if ( ValidCol(nX) ) @@ -367,9 +367,9 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX } } - for (nArrX=0; nArrX<=nX2+2; nArrX++) // links & rechts + 1 + for (nArrX=0; nArrX<=nX2+2; nArrX++) // links & rechts + 1 { - nX = (nArrX>0) ? nArrX-1 : MAXCOL+1; // negativ -> ungueltig + nX = (nArrX>0) ? nArrX-1 : MAXCOL+1; // negativ -> ungueltig if ( ValidCol(nX) ) { @@ -383,9 +383,9 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX if (!nThisWidth) nThisWidth = 1; - pRowInfo[0].pCellInfo[nArrX].nWidth = nThisWidth; //! dies sollte reichen + pRowInfo[0].pCellInfo[nArrX].nWidth = nThisWidth; //! dies sollte reichen - ScColumn* pThisCol = &pTab[nTab]->aCol[nX]; // Spalten-Daten + ScColumn* pThisCol = &pTab[nTab]->aCol[nX]; // Spalten-Daten nArrY = 1; SCSIZE nUIndex; @@ -416,25 +416,25 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX ++nUIndex; } - if (nX+1 >= nX1) // Attribute/Blockmarken ab nX1-1 + if (nX+1 >= nX1) // Attribute/Blockmarken ab nX1-1 { - ScAttrArray* pThisAttrArr = pThisCol->pAttrArray; // Attribute + ScAttrArray* pThisAttrArr = pThisCol->pAttrArray; // Attribute nArrY = 0; const ScPatternAttr* pPattern; - SCROW nCurRow=nY1; // einzelne Zeile + SCROW nCurRow=nY1; // einzelne Zeile if (nCurRow>0) - --nCurRow; // oben 1 mehr + --nCurRow; // oben 1 mehr else nArrY = 1; - nThisRow=nCurRow; // Ende des Bereichs + nThisRow=nCurRow; // Ende des Bereichs SCSIZE nIndex; (void) pThisAttrArr->Search( nCurRow, nIndex ); do { - nThisRow=pThisAttrArr->pData[nIndex].nRow; // Ende des Bereichs + nThisRow=pThisAttrArr->pData[nIndex].nRow; // Ende des Bereichs pPattern=pThisAttrArr->pData[nIndex].pPattern; const SvxBrushItem* pBackground = (const SvxBrushItem*) @@ -461,11 +461,11 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX BOOL bVOverlapped = ((nOverlap & SC_MF_VER) != 0); BOOL bAutoFilter = ((nOverlap & SC_MF_AUTO) != 0); BOOL bPushButton = ((nOverlap & SC_MF_BUTTON) != 0); - BOOL bScenario = ((nOverlap & SC_MF_SCENARIO) != 0); + BOOL bScenario = ((nOverlap & SC_MF_SCENARIO) != 0); bool bPopupButton = ((nOverlap & SC_MF_BUTTON_POPUP) != 0); bool bFilterActive = ((nOverlap & SC_MF_HIDDEN_MEMBER) != 0); if (bMerged||bHOverlapped||bVOverlapped) - bAnyMerged = TRUE; // intern + bAnyMerged = TRUE; // intern BOOL bHidden, bHideFormula; if (bTabProtect) @@ -491,7 +491,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX if ( nArrY==0 || !bRowHidden ) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; - if (pBackground != pDefBackground) // Spalten-HG == Standard ? + if (pBackground != pDefBackground) // Spalten-HG == Standard ? pThisRowInfo->bEmptyBack = FALSE; if (bAutoFilter) pThisRowInfo->bAutoFilter = TRUE; @@ -499,26 +499,26 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX pThisRowInfo->bPushButton = TRUE; CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX]; - pInfo->pBackground = pBackground; - pInfo->pPatternAttr = pPattern; - pInfo->bMerged = bMerged; - pInfo->bHOverlapped = bHOverlapped; - pInfo->bVOverlapped = bVOverlapped; - pInfo->bAutoFilter = bAutoFilter; - pInfo->bPushButton = bPushButton; + pInfo->pBackground = pBackground; + pInfo->pPatternAttr = pPattern; + pInfo->bMerged = bMerged; + pInfo->bHOverlapped = bHOverlapped; + pInfo->bVOverlapped = bVOverlapped; + pInfo->bAutoFilter = bAutoFilter; + pInfo->bPushButton = bPushButton; pInfo->bPopupButton = bPopupButton; pInfo->bFilterActive = bFilterActive; - pInfo->pLinesAttr = pLinesAttr; + pInfo->pLinesAttr = pLinesAttr; pInfo->mpTLBRLine = pTLBRLine; pInfo->mpBLTRLine = pBLTRLine; - pInfo->pShadowAttr = pShadowAttr; - // nWidth wird nicht mehr einzeln gesetzt + pInfo->pShadowAttr = pShadowAttr; + // nWidth wird nicht mehr einzeln gesetzt BOOL bEmbed = FALSE; //bIsEmbedded && - nTab >= aEmbedRange.aStart.Tab() && + nTab >= aEmbedRange.aStart.Tab() && nTab <= aEmbedRange.aEnd.Tab() && - nX >= aEmbedRange.aStart.Col() && - nX <= aEmbedRange.aEnd.Col() && + nX >= aEmbedRange.aStart.Col() && + nX <= aEmbedRange.aEnd.Col() && nCurRow >= aEmbedRange.aStart.Row() && nCurRow <= aEmbedRange.aEnd.Row(); @@ -548,7 +548,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX pStlPool->Find( aStyle, SFX_STYLE_FAMILY_PARA ); if ( pStyleSheet ) { - //! Style-Sets cachen !!! + //! Style-Sets cachen !!! pInfo->pConditionSet = &pStyleSheet->GetItemSet(); bAnyCondition = TRUE; } @@ -574,12 +574,12 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX if (pMarkData && pMarkData->IsMultiMarked()) { - // Blockmarken + // Blockmarken const ScMarkArray* pThisMarkArr = pMarkData->GetArray()+nX; BOOL bThisMarked; nArrY = 1; - nCurRow = nY1; // einzelne Zeile - nThisRow = nY1; // Ende des Bereichs + nCurRow = nY1; // einzelne Zeile + nThisRow = nY1; // Ende des Bereichs if ( pThisMarkArr->Search( nY1, nIndex ) ) { @@ -617,14 +617,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX } } } - else // vordere Spalten + else // vordere Spalten { for (nArrY=1; nArrY+1<nArrCount; nArrY++) { RowInfo* pThisRowInfo = &pRowInfo[nArrY]; CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX]; - pInfo->nWidth = nThisWidth; //! oder nur 0 abfragen ?? + pInfo->nWidth = nThisWidth; //! oder nur 0 abfragen ?? } } } @@ -635,13 +635,13 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX } //------------------------------------------------------------------------- - // bedingte Formatierung auswerten + // bedingte Formatierung auswerten if (bAnyCondition) { for (nArrY=0; nArrY<nArrCount; nArrY++) { - for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr + for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr { CellInfo* pInfo = &pRowInfo[nArrY].pCellInfo[nArrX]; const SfxItemSet* pCondSet = pInfo->pConditionSet; @@ -649,14 +649,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX { const SfxPoolItem* pItem; - // Hintergrund + // Hintergrund if ( pCondSet->GetItemState( ATTR_BACKGROUND, TRUE, &pItem ) == SFX_ITEM_SET ) { pInfo->pBackground = (const SvxBrushItem*) pItem; pRowInfo[nArrY].bEmptyBack = FALSE; } - // Umrandung + // Umrandung if ( pCondSet->GetItemState( ATTR_BORDER, TRUE, &pItem ) == SFX_ITEM_SET ) pInfo->pLinesAttr = (const SvxBoxItem*) pItem; @@ -665,7 +665,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX if ( pCondSet->GetItemState( ATTR_BORDER_BLTR, TRUE, &pItem ) == SFX_ITEM_SET ) pInfo->mpBLTRLine = static_cast< const SvxLineItem* >( pItem ); - // Schatten + // Schatten if ( pCondSet->GetItemState( ATTR_SHADOW, TRUE, &pItem ) == SFX_ITEM_SET ) { pInfo->pShadowAttr = (const SvxShadowItem*) pItem; @@ -676,11 +676,11 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX } } - // bedingte Formatierung Ende + // bedingte Formatierung Ende //------------------------------------------------------------------------- // - // Daten von zusammengefassten Zellen anpassen + // Daten von zusammengefassten Zellen anpassen // if (bAnyMerged) @@ -690,7 +690,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX RowInfo* pThisRowInfo = &pRowInfo[nArrY]; nSignedY = nArrY ? pThisRowInfo->nRowNo : ((SCsROW)nY1)-1; - for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr + for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr { SCsCOL nSignedX = ((SCsCOL) nArrX) - 1; CellInfo* pInfo = &pThisRowInfo->pCellInfo[nArrX]; @@ -746,14 +746,14 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX } } - if (bAnyShadow) // Schatten verteilen + if (bAnyShadow) // Schatten verteilen { for (nArrY=0; nArrY<nArrCount; nArrY++) { BOOL bTop = ( nArrY == 0 ); BOOL bBottom = ( nArrY+1 == nArrCount ); - for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr + for (nArrX=nX1; nArrX<=nX2+2; nArrX++) // links und rechts einer mehr { BOOL bLeft = ( nArrX == nX1 ); BOOL bRight = ( nArrX == nX2+2 ); @@ -763,7 +763,7 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX SvxShadowLocation eLoc = pThisAttr ? pThisAttr->GetLocation() : SVX_SHADOW_NONE; if (eLoc != SVX_SHADOW_NONE) { - // oder Test auf != eLoc + // oder Test auf != eLoc SCsCOL nDxPos = 1; SCsCOL nDxNeg = -1; @@ -786,10 +786,10 @@ void ScDocument::FillInfo( ScTableInfo& rTabInfo, SCCOL nX1, SCROW nY1, SCCOL nX { switch (eLoc) { - case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break; - case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break; - case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break; - case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break; + case SVX_SHADOW_BOTTOMRIGHT: eLoc = SVX_SHADOW_BOTTOMLEFT; break; + case SVX_SHADOW_BOTTOMLEFT: eLoc = SVX_SHADOW_BOTTOMRIGHT; break; + case SVX_SHADOW_TOPRIGHT: eLoc = SVX_SHADOW_TOPLEFT; break; + case SVX_SHADOW_TOPLEFT: eLoc = SVX_SHADOW_TOPRIGHT; break; default: { // added to avoid warnings diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 0ceb96f85c4d..184ea610a7a7 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.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 @@ -91,20 +91,20 @@ // ----------------------------------------------------------------------- -#define CLIPST_AVAILABLE 0 -#define CLIPST_CAPTURED 1 -#define CLIPST_DELETE 2 -#define CLIPST_DRAW 3 +#define CLIPST_AVAILABLE 0 +#define CLIPST_CAPTURED 1 +#define CLIPST_DELETE 2 +#define CLIPST_DRAW 3 -ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL; -SvxSearchItem* ScGlobal::pSearchItem = NULL; -ScAutoFormat* ScGlobal::pAutoFormat = NULL; +ScDocShellRef* ScGlobal::pDrawClipDocShellRef = NULL; +SvxSearchItem* ScGlobal::pSearchItem = NULL; +ScAutoFormat* ScGlobal::pAutoFormat = NULL; FuncCollection* ScGlobal::pFuncCollection = NULL; ScUnoAddInCollection* ScGlobal::pAddInCollection = NULL; -ScUserList* ScGlobal::pUserList = NULL; -String** ScGlobal::ppRscString = NULL; +ScUserList* ScGlobal::pUserList = NULL; +String** ScGlobal::ppRscString = NULL; LanguageType ScGlobal::eLnge = LANGUAGE_SYSTEM; -::com::sun::star::lang::Locale* ScGlobal::pLocale = NULL; +::com::sun::star::lang::Locale* ScGlobal::pLocale = NULL; SvtSysLocale* ScGlobal::pSysLocale = NULL; const CharClass* ScGlobal::pCharClass = NULL; const LocaleDataWrapper* ScGlobal::pLocaleData = NULL; @@ -115,59 +115,59 @@ CollatorWrapper* ScGlobal::pCaseCollator = NULL; ::utl::TransliterationWrapper* ScGlobal::pCaseTransliteration = NULL; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XOrdinalSuffix> ScGlobal::xOrdinalSuffix = NULL; IntlWrapper* ScGlobal::pScIntlWrapper = NULL; -sal_Unicode ScGlobal::cListDelimiter = ','; -String* ScGlobal::pEmptyString = NULL; -String* ScGlobal::pStrClipDocName = NULL; +sal_Unicode ScGlobal::cListDelimiter = ','; +String* ScGlobal::pEmptyString = NULL; +String* ScGlobal::pStrClipDocName = NULL; -SvxBrushItem* ScGlobal::pEmptyBrushItem = NULL; -SvxBrushItem* ScGlobal::pButtonBrushItem = NULL; -SvxBrushItem* ScGlobal::pEmbeddedBrushItem = NULL; -SvxBrushItem* ScGlobal::pProtectedBrushItem = NULL; +SvxBrushItem* ScGlobal::pEmptyBrushItem = NULL; +SvxBrushItem* ScGlobal::pButtonBrushItem = NULL; +SvxBrushItem* ScGlobal::pEmbeddedBrushItem = NULL; +SvxBrushItem* ScGlobal::pProtectedBrushItem = NULL; ImageList* ScGlobal::pOutlineBitmaps = NULL; ImageList* ScGlobal::pOutlineBitmapsHC = NULL; ScFunctionList* ScGlobal::pStarCalcFunctionList = NULL; -ScFunctionMgr* ScGlobal::pStarCalcFunctionMgr = NULL; +ScFunctionMgr* ScGlobal::pStarCalcFunctionMgr = NULL; ScUnitConverter* ScGlobal::pUnitConverter = NULL; SvNumberFormatter* ScGlobal::pEnglishFormatter = NULL; -double ScGlobal::nScreenPPTX = 96.0; -double ScGlobal::nScreenPPTY = 96.0; +double ScGlobal::nScreenPPTX = 96.0; +double ScGlobal::nScreenPPTY = 96.0; -USHORT ScGlobal::nDefFontHeight = 240; -USHORT ScGlobal::nStdRowHeight = 257; +USHORT ScGlobal::nDefFontHeight = 240; +USHORT ScGlobal::nStdRowHeight = 257; -long ScGlobal::nLastRowHeightExtra = 0; -long ScGlobal::nLastColWidthExtra = STD_EXTRA_WIDTH; +long ScGlobal::nLastRowHeightExtra = 0; +long ScGlobal::nLastColWidthExtra = STD_EXTRA_WIDTH; -static USHORT nPPTZoom = 0; // ScreenZoom used to determine nScreenPPTX/Y +static USHORT nPPTZoom = 0; // ScreenZoom used to determine nScreenPPTX/Y class SfxViewShell; -SfxViewShell* pScActiveViewShell = NULL; //! als Member !!!!! -USHORT nScClickMouseModifier = 0; //! dito -USHORT nScFillModeMouseModifier = 0; //! dito +SfxViewShell* pScActiveViewShell = NULL; //! als Member !!!!! +USHORT nScClickMouseModifier = 0; //! dito +USHORT nScFillModeMouseModifier = 0; //! dito // Hack: ScGlobal::GetUserList() muss InitAppOptions in der UI aufrufen, -// damit UserList aus Cfg geladen wird +// damit UserList aus Cfg geladen wird void global_InitAppOptions(); //======================================================================== // -// statische Funktionen +// statische Funktionen // //======================================================================== BOOL ScGlobal::HasAttrChanged( const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs, - const USHORT nWhich ) + const USHORT nWhich ) { - BOOL bInvalidate = FALSE; - const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich ); - const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich ); + BOOL bInvalidate = FALSE; + const SfxItemState eNewState = rNewAttrs.GetItemState( nWhich ); + const SfxItemState eOldState = rOldAttrs.GetItemState( nWhich ); //---------------------------------------------------------- @@ -282,7 +282,7 @@ void ScGlobal::SetSearchItem( const SvxSearchItem& rNew ) { // Hier waere ein Zuweisungsoperator ganz nett: delete pSearchItem; - pSearchItem = (SvxSearchItem*)rNew.Clone(); + pSearchItem = (SvxSearchItem*)rNew.Clone(); pSearchItem->SetWhich( SID_SEARCH_ITEM ); } @@ -407,7 +407,7 @@ String ScGlobal::GetErrorString(USHORT nErrNumber) case errDivisionByZero : nErrNumber = STR_DIV_ZERO; break; case errIllegalFPOperation : nErrNumber = STR_NUM_ERROR; break; - default : sResStr = GetRscString(STR_ERROR_STR); + default : sResStr = GetRscString(STR_ERROR_STR); sResStr += String::CreateFromInt32( nErrNumber ); nErrNumber = 0; break; @@ -535,17 +535,17 @@ void ScGlobal::Init() { pEmptyString = new String; - // Die Default-Sprache fuer Zahlenformate (ScGlobal::eLnge) - // muss immer LANGUAGE_SYSTEM sein - //! Dann kann auch die Variable raus + // Die Default-Sprache fuer Zahlenformate (ScGlobal::eLnge) + // muss immer LANGUAGE_SYSTEM sein + //! Dann kann auch die Variable raus eLnge = LANGUAGE_SYSTEM; - //! Wenn Sortierung etc. von der Sprache der installierten Offfice-Version + //! Wenn Sortierung etc. von der Sprache der installierten Offfice-Version //! abhaengen sollen, hier "Application::GetSettings().GetUILanguage()" pSysLocale = new SvtSysLocale; pCharClass = pSysLocale->GetCharClassPtr(); pLocaleData = pSysLocale->GetLocaleDataPtr(); - + ppRscString = new String *[ STR_COUNT ]; for( USHORT nC = 0 ; nC < STR_COUNT ; nC++ ) ppRscString[ nC ] = NULL; @@ -560,14 +560,14 @@ void ScGlobal::Init() // arguments are to be merged in, which in turn need strings of function // names from the compiler. ScParameterClassification::Init(); - srand( (unsigned) time( NULL ) ); // Random Seed Init fuer Interpreter + srand( (unsigned) time( NULL ) ); // Random Seed Init fuer Interpreter InitAddIns(); pStrClipDocName = new String( ScResId( SCSTR_NONAME ) ); *pStrClipDocName += '1'; - // ScDocumentPool::InitVersionMaps() ist schon vorher gerufen worden + // ScDocumentPool::InitVersionMaps() ist schon vorher gerufen worden } void ScGlobal::UpdatePPT( OutputDevice* pDev ) @@ -575,10 +575,10 @@ void ScGlobal::UpdatePPT( OutputDevice* pDev ) USHORT nCurrentZoom = Application::GetSettings().GetStyleSettings().GetScreenZoom(); if ( nCurrentZoom != nPPTZoom ) { - // Screen PPT values must be updated when ScreenZoom has changed. - // If called from Window::DataChanged, the window is passed as pDev, - // to make sure LogicToPixel uses a device which already uses the new zoom. - // For the initial settings, NULL is passed and GetDefaultDevice used. + // Screen PPT values must be updated when ScreenZoom has changed. + // If called from Window::DataChanged, the window is passed as pDev, + // to make sure LogicToPixel uses a device which already uses the new zoom. + // For the initial settings, NULL is passed and GetDefaultDevice used. if ( !pDev ) pDev = Application::GetDefaultDevice(); @@ -615,12 +615,12 @@ void ScGlobal::InitTextHeight(SfxItemPool* pPool) return; } -// String aTestString('X'); +// String aTestString('X'); OutputDevice* pDefaultDev = Application::GetDefaultDevice(); VirtualDevice aVirtWindow( *pDefaultDev ); aVirtWindow.SetMapMode(MAP_PIXEL); Font aDefFont; - pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // font color doesn't matter here + pPattern->GetFont(aDefFont, SC_AUTOCOL_BLACK, &aVirtWindow); // font color doesn't matter here aVirtWindow.SetFont(aDefFont); nDefFontHeight = (USHORT) aVirtWindow.PixelToLogic(Size(0, aVirtWindow.GetTextHeight()), MAP_TWIP).Height(); @@ -648,11 +648,11 @@ void ScGlobal::Clear() delete[] ppRscString; ppRscString = NULL; - DELETEZ(pStarCalcFunctionList); // vor ResMgr zerstoeren! + DELETEZ(pStarCalcFunctionList); // vor ResMgr zerstoeren! DELETEZ(pStarCalcFunctionMgr); ScParameterClassification::Exit(); ScCompiler::DeInit(); - ScInterpreter::GlobalExit(); // statischen Stack loeschen + ScInterpreter::GlobalExit(); // statischen Stack loeschen DELETEZ(pEmptyBrushItem); DELETEZ(pButtonBrushItem); @@ -660,8 +660,8 @@ void ScGlobal::Clear() DELETEZ(pProtectedBrushItem); DELETEZ(pOutlineBitmaps); DELETEZ(pOutlineBitmapsHC); -// DELETEZ(pAnchorBitmap); -// DELETEZ(pGrayAnchorBitmap); +// DELETEZ(pAnchorBitmap); +// DELETEZ(pGrayAnchorBitmap); DELETEZ(pEnglishFormatter); DELETEZ(pCaseTransliteration); DELETEZ(pTransliteration); @@ -698,16 +698,16 @@ CharSet ScGlobal::GetCharsetValue( const String& rCharSet ) return (CharSet) nVal; } // old CharSet values for compatibility - else if (rCharSet.EqualsIgnoreCaseAscii("ANSI") ) return RTL_TEXTENCODING_MS_1252; - else if (rCharSet.EqualsIgnoreCaseAscii("MAC") ) return RTL_TEXTENCODING_APPLE_ROMAN; - else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC") ) return RTL_TEXTENCODING_IBM_850; + else if (rCharSet.EqualsIgnoreCaseAscii("ANSI") ) return RTL_TEXTENCODING_MS_1252; + else if (rCharSet.EqualsIgnoreCaseAscii("MAC") ) return RTL_TEXTENCODING_APPLE_ROMAN; + else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC") ) return RTL_TEXTENCODING_IBM_850; else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_437")) return RTL_TEXTENCODING_IBM_437; else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_850")) return RTL_TEXTENCODING_IBM_850; else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_860")) return RTL_TEXTENCODING_IBM_860; else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_861")) return RTL_TEXTENCODING_IBM_861; else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_863")) return RTL_TEXTENCODING_IBM_863; else if (rCharSet.EqualsIgnoreCaseAscii("IBMPC_865")) return RTL_TEXTENCODING_IBM_865; -// else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM") ) return gsl_getSystemTextEncoding(); +// else if (rCharSet.EqualsIgnoreCaseAscii("SYSTEM") ) return gsl_getSystemTextEncoding(); else return gsl_getSystemTextEncoding(); } @@ -720,16 +720,16 @@ String ScGlobal::GetCharsetString( CharSet eVal ) switch ( eVal ) { // old CharSet strings for compatibility - case RTL_TEXTENCODING_MS_1252: pChar = "ANSI"; break; - case RTL_TEXTENCODING_APPLE_ROMAN: pChar = "MAC"; break; + case RTL_TEXTENCODING_MS_1252: pChar = "ANSI"; break; + case RTL_TEXTENCODING_APPLE_ROMAN: pChar = "MAC"; break; // IBMPC == IBMPC_850 - case RTL_TEXTENCODING_IBM_437: pChar = "IBMPC_437"; break; - case RTL_TEXTENCODING_IBM_850: pChar = "IBMPC_850"; break; - case RTL_TEXTENCODING_IBM_860: pChar = "IBMPC_860"; break; - case RTL_TEXTENCODING_IBM_861: pChar = "IBMPC_861"; break; - case RTL_TEXTENCODING_IBM_863: pChar = "IBMPC_863"; break; - case RTL_TEXTENCODING_IBM_865: pChar = "IBMPC_865"; break; - case RTL_TEXTENCODING_DONTKNOW: pChar = "SYSTEM"; break; + case RTL_TEXTENCODING_IBM_437: pChar = "IBMPC_437"; break; + case RTL_TEXTENCODING_IBM_850: pChar = "IBMPC_850"; break; + case RTL_TEXTENCODING_IBM_860: pChar = "IBMPC_860"; break; + case RTL_TEXTENCODING_IBM_861: pChar = "IBMPC_861"; break; + case RTL_TEXTENCODING_IBM_863: pChar = "IBMPC_863"; break; + case RTL_TEXTENCODING_IBM_865: pChar = "IBMPC_865"; break; + case RTL_TEXTENCODING_DONTKNOW: pChar = "SYSTEM"; break; // new string of TextEncoding value default: return String::CreateFromInt32( eVal ); @@ -747,7 +747,7 @@ bool ScGlobal::HasStarCalcFunctionList() ScFunctionList* ScGlobal::GetStarCalcFunctionList() { if ( !pStarCalcFunctionList ) - pStarCalcFunctionList = new ScFunctionList; + pStarCalcFunctionList = new ScFunctionList; return pStarCalcFunctionList; } @@ -893,12 +893,12 @@ const sal_Unicode* ScGlobal::FindUnquoted( const sal_Unicode* pString, sal_Unico BOOL ScGlobal::EETextObjEqual( const EditTextObject* pObj1, const EditTextObject* pObj2 ) { - if ( pObj1 == pObj2 ) // both empty or the same object + if ( pObj1 == pObj2 ) // both empty or the same object return TRUE; if ( pObj1 && pObj2 ) { - // first test for equal text content + // first test for equal text content USHORT nParCount = pObj1->GetParagraphCount(); if ( nParCount != pObj2->GetParagraphCount() ) return FALSE; @@ -906,8 +906,8 @@ BOOL ScGlobal::EETextObjEqual( const EditTextObject* pObj1, if ( pObj1->GetText(nPar) != pObj2->GetText(nPar) ) return FALSE; - SvMemoryStream aStream1; - SvMemoryStream aStream2; + SvMemoryStream aStream1; + SvMemoryStream aStream2; pObj1->Store( aStream1 ); pObj2->Store( aStream2 ); ULONG nSize = aStream1.Tell(); @@ -921,13 +921,13 @@ BOOL ScGlobal::EETextObjEqual( const EditTextObject* pObj1, void ScGlobal::OpenURL( const String& rURL, const String& rTarget ) { - // OpenURL wird immer ueber irgendwelche Umwege durch Mausklicks im GridWindow - // aufgerufen, darum stimmen pScActiveViewShell und nScClickMouseModifier. + // OpenURL wird immer ueber irgendwelche Umwege durch Mausklicks im GridWindow + // aufgerufen, darum stimmen pScActiveViewShell und nScClickMouseModifier. SfxStringItem aUrl( SID_FILE_NAME, rURL ); SfxStringItem aTarget( SID_TARGETNAME, rTarget ); - if ( nScClickMouseModifier & KEY_MOD1 ) // control-click -> into new window + if ( nScClickMouseModifier & KEY_MOD1 ) // control-click -> into new window aTarget.SetValue( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("_blank")) ); @@ -947,7 +947,7 @@ void ScGlobal::OpenURL( const String& rURL, const String& rTarget ) SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, FALSE ); SfxBoolItem aBrowsing( SID_BROWSE, TRUE ); - // kein SID_SILENT mehr wegen Bug #42525# (war angeblich sowieso falsch) + // kein SID_SILENT mehr wegen Bug #42525# (war angeblich sowieso falsch) SfxViewFrame* pViewFrm = SfxViewFrame::Current(); if (pViewFrm) @@ -968,17 +968,17 @@ BOOL ScGlobal::IsSystemRTL() BYTE ScGlobal::GetDefaultScriptType() { - // Used when text contains only WEAK characters. - // Script type of office language is used then (same as GetEditDefaultLanguage, - // to get consistent behavior of text in simple cells and EditEngine, - // also same as GetAppLanguage() in Writer) + // Used when text contains only WEAK characters. + // Script type of office language is used then (same as GetEditDefaultLanguage, + // to get consistent behavior of text in simple cells and EditEngine, + // also same as GetAppLanguage() in Writer) return (BYTE) SvtLanguageOptions::GetScriptTypeOfLanguage( Application::GetSettings().GetLanguage() ); } LanguageType ScGlobal::GetEditDefaultLanguage() { - // used for EditEngine::SetDefaultLanguage + // used for EditEngine::SetDefaultLanguage return Application::GetSettings().GetLanguage(); } @@ -1105,7 +1105,7 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) //=================================================================== //=================================================================== -// class ScFuncRes +// class ScFuncRes // fuer temporaere Objekte zum Holen der Resourcen class ScFuncRes : public Resource @@ -1124,7 +1124,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) { rbSuppressed = (bool)GetNum(); pDesc->nCategory = GetNum(); - pDesc->nHelpId = GetNum() + 32768; //! Hack, see scfuncs.src + pDesc->nHelpId = GetNum() + 32768; //! Hack, see scfuncs.src pDesc->nArgCount = GetNum(); USHORT nArgs = pDesc->nArgCount; if (nArgs >= VAR_ARGS) @@ -1202,22 +1202,22 @@ USHORT ScFuncRes::GetNum() class ScResourcePublisher : public Resource { private: - void FreeResource() { Resource::FreeResource(); } + void FreeResource() { Resource::FreeResource(); } public: ScResourcePublisher( const ScResId& rId ) : Resource( rId ) {} ~ScResourcePublisher() { FreeResource(); } - BOOL IsAvailableRes( const ResId& rId ) const + BOOL IsAvailableRes( const ResId& rId ) const { return Resource::IsAvailableRes( rId ); } - + }; ScFunctionList::ScFunctionList() : - nMaxFuncNameLen ( 0 ) + nMaxFuncNameLen ( 0 ) { - ScFuncDesc* pDesc = NULL; - xub_StrLen nStrLen = 0; - FuncCollection* pFuncColl; + ScFuncDesc* pDesc = NULL; + xub_StrLen nStrLen = 0; + FuncCollection* pFuncColl; USHORT i,j; USHORT nDescBlock[] = { @@ -1263,7 +1263,7 @@ ScFunctionList::ScFunctionList() : } } - USHORT nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions + USHORT nNextId = SC_OPCODE_LAST_OPCODE_ID + 1; // FuncID for AddIn functions // Auswertung AddIn-Liste String aDefArgNameValue(RTL_CONSTASCII_STRINGPARAM("value")); @@ -1286,7 +1286,7 @@ ScFunctionList::ScFunctionList() : FuncData *pAddInFuncData = (FuncData*)pFuncColl->At(i); USHORT nArgs = pAddInFuncData->GetParamCount() - 1; pAddInFuncData->GetParamDesc( aArgName, aArgDesc, 0 ); - pDesc->nFIndex = nNextId++; // ??? OpCode vergeben + pDesc->nFIndex = nNextId++; // ??? OpCode vergeben pDesc->nCategory = ID_FUNCTION_GRP_ADDINS; pDesc->pFuncName = new String(pAddInFuncData->GetInternalName()); pDesc->pFuncName->ToUpperAscii(); @@ -1360,7 +1360,7 @@ ScFunctionList::ScFunctionList() : } } } -// pDesc->nHelpId = 0; +// pDesc->nHelpId = 0; aFunctionList.Insert(pDesc, LIST_APPEND); nStrLen = (*(pDesc->pFuncName)).Len(); @@ -1368,7 +1368,7 @@ ScFunctionList::ScFunctionList() : nMaxFuncNameLen = nStrLen; } - // StarOne AddIns + // StarOne AddIns ScUnoAddInCollection* pUnoAddIns = ScGlobal::GetAddInCollection(); long nUnoCount = pUnoAddIns->GetFuncCount(); @@ -1565,7 +1565,7 @@ String ScFuncDesc::GetSignature() const aFormula.appendAscii( "(" ); ::std::vector< ::rtl::OUString >::const_iterator aIter = _aArguments.begin(); ::std::vector< ::rtl::OUString >::const_iterator aEnd = _aArguments.end(); - + if ( nArgCount > 0 && aIter != aEnd ) { BOOL bLastArg = ( aIter->getLength() == 0 ); @@ -1620,12 +1620,12 @@ USHORT ScFuncDesc::GetSuppressedArgCount() const return sRet; } // ----------------------------------------------------------------------------- -const formula::IFunctionCategory* ScFuncDesc::getCategory() const +const formula::IFunctionCategory* ScFuncDesc::getCategory() const { return ScGlobal::GetStarCalcFunctionMgr()->getCategory(nCategory); } // ----------------------------------------------------------------------------- -::rtl::OUString ScFuncDesc::getDescription() const +::rtl::OUString ScFuncDesc::getDescription() const { ::rtl::OUString sRet; if ( pFuncDesc ) @@ -1634,13 +1634,13 @@ const formula::IFunctionCategory* ScFuncDesc::getCategory() const } // ----------------------------------------------------------------------------- // GetSuppressedArgCount -xub_StrLen ScFuncDesc::getSuppressedArgumentCount() const +xub_StrLen ScFuncDesc::getSuppressedArgumentCount() const { return GetSuppressedArgCount(); } // ----------------------------------------------------------------------------- -// -void ScFuncDesc::fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const +// +void ScFuncDesc::fillVisibleArgumentMapping(::std::vector<USHORT>& _rArguments) const { if (!bHasSuppressedArgs || !pDefArgFlags) { @@ -1685,34 +1685,34 @@ void ScFuncDesc::initArgumentInfo() const } } // ----------------------------------------------------------------------------- -::rtl::OUString ScFuncDesc::getSignature() const +::rtl::OUString ScFuncDesc::getSignature() const { return GetSignature(); } // ----------------------------------------------------------------------------- -long ScFuncDesc::getHelpId() const +long ScFuncDesc::getHelpId() const { return nHelpId; } // ----------------------------------------------------------------------------- // parameter -sal_uInt32 ScFuncDesc::getParameterCount() const +sal_uInt32 ScFuncDesc::getParameterCount() const { return nArgCount; } // ----------------------------------------------------------------------------- -::rtl::OUString ScFuncDesc::getParameterName(sal_uInt32 _nPos) const +::rtl::OUString ScFuncDesc::getParameterName(sal_uInt32 _nPos) const { return *(ppDefArgNames[_nPos]); } // ----------------------------------------------------------------------------- -::rtl::OUString ScFuncDesc::getParameterDescription(sal_uInt32 _nPos) const +::rtl::OUString ScFuncDesc::getParameterDescription(sal_uInt32 _nPos) const { return *(ppDefArgDescs[_nPos]); } // ----------------------------------------------------------------------------- -bool ScFuncDesc::isParameterOptional(sal_uInt32 _nPos) const +bool ScFuncDesc::isParameterOptional(sal_uInt32 _nPos) const { return pDefArgFlags[_nPos].bOptional; } @@ -1721,19 +1721,19 @@ bool ScFuncDesc::isParameterOptional(sal_uInt32 _nPos) const // class ScFunctionMgr: ScFunctionMgr::ScFunctionMgr() - : pFuncList ( ScGlobal::GetStarCalcFunctionList() ), - pCurCatList ( NULL ) + : pFuncList ( ScGlobal::GetStarCalcFunctionList() ), + pCurCatList ( NULL ) { DBG_ASSERT( pFuncList, "Funktionsliste nicht gefunden." ); - ULONG nCount = pFuncList->GetCount(); - const ScFuncDesc* pDesc; - List* pRootList; - ULONG n; + ULONG nCount = pFuncList->GetCount(); + const ScFuncDesc* pDesc; + List* pRootList; + ULONG n; - for ( USHORT i=0; i<MAX_FUNCCAT; i++ ) // Kategorie-Listen erstellen + for ( USHORT i=0; i<MAX_FUNCCAT; i++ ) // Kategorie-Listen erstellen aCatLists[i] = new List; - pRootList = aCatLists[0]; // Gesamtliste ("Alle") erstellen + pRootList = aCatLists[0]; // Gesamtliste ("Alle") erstellen CollatorWrapper* pCaseCollator = ScGlobal::GetCaseCollator(); for ( n=0; n<nCount; n++ ) { @@ -1743,14 +1743,14 @@ ScFunctionMgr::ScFunctionMgr() { // ist zwar case-sensitiv, aber Umlaute muessen richtig einsortiert werden - const ScFuncDesc* pTmpDesc = (const ScFuncDesc*)pRootList->GetObject(nTmpCnt); + const ScFuncDesc* pTmpDesc = (const ScFuncDesc*)pRootList->GetObject(nTmpCnt); if ( pCaseCollator->compareString(*pDesc->pFuncName, *pTmpDesc->pFuncName ) == COMPARE_LESS ) break; } - pRootList->Insert((void*)pDesc, nTmpCnt); // Einsortieren + pRootList->Insert((void*)pDesc, nTmpCnt); // Einsortieren } - for ( n=0; n<nCount; n++ ) // in Gruppenlisten kopieren + for ( n=0; n<nCount; n++ ) // in Gruppenlisten kopieren { pDesc = (const ScFuncDesc*)pRootList->GetObject(n); DBG_ASSERT((pDesc->nCategory) < MAX_FUNCCAT, "Unbekannte Kategorie"); @@ -1772,7 +1772,7 @@ ScFunctionMgr::~ScFunctionMgr() const ScFuncDesc* ScFunctionMgr::Get( const String& rFName ) const { - const ScFuncDesc* pDesc = NULL; + const ScFuncDesc* pDesc = NULL; if (rFName.Len() <= pFuncList->GetMaxFuncNameLen()) for (pDesc = First(0); pDesc; pDesc = Next()) if (rFName.EqualsIgnoreCaseAscii(*(pDesc->pFuncName))) @@ -1784,7 +1784,7 @@ const ScFuncDesc* ScFunctionMgr::Get( const String& rFName ) const const ScFuncDesc* ScFunctionMgr::Get( USHORT nFIndex ) const { - const ScFuncDesc* pDesc; + const ScFuncDesc* pDesc; for (pDesc = First(0); pDesc; pDesc = Next()) if (pDesc->nFIndex == nFIndex) break; @@ -1793,7 +1793,7 @@ const ScFuncDesc* ScFunctionMgr::Get( USHORT nFIndex ) const //------------------------------------------------------------------------ -const ScFuncDesc* ScFunctionMgr::First( USHORT nCategory ) const +const ScFuncDesc* ScFunctionMgr::First( USHORT nCategory ) const { DBG_ASSERT( nCategory < MAX_FUNCCAT, "Unbekannte Kategorie" ); @@ -1843,7 +1843,7 @@ void ScFunctionMgr::fillLastRecentlyUsedFunctions(::std::vector< const formula:: const ScAppOptions& rAppOpt = SC_MOD()->GetAppOptions(); USHORT nLRUFuncCount = Min( rAppOpt.GetLRUFuncListCount(), (USHORT)LRU_MAX ); - USHORT* pLRUListIds = rAppOpt.GetLRUFuncList(); + USHORT* pLRUListIds = rAppOpt.GetLRUFuncList(); if ( pLRUListIds ) { @@ -1900,7 +1900,7 @@ const formula::IFunctionManager* ScFunctionCategory::getFunctionManager() const // ----------------------------------------------------------------------------- const formula::IFunctionDescription* ScFunctionCategory::getFunction(sal_uInt32 _nPos) const { - const ScFuncDesc* pDesc = NULL; + const ScFuncDesc* pDesc = NULL; sal_uInt32 i = 0; for (pDesc = (const ScFuncDesc*)m_pCategory->First(); i < _nPos && pDesc; pDesc = (const ScFuncDesc*)m_pCategory->Next(),++i) ; @@ -1946,7 +1946,7 @@ CalendarWrapper* ScGlobal::GetCalendar() } return pCalendar; } -CollatorWrapper* ScGlobal::GetCollator() +CollatorWrapper* ScGlobal::GetCollator() { if ( !pCollator ) { @@ -1955,7 +1955,7 @@ CollatorWrapper* ScGlobal::GetCollator() } // if ( !pCollator ) return pCollator; } -CollatorWrapper* ScGlobal::GetCaseCollator() +CollatorWrapper* ScGlobal::GetCaseCollator() { if ( !pCaseCollator ) { @@ -1982,7 +1982,7 @@ IntlWrapper* ScGlobal::GetScIntlWrapper() } return pScIntlWrapper; } -::com::sun::star::lang::Locale* ScGlobal::GetLocale() +::com::sun::star::lang::Locale* ScGlobal::GetLocale() { if ( !pLocale ) { diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index c9aaff566b15..159835f147ce 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.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 @@ -81,16 +81,16 @@ ScImportParam::ScImportParam() : } ScImportParam::ScImportParam( const ScImportParam& r ) : - nCol1 (r.nCol1), - nRow1 (r.nRow1), - nCol2 (r.nCol2), - nRow2 (r.nRow2), - bImport (r.bImport), - aDBName (r.aDBName), - aStatement (r.aStatement), - bNative (r.bNative), - bSql (r.bSql), - nType (r.nType) + nCol1 (r.nCol1), + nRow1 (r.nRow1), + nCol2 (r.nCol2), + nRow2 (r.nRow2), + bImport (r.bImport), + aDBName (r.aDBName), + aStatement (r.aStatement), + bNative (r.bNative), + bSql (r.bSql), + nType (r.nType) { } @@ -101,34 +101,34 @@ ScImportParam::~ScImportParam() ScImportParam& ScImportParam::operator=( const ScImportParam& r ) { - nCol1 = r.nCol1; - nRow1 = r.nRow1; - nCol2 = r.nCol2; - nRow2 = r.nRow2; - bImport = r.bImport; - aDBName = r.aDBName; - aStatement = r.aStatement; - bNative = r.bNative; - bSql = r.bSql; - nType = r.nType; + nCol1 = r.nCol1; + nRow1 = r.nRow1; + nCol2 = r.nCol2; + nRow2 = r.nRow2; + bImport = r.bImport; + aDBName = r.aDBName; + aStatement = r.aStatement; + bNative = r.bNative; + bSql = r.bSql; + nType = r.nType; return *this; } BOOL ScImportParam::operator==( const ScImportParam& rOther ) const { - return( nCol1 == rOther.nCol1 && - nRow1 == rOther.nRow1 && - nCol2 == rOther.nCol2 && - nRow2 == rOther.nRow2 && - bImport == rOther.bImport && - aDBName == rOther.aDBName && - aStatement == rOther.aStatement && - bNative == rOther.bNative && - bSql == rOther.bSql && - nType == rOther.nType ); + return( nCol1 == rOther.nCol1 && + nRow1 == rOther.nRow1 && + nCol2 == rOther.nCol2 && + nRow2 == rOther.nRow2 && + bImport == rOther.bImport && + aDBName == rOther.aDBName && + aStatement == rOther.aStatement && + bNative == rOther.bNative && + bSql == rOther.bSql && + nType == rOther.nType ); - //! nQuerySh und pConnection sind gleich ? + //! nQuerySh und pConnection sind gleich ? } @@ -175,54 +175,54 @@ ScQueryEntry::~ScQueryEntry() ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r ) { - bDoQuery = r.bDoQuery; - bQueryByString = r.bQueryByString; + bDoQuery = r.bDoQuery; + bQueryByString = r.bQueryByString; bQueryByDate = r.bQueryByDate; - eOp = r.eOp; - eConnect = r.eConnect; - nField = r.nField; - nVal = r.nVal; - *pStr = *r.pStr; + eOp = r.eOp; + eConnect = r.eConnect; + nField = r.nField; + nVal = r.nVal; + *pStr = *r.pStr; if ( pSearchParam ) { delete pSearchParam; delete pSearchText; } - pSearchParam = NULL; - pSearchText = NULL; + pSearchParam = NULL; + pSearchText = NULL; return *this; } void ScQueryEntry::Clear() { - bDoQuery = FALSE; - bQueryByString = FALSE; + bDoQuery = FALSE; + bQueryByString = FALSE; bQueryByDate = false; - eOp = SC_EQUAL; - eConnect = SC_AND; - nField = 0; - nVal = 0.0; + eOp = SC_EQUAL; + eConnect = SC_AND; + nField = 0; + nVal = 0.0; pStr->Erase(); if ( pSearchParam ) { delete pSearchParam; delete pSearchText; } - pSearchParam = NULL; - pSearchText = NULL; + pSearchParam = NULL; + pSearchText = NULL; } BOOL ScQueryEntry::operator==( const ScQueryEntry& r ) const { - return bDoQuery == r.bDoQuery - && bQueryByString == r.bQueryByString + return bDoQuery == r.bDoQuery + && bQueryByString == r.bQueryByString && bQueryByDate == r.bQueryByDate - && eOp == r.eOp - && eConnect == r.eConnect - && nField == r.nField - && nVal == r.nVal - && *pStr == *r.pStr; + && eOp == r.eOp + && eConnect == r.eConnect + && nField == r.nField + && nVal == r.nVal + && *pStr == *r.pStr; //! pSearchParam und pSearchText nicht vergleichen } @@ -262,14 +262,14 @@ ScSubTotalParam::ScSubTotalParam( const ScSubTotalParam& r ) : { for (USHORT i=0; i<MAXSUBTOTAL; i++) { - bGroupActive[i] = r.bGroupActive[i]; - nField[i] = r.nField[i]; + bGroupActive[i] = r.bGroupActive[i]; + nField[i] = r.nField[i]; if ( (r.nSubTotals[i] > 0) && r.pSubTotals[i] && r.pFunctions[i] ) { nSubTotals[i] = r.nSubTotals[i]; - pSubTotals[i] = new SCCOL [r.nSubTotals[i]]; - pFunctions[i] = new ScSubTotalFunc [r.nSubTotals[i]]; + pSubTotals[i] = new SCCOL [r.nSubTotals[i]]; + pFunctions[i] = new ScSubTotalFunc [r.nSubTotals[i]]; for (SCCOL j=0; j<r.nSubTotals[i]; j++) { @@ -298,8 +298,8 @@ void ScSubTotalParam::Clear() for (USHORT i=0; i<MAXSUBTOTAL; i++) { - bGroupActive[i] = FALSE; - nField[i] = 0; + bGroupActive[i] = FALSE; + nField[i] = 0; if ( (nSubTotals[i] > 0) && pSubTotals[i] && pFunctions[i] ) { @@ -315,33 +315,33 @@ void ScSubTotalParam::Clear() ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r ) { - nCol1 = r.nCol1; - nRow1 = r.nRow1; - nCol2 = r.nCol2; - nRow2 = r.nRow2; - bRemoveOnly = r.bRemoveOnly; - bReplace = r.bReplace; - bPagebreak = r.bPagebreak; - bCaseSens = r.bCaseSens; - bDoSort = r.bDoSort; - bAscending = r.bAscending; - bUserDef = r.bUserDef; - nUserIndex = r.nUserIndex; - bIncludePattern = r.bIncludePattern; + nCol1 = r.nCol1; + nRow1 = r.nRow1; + nCol2 = r.nCol2; + nRow2 = r.nRow2; + bRemoveOnly = r.bRemoveOnly; + bReplace = r.bReplace; + bPagebreak = r.bPagebreak; + bCaseSens = r.bCaseSens; + bDoSort = r.bDoSort; + bAscending = r.bAscending; + bUserDef = r.bUserDef; + nUserIndex = r.nUserIndex; + bIncludePattern = r.bIncludePattern; for (USHORT i=0; i<MAXSUBTOTAL; i++) { - bGroupActive[i] = r.bGroupActive[i]; - nField[i] = r.nField[i]; - nSubTotals[i] = r.nSubTotals[i]; + bGroupActive[i] = r.bGroupActive[i]; + nField[i] = r.nField[i]; + nSubTotals[i] = r.nSubTotals[i]; if ( pSubTotals[i] ) delete [] pSubTotals[i]; if ( pFunctions[i] ) delete [] pFunctions[i]; if ( r.nSubTotals[i] > 0 ) { - pSubTotals[i] = new SCCOL [r.nSubTotals[i]]; - pFunctions[i] = new ScSubTotalFunc [r.nSubTotals[i]]; + pSubTotals[i] = new SCCOL [r.nSubTotals[i]]; + pFunctions[i] = new ScSubTotalFunc [r.nSubTotals[i]]; for (SCCOL j=0; j<r.nSubTotals[i]; j++) { @@ -364,18 +364,18 @@ ScSubTotalParam& ScSubTotalParam::operator=( const ScSubTotalParam& r ) BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const { - BOOL bEqual = (nCol1 == rOther.nCol1) - && (nRow1 == rOther.nRow1) - && (nCol2 == rOther.nCol2) - && (nRow2 == rOther.nRow2) - && (bRemoveOnly == rOther.bRemoveOnly) - && (bReplace == rOther.bReplace) - && (bPagebreak == rOther.bPagebreak) - && (bDoSort == rOther.bDoSort) - && (bCaseSens == rOther.bCaseSens) - && (bAscending == rOther.bAscending) - && (bUserDef == rOther.bUserDef) - && (nUserIndex == rOther.nUserIndex) + BOOL bEqual = (nCol1 == rOther.nCol1) + && (nRow1 == rOther.nRow1) + && (nCol2 == rOther.nCol2) + && (nRow2 == rOther.nRow2) + && (bRemoveOnly == rOther.bRemoveOnly) + && (bReplace == rOther.bReplace) + && (bPagebreak == rOther.bPagebreak) + && (bDoSort == rOther.bDoSort) + && (bCaseSens == rOther.bCaseSens) + && (bAscending == rOther.bAscending) + && (bUserDef == rOther.bUserDef) + && (nUserIndex == rOther.nUserIndex) && (bIncludePattern== rOther.bIncludePattern); if ( bEqual ) @@ -383,9 +383,9 @@ BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const bEqual = TRUE; for ( USHORT i=0; i<MAXSUBTOTAL && bEqual; i++ ) { - bEqual = (bGroupActive[i] == rOther.bGroupActive[i]) - && (nField[i] == rOther.nField[i]) - && (nSubTotals[i] == rOther.nSubTotals[i]); + bEqual = (bGroupActive[i] == rOther.bGroupActive[i]) + && (nField[i] == rOther.nField[i]) + && (nSubTotals[i] == rOther.nSubTotals[i]); if ( bEqual && (nSubTotals[i] > 0) ) { @@ -406,10 +406,10 @@ BOOL ScSubTotalParam::operator==( const ScSubTotalParam& rOther ) const //------------------------------------------------------------------------ -void ScSubTotalParam::SetSubTotals( USHORT nGroup, - const SCCOL* ptrSubTotals, - const ScSubTotalFunc* ptrFunctions, - USHORT nCount ) +void ScSubTotalParam::SetSubTotals( USHORT nGroup, + const SCCOL* ptrSubTotals, + const ScSubTotalFunc* ptrFunctions, + USHORT nCount ) { DBG_ASSERT( (nGroup <= MAXSUBTOTAL), "ScSubTotalParam::SetSubTotals(): nGroup > MAXSUBTOTAL!" ); @@ -429,8 +429,8 @@ void ScSubTotalParam::SetSubTotals( USHORT nGroup, delete [] pSubTotals[nGroup]; delete [] pFunctions[nGroup]; - pSubTotals[nGroup] = new SCCOL [nCount]; - pFunctions[nGroup] = new ScSubTotalFunc [nCount]; + pSubTotals[nGroup] = new SCCOL [nCount]; + pFunctions[nGroup] = new ScSubTotalFunc [nCount]; nSubTotals[nGroup] = static_cast<SCCOL>(nCount); for ( USHORT i=0; i<nCount; i++ ) @@ -497,21 +497,21 @@ void __EXPORT ScConsolidateParam::Clear() nCol = 0; nRow = 0; nTab = 0; - bByCol = bByRow = bReferenceData = FALSE; - eFunction = SUBTOTAL_FUNC_SUM; + bByCol = bByRow = bReferenceData = FALSE; + eFunction = SUBTOTAL_FUNC_SUM; } //------------------------------------------------------------------------ ScConsolidateParam& __EXPORT ScConsolidateParam::operator=( const ScConsolidateParam& r ) { - nCol = r.nCol; - nRow = r.nRow; - nTab = r.nTab; - bByCol = r.bByCol; - bByRow = r.bByRow; - bReferenceData = r.bReferenceData; - eFunction = r.eFunction; + nCol = r.nCol; + nRow = r.nRow; + nTab = r.nTab; + bByCol = r.bByCol; + bByRow = r.bByRow; + bReferenceData = r.bReferenceData; + eFunction = r.eFunction; SetAreas( r.ppDataAreas, r.nDataAreaCount ); return *this; @@ -521,14 +521,14 @@ ScConsolidateParam& __EXPORT ScConsolidateParam::operator=( const ScConsolidateP BOOL __EXPORT ScConsolidateParam::operator==( const ScConsolidateParam& r ) const { - BOOL bEqual = (nCol == r.nCol) - && (nRow == r.nRow) - && (nTab == r.nTab) - && (bByCol == r.bByCol) - && (bByRow == r.bByRow) - && (bReferenceData == r.bReferenceData) - && (nDataAreaCount == r.nDataAreaCount) - && (eFunction == r.eFunction); + BOOL bEqual = (nCol == r.nCol) + && (nRow == r.nRow) + && (nTab == r.nTab) + && (bByCol == r.bByCol) + && (bByRow == r.bByRow) + && (bReferenceData == r.bReferenceData) + && (nDataAreaCount == r.nDataAreaCount) + && (eFunction == r.eFunction); if ( nDataAreaCount == 0 ) bEqual = bEqual && (ppDataAreas == NULL) && (r.ppDataAreas == NULL); @@ -580,7 +580,7 @@ bool PivotField::operator==( const PivotField& r ) const // struct ScPivotParam: ScPivotParam::ScPivotParam() - : nCol(0), nRow(0), nTab(0), + : nCol(0), nRow(0), nTab(0), nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0), bIgnoreEmptyRows(FALSE), bDetectCategories(FALSE), bMakeTotalCol(TRUE), bMakeTotalRow(TRUE) @@ -590,7 +590,7 @@ ScPivotParam::ScPivotParam() //------------------------------------------------------------------------ ScPivotParam::ScPivotParam( const ScPivotParam& r ) - : nCol( r.nCol ), nRow( r.nRow ), nTab( r.nTab ), + : nCol( r.nCol ), nRow( r.nRow ), nTab( r.nTab ), nPageCount(0), nColCount(0), nRowCount(0), nDataCount(0), bIgnoreEmptyRows(r.bIgnoreEmptyRows), bDetectCategories(r.bDetectCategories), @@ -641,25 +641,25 @@ void ScPivotParam::SetLabelData(const vector<ScDPLabelDataRef>& r) void __EXPORT ScPivotParam::SetPivotArrays ( const PivotField* pPageArr, const PivotField* pColArr, - const PivotField* pRowArr, - const PivotField* pDataArr, + const PivotField* pRowArr, + const PivotField* pDataArr, SCSIZE nPageCnt, - SCSIZE nColCnt, - SCSIZE nRowCnt, - SCSIZE nDataCnt ) + SCSIZE nColCnt, + SCSIZE nRowCnt, + SCSIZE nDataCnt ) { ClearPivotArrays(); if ( pPageArr && pColArr && pRowArr && pDataArr ) { nPageCount = (nPageCnt>PIVOT_MAXPAGEFIELD) ? PIVOT_MAXPAGEFIELD : nPageCnt; - nColCount = (nColCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nColCnt; - nRowCount = (nRowCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nRowCnt; - nDataCount = (nDataCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nDataCnt; + nColCount = (nColCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nColCnt; + nRowCount = (nRowCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nRowCnt; + nDataCount = (nDataCnt>PIVOT_MAXFIELD) ? PIVOT_MAXFIELD : nDataCnt; memcpy( aPageArr, pPageArr, nPageCount * sizeof(PivotField) ); - memcpy( aColArr, pColArr, nColCount * sizeof(PivotField) ); - memcpy( aRowArr, pRowArr, nRowCount * sizeof(PivotField) ); + memcpy( aColArr, pColArr, nColCount * sizeof(PivotField) ); + memcpy( aRowArr, pRowArr, nRowCount * sizeof(PivotField) ); memcpy( aDataArr, pDataArr, nDataCount * sizeof(PivotField) ); } } @@ -668,13 +668,13 @@ void __EXPORT ScPivotParam::SetPivotArrays ( const PivotField* pPageArr, ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r ) { - nCol = r.nCol; - nRow = r.nRow; - nTab = r.nTab; + nCol = r.nCol; + nRow = r.nRow; + nTab = r.nTab; bIgnoreEmptyRows = r.bIgnoreEmptyRows; bDetectCategories = r.bDetectCategories; - bMakeTotalCol = r.bMakeTotalCol; - bMakeTotalRow = r.bMakeTotalRow; + bMakeTotalCol = r.bMakeTotalCol; + bMakeTotalRow = r.bMakeTotalRow; SetPivotArrays ( r.aPageArr, r.aColArr, r.aRowArr, r.aDataArr, r.nPageCount, r.nColCount, r.nRowCount, r.nDataCount ); @@ -686,18 +686,18 @@ ScPivotParam& __EXPORT ScPivotParam::operator=( const ScPivotParam& r ) BOOL __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const { - BOOL bEqual = (nCol == r.nCol) - && (nRow == r.nRow) - && (nTab == r.nTab) + BOOL bEqual = (nCol == r.nCol) + && (nRow == r.nRow) + && (nTab == r.nTab) && (bIgnoreEmptyRows == r.bIgnoreEmptyRows) && (bDetectCategories == r.bDetectCategories) && (bMakeTotalCol == r.bMakeTotalCol) && (bMakeTotalRow == r.bMakeTotalRow) && (maLabelArray.size() == r.maLabelArray.size()) && (nPageCount == r.nPageCount) - && (nColCount == r.nColCount) - && (nRowCount == r.nRowCount) - && (nDataCount == r.nDataCount); + && (nColCount == r.nColCount) + && (nRowCount == r.nRowCount) + && (nDataCount == r.nDataCount); if ( bEqual ) { @@ -723,16 +723,16 @@ BOOL __EXPORT ScPivotParam::operator==( const ScPivotParam& r ) const // struct ScSolveParam ScSolveParam::ScSolveParam() - : pStrTargetVal( NULL ) + : pStrTargetVal( NULL ) { } //------------------------------------------------------------------------ ScSolveParam::ScSolveParam( const ScSolveParam& r ) - : aRefFormulaCell ( r.aRefFormulaCell ), + : aRefFormulaCell ( r.aRefFormulaCell ), aRefVariableCell( r.aRefVariableCell ), - pStrTargetVal ( r.pStrTargetVal + pStrTargetVal ( r.pStrTargetVal ? new String(*r.pStrTargetVal) : NULL ) { @@ -742,10 +742,10 @@ ScSolveParam::ScSolveParam( const ScSolveParam& r ) ScSolveParam::ScSolveParam( const ScAddress& rFormulaCell, const ScAddress& rVariableCell, - const String& rTargetValStr ) - : aRefFormulaCell ( rFormulaCell ), + const String& rTargetValStr ) + : aRefFormulaCell ( rFormulaCell ), aRefVariableCell( rVariableCell ), - pStrTargetVal ( new String(rTargetValStr) ) + pStrTargetVal ( new String(rTargetValStr) ) { } @@ -774,8 +774,8 @@ ScSolveParam& __EXPORT ScSolveParam::operator=( const ScSolveParam& r ) BOOL ScSolveParam::operator==( const ScSolveParam& r ) const { - BOOL bEqual = (aRefFormulaCell == r.aRefFormulaCell) - && (aRefVariableCell == r.aRefVariableCell); + BOOL bEqual = (aRefFormulaCell == r.aRefFormulaCell) + && (aRefVariableCell == r.aRefVariableCell); if ( bEqual ) { @@ -795,11 +795,11 @@ BOOL ScSolveParam::operator==( const ScSolveParam& r ) const // struct ScTabOpParam ScTabOpParam::ScTabOpParam( const ScTabOpParam& r ) - : aRefFormulaCell ( r.aRefFormulaCell ), - aRefFormulaEnd ( r.aRefFormulaEnd ), - aRefRowCell ( r.aRefRowCell ), - aRefColCell ( r.aRefColCell ), - nMode ( r.nMode ) + : aRefFormulaCell ( r.aRefFormulaCell ), + aRefFormulaEnd ( r.aRefFormulaEnd ), + aRefRowCell ( r.aRefRowCell ), + aRefColCell ( r.aRefColCell ), + nMode ( r.nMode ) { } @@ -809,12 +809,12 @@ ScTabOpParam::ScTabOpParam( const ScRefAddress& rFormulaCell, const ScRefAddress& rFormulaEnd, const ScRefAddress& rRowCell, const ScRefAddress& rColCell, - BYTE nMd) - : aRefFormulaCell ( rFormulaCell ), - aRefFormulaEnd ( rFormulaEnd ), - aRefRowCell ( rRowCell ), - aRefColCell ( rColCell ), - nMode ( nMd ) + BYTE nMd) + : aRefFormulaCell ( rFormulaCell ), + aRefFormulaEnd ( rFormulaEnd ), + aRefRowCell ( rRowCell ), + aRefColCell ( rColCell ), + nMode ( nMd ) { } @@ -824,9 +824,9 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r ) { aRefFormulaCell = r.aRefFormulaCell; aRefFormulaEnd = r.aRefFormulaEnd; - aRefRowCell = r.aRefRowCell; - aRefColCell = r.aRefColCell; - nMode = r.nMode; + aRefRowCell = r.aRefRowCell; + aRefColCell = r.aRefColCell; + nMode = r.nMode; return *this; } @@ -834,11 +834,11 @@ ScTabOpParam& ScTabOpParam::operator=( const ScTabOpParam& r ) BOOL __EXPORT ScTabOpParam::operator==( const ScTabOpParam& r ) const { - return ( (aRefFormulaCell == r.aRefFormulaCell) - && (aRefFormulaEnd == r.aRefFormulaEnd) - && (aRefRowCell == r.aRefRowCell) - && (aRefColCell == r.aRefColCell) - && (nMode == r.nMode) ); + return ( (aRefFormulaCell == r.aRefFormulaCell) + && (aRefFormulaEnd == r.aRefFormulaEnd) + && (aRefRowCell == r.aRefRowCell) + && (aRefColCell == r.aRefColCell) + && (nMode == r.nMode) ); } String ScGlobal::GetAbsDocName( const String& rFileName, @@ -846,14 +846,14 @@ String ScGlobal::GetAbsDocName( const String& rFileName, { String aAbsName; if ( !pShell->HasName() ) - { // maybe relative to document path working directory + { // maybe relative to document path working directory INetURLObject aObj; SvtPathOptions aPathOpt; aObj.SetSmartURL( aPathOpt.GetWorkPath() ); - aObj.setFinalSlash(); // it IS a path + aObj.setFinalSlash(); // it IS a path bool bWasAbs = true; aAbsName = aObj.smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::NO_DECODE); - // returned string must be encoded because it's used directly to create SfxMedium + // returned string must be encoded because it's used directly to create SfxMedium } else { @@ -864,7 +864,7 @@ String ScGlobal::GetAbsDocName( const String& rFileName, aAbsName = pMedium->GetURLObject().smartRel2Abs( rFileName, bWasAbs ).GetMainURL(INetURLObject::NO_DECODE); } else - { // This can't happen, but ... + { // This can't happen, but ... // just to be sure to have the same encoding INetURLObject aObj; aObj.SetSmartURL( aAbsName ); @@ -883,13 +883,13 @@ String ScGlobal::GetDocTabName( const String& rFileName, xub_StrLen nPos = 1; while( (nPos = aDocTab.Search( '\'', nPos )) != STRING_NOTFOUND ) - { // escape Quotes + { // escape Quotes aDocTab.Insert( '\\', nPos ); nPos += 2; } aDocTab += '\''; aDocTab += SC_COMPILER_FILE_TAB_SEP; - aDocTab += rTabName; // "'Doc'#Tab" + aDocTab += rTabName; // "'Doc'#Tab" return aDocTab; } diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index be5cf810a967..6fb5a5046364 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.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,8 +71,8 @@ void ScGlobal::InitAddIns() String aPath( aMultiPath.GetToken( 0, ';', nIndex ) ); if ( aPath.Len() > 0 ) { - // use LocalFileHelper to convert the path to a URL that always points - // to the file on the server + // use LocalFileHelper to convert the path to a URL that always points + // to the file on the server String aUrl; if ( utl::LocalFileHelper::ConvertPhysicalNameToURL( aPath, aUrl ) ) aPath = aUrl; diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index b5b20084fc6d..0b79a7acf1eb 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.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 @@ -77,12 +77,12 @@ void ScMarkArray::Reset( BOOL bMarked ) BOOL ScMarkArray::Search( SCROW nRow, SCSIZE& nIndex ) const { - long nLo = 0; - long nHi = static_cast<long>(nCount) - 1; - long nStartRow = 0; - long nEndRow = 0; - long i = 0; - BOOL bFound = (nCount == 1); + long nLo = 0; + long nHi = static_cast<long>(nCount) - 1; + long nStartRow = 0; + long nEndRow = 0; + long i = 0; + BOOL bFound = (nCount == 1); if (pData) { while ( !bFound && nLo <= nHi ) @@ -249,7 +249,7 @@ void ScMarkArray::SetMarkArea( SCROW nStartRow, SCROW nEndRow, BOOL bMarked ) } } } -// InfoBox(0, String(nCount) + String(" Eintraege") ).Execute(); +// InfoBox(0, String(nCount) + String(" Eintraege") ).Execute(); } BOOL ScMarkArray::IsAllMarked( SCROW nStartRow, SCROW nEndRow ) const @@ -368,7 +368,7 @@ SCROW ScMarkArray::GetMarkEnd( SCROW nRow, BOOL bUp ) const } // -// -------------- Iterator ---------------------------------------------- +// -------------- Iterator ---------------------------------------------- // ScMarkArrayIter::ScMarkArrayIter( const ScMarkArray* pNewArray ) : diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index e9486e7705b0..f3dde73083d0 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.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,10 +57,10 @@ ScMarkData::ScMarkData(const ScMarkData& rData) : aMultiRange( rData.aMultiRange ), pMultiSel( NULL ) { - bMarked = rData.bMarked; + bMarked = rData.bMarked; bMultiMarked = rData.bMultiMarked; - bMarking = rData.bMarking; - bMarkIsNeg = rData.bMarkIsNeg; + bMarking = rData.bMarking; + bMarkIsNeg = rData.bMarkIsNeg; for (SCTAB i=0; i<=MAXTAB; i++) bTabMarked[i] = rData.bTabMarked[i]; @@ -73,7 +73,7 @@ ScMarkData::ScMarkData(const ScMarkData& rData) : } } -ScMarkData& ScMarkData::operator=(const ScMarkData& rData) +ScMarkData& ScMarkData::operator=(const ScMarkData& rData) { if ( &rData == this ) return *this; @@ -81,12 +81,12 @@ ScMarkData& ScMarkData::operator=(const ScMarkData& rData) delete[] pMultiSel; pMultiSel = NULL; - aMarkRange = rData.aMarkRange; + aMarkRange = rData.aMarkRange; aMultiRange = rData.aMultiRange; - bMarked = rData.bMarked; + bMarked = rData.bMarked; bMultiMarked = rData.bMultiMarked; - bMarking = rData.bMarking; - bMarkIsNeg = rData.bMarkIsNeg; + bMarking = rData.bMarking; + bMarkIsNeg = rData.bMarkIsNeg; for (SCTAB i=0; i<=MAXTAB; i++) bTabMarked[i] = rData.bTabMarked[i]; @@ -132,7 +132,7 @@ void ScMarkData::SetMarkArea( const ScRange& rRange ) void ScMarkData::GetMarkArea( ScRange& rRange ) const { - rRange = aMarkRange; //! inline ? + rRange = aMarkRange; //! inline ? } void ScMarkData::GetMultiMarkArea( ScRange& rRange ) const @@ -165,7 +165,7 @@ void ScMarkData::SetMultiMarkArea( const ScRange& rRange, BOOL bMark ) for (nCol=nStartCol; nCol<=nEndCol; nCol++) pMultiSel[nCol].SetMarkArea( nStartRow, nEndRow, bMark ); - if ( bMultiMarked ) // aMultiRange updaten + if ( bMultiMarked ) // aMultiRange updaten { if ( nStartCol < aMultiRange.aStart.Col() ) aMultiRange.aStart.SetCol( nStartCol ); @@ -178,7 +178,7 @@ void ScMarkData::SetMultiMarkArea( const ScRange& rRange, BOOL bMark ) } else { - aMultiRange = rRange; // neu + aMultiRange = rRange; // neu bMultiMarked = TRUE; } } @@ -224,7 +224,7 @@ void ScMarkData::MarkToMulti() SetMultiMarkArea( aMarkRange, !bMarkIsNeg ); bMarked = FALSE; - // check if all multi mark ranges have been removed + // check if all multi mark ranges have been removed if ( bMarkIsNeg && !HasAnyMultiMarks() ) ResetMark(); } @@ -236,7 +236,7 @@ void ScMarkData::MarkToSimple() return; if ( bMultiMarked && bMarked ) - MarkToMulti(); // may result in bMarked and bMultiMarked reset + MarkToMulti(); // may result in bMarked and bMultiMarked reset if ( bMultiMarked ) { @@ -253,7 +253,7 @@ void ScMarkData::MarkToSimple() while ( nStartCol < nEndCol && !pMultiSel[nEndCol].HasMarks() ) --nEndCol; - // Zeilen werden nur aus MarkArray genommen + // Zeilen werden nur aus MarkArray genommen SCROW nStartRow, nEndRow; if ( pMultiSel[nStartCol].HasOneMark( nStartRow, nEndRow ) ) { @@ -289,7 +289,7 @@ BOOL ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple ) const if (bMultiMarked) { - //! hier auf negative Markierung testen ? + //! hier auf negative Markierung testen ? DBG_ASSERT(pMultiSel, "bMultiMarked, aber pMultiSel == 0"); return pMultiSel[nCol].GetMark( nRow ); @@ -300,12 +300,12 @@ BOOL ScMarkData::IsCellMarked( SCCOL nCol, SCROW nRow, BOOL bNoSimple ) const BOOL ScMarkData::IsColumnMarked( SCCOL nCol ) const { - // bMarkIsNeg inzwischen auch fuer Spaltenkoepfe - //! GetMarkColumnRanges fuer komplett markierte Spalten + // bMarkIsNeg inzwischen auch fuer Spaltenkoepfe + //! GetMarkColumnRanges fuer komplett markierte Spalten if ( bMarked && !bMarkIsNeg && aMarkRange.aStart.Col() <= nCol && aMarkRange.aEnd.Col() >= nCol && - aMarkRange.aStart.Row() == 0 && aMarkRange.aEnd.Row() == MAXROW ) + aMarkRange.aStart.Row() == 0 && aMarkRange.aEnd.Row() == MAXROW ) return TRUE; if ( bMultiMarked && pMultiSel[nCol].IsAllMarked(0,MAXROW) ) @@ -316,11 +316,11 @@ BOOL ScMarkData::IsColumnMarked( SCCOL nCol ) const BOOL ScMarkData::IsRowMarked( SCROW nRow ) const { - // bMarkIsNeg inzwischen auch fuer Zeilenkoepfe - //! GetMarkRowRanges fuer komplett markierte Zeilen + // bMarkIsNeg inzwischen auch fuer Zeilenkoepfe + //! GetMarkRowRanges fuer komplett markierte Zeilen if ( bMarked && !bMarkIsNeg && - aMarkRange.aStart.Col() == 0 && aMarkRange.aEnd.Col() == MAXCOL && + aMarkRange.aStart.Col() == 0 && aMarkRange.aEnd.Col() == MAXCOL && aMarkRange.aStart.Row() <= nRow && aMarkRange.aEnd.Row() >= nRow ) return TRUE; @@ -341,7 +341,7 @@ void ScMarkData::MarkFromRangeList( const ScRangeList& rList, BOOL bReset ) if (bReset) { for (SCTAB i=0; i<=MAXTAB; i++) - bTabMarked[i] = FALSE; // Tabellen sind nicht in ResetMark + bTabMarked[i] = FALSE; // Tabellen sind nicht in ResetMark ResetMark(); } @@ -371,7 +371,7 @@ void ScMarkData::FillRangeListWithMarks( ScRangeList* pList, BOOL bClear ) const if (bClear) pList->RemoveAll(); - //! bei mehreren selektierten Tabellen mehrere Ranges eintragen !!! + //! bei mehreren selektierten Tabellen mehrere Ranges eintragen !!! if ( bMultiMarked ) { @@ -406,7 +406,7 @@ void ScMarkData::ExtendRangeListTables( ScRangeList* pList ) const return; ScRangeList aOldList(*pList); - pList->RemoveAll(); //! oder die vorhandenen unten weglassen + pList->RemoveAll(); //! oder die vorhandenen unten weglassen for (SCTAB nTab=0; nTab<=MAXTAB; nTab++) if (bTabMarked[nTab]) @@ -586,7 +586,7 @@ BOOL ScMarkData::HasAnyMultiMarks() const if ( pMultiSel[nCol].HasMarks() ) return TRUE; - return FALSE; // nix + return FALSE; // nix } void ScMarkData::InsertTab( SCTAB nTab ) diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index 19706ce86c0f..8cfdcb37e9d6 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.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/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx index 03ca4060d49b..92c1d1f20e14 100644 --- a/sc/source/core/data/pagepar.cxx +++ b/sc/source/core/data/pagepar.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 @@ -61,8 +61,8 @@ void ScPageTableParam::Reset() bCellContent = TRUE; bNotes=bGrid=bHeaders=bDrawings= bLeftRight=bScaleAll=bScaleTo=bScalePageNum= - bFormulas=bNullVals=bSkipEmpty = FALSE; - bTopDown=bScaleNone=bCharts=bObjects = TRUE; + bFormulas=bNullVals=bSkipEmpty = FALSE; + bTopDown=bScaleNone=bCharts=bObjects = TRUE; nScaleAll = 100; nScalePageNum = nScaleWidth = nScaleHeight = 0; nFirstPageNo = 1; @@ -105,19 +105,19 @@ void ScPageAreaParam::Reset() BOOL ScPageAreaParam::operator==( const ScPageAreaParam& r ) const { BOOL bEqual = - bPrintArea == r.bPrintArea - && bRepeatRow == r.bRepeatRow - && bRepeatCol == r.bRepeatCol; + bPrintArea == r.bPrintArea + && bRepeatRow == r.bRepeatRow + && bRepeatCol == r.bRepeatCol; if ( bEqual ) if ( bPrintArea ) - bEqual = bEqual && ( aPrintArea == r.aPrintArea ); + bEqual = bEqual && ( aPrintArea == r.aPrintArea ); if ( bEqual ) if ( bRepeatRow ) - bEqual = bEqual && ( aRepeatRow == r.aRepeatRow ); + bEqual = bEqual && ( aRepeatRow == r.aRepeatRow ); if ( bEqual ) if ( bRepeatCol ) - bEqual = bEqual && ( aRepeatCol == r.aRepeatCol ); + bEqual = bEqual && ( aRepeatCol == r.aRepeatCol ); return bEqual; } diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index eef90c7df8df..755a55cd1723 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.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 @@ -82,38 +82,38 @@ ScDocument* ScPatternAttr::pDoc = NULL; // ----------------------------------------------------------------------- -//! move to some header file -inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } -inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } +//! move to some header file +inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } +inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } // ----------------------------------------------------------------------- ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, const String& rStyleName ) - : SfxSetItem ( ATTR_PATTERN, pItemSet ), - pName ( new String( rStyleName ) ), - pStyle ( NULL ) + : SfxSetItem ( ATTR_PATTERN, pItemSet ), + pName ( new String( rStyleName ) ), + pStyle ( NULL ) { } ScPatternAttr::ScPatternAttr( SfxItemSet* pItemSet, ScStyleSheet* pStyleSheet ) - : SfxSetItem ( ATTR_PATTERN, pItemSet ), - pName ( NULL ), - pStyle ( pStyleSheet ) + : SfxSetItem ( ATTR_PATTERN, pItemSet ), + pName ( NULL ), + pStyle ( pStyleSheet ) { if ( pStyleSheet ) GetItemSet().SetParent( &pStyleSheet->GetItemSet() ); } ScPatternAttr::ScPatternAttr( SfxItemPool* pItemPool ) - : SfxSetItem ( ATTR_PATTERN, new SfxItemSet( *pItemPool, ATTR_PATTERN_START, ATTR_PATTERN_END ) ), - pName ( NULL ), - pStyle ( NULL ) + : SfxSetItem ( ATTR_PATTERN, new SfxItemSet( *pItemPool, ATTR_PATTERN_START, ATTR_PATTERN_END ) ), + pName ( NULL ), + pStyle ( NULL ) { } ScPatternAttr::ScPatternAttr( const ScPatternAttr& rPatternAttr ) - : SfxSetItem ( rPatternAttr ), - pStyle ( rPatternAttr.pStyle ) + : SfxSetItem ( rPatternAttr ), + pStyle ( rPatternAttr.pStyle ) { if (rPatternAttr.pName) pName = new String(*rPatternAttr.pName); @@ -167,8 +167,8 @@ int __EXPORT ScPatternAttr::operator==( const SfxPoolItem& rCmp ) const SfxPoolItem* __EXPORT ScPatternAttr::Create( SvStream& rStream, USHORT /* nVersion */ ) const { String* pStr; - BOOL bHasStyle; - short eFamDummy; + BOOL bHasStyle; + short eFamDummy; rStream >> bHasStyle; @@ -198,7 +198,7 @@ SvStream& __EXPORT ScPatternAttr::Store(SvStream& rStream, USHORT /* nItemVersio if ( pStyle ) rStream.WriteByteString( pStyle->GetName(), rStream.GetStreamCharSet() ); - else if ( pName ) // wenn Style geloescht ist/war + else if ( pName ) // wenn Style geloescht ist/war rStream.WriteByteString( *pName, rStream.GetStreamCharSet() ); else rStream.WriteByteString( ScGlobal::GetRscString(STR_STYLENAME_STANDARD), @@ -242,7 +242,7 @@ void ScPatternAttr::GetFont( const SfxItemSet* pCondSet, BYTE nScript, const Color* pBackConfigColor, const Color* pTextConfigColor ) { - // Items auslesen + // Items auslesen const SvxFontItem* pFontAttr; UINT32 nFontHeight; @@ -378,9 +378,9 @@ void ScPatternAttr::GetFont( } DBG_ASSERT(pFontAttr,"nanu?"); - // auswerten + // auswerten - // FontItem: + // FontItem: if (rFont.GetName() != pFontAttr->GetFamilyName()) rFont.SetName( pFontAttr->GetFamilyName() ); @@ -393,7 +393,7 @@ void ScPatternAttr::GetFont( rFont.SetLanguage(eLang); - // Groesse + // Groesse if ( pOutDev != NULL ) { @@ -420,7 +420,7 @@ void ScPatternAttr::GetFont( rFont.SetSize( Size( 0, (long) nFontHeight ) ); } - // determine effective font color + // determine effective font color if ( ( aColor.GetColor() == COL_AUTO && eAutoMode != SC_AUTOCOL_RAW ) || eAutoMode == SC_AUTOCOL_IGNOREFONT || eAutoMode == SC_AUTOCOL_IGNOREALL ) @@ -429,7 +429,7 @@ void ScPatternAttr::GetFont( aColor.SetColor( COL_BLACK ); else { - // get background color from conditional or own set + // get background color from conditional or own set Color aBackColor; if ( pCondSet ) { @@ -441,7 +441,7 @@ void ScPatternAttr::GetFont( else aBackColor = ((const SvxBrushItem&)rItemSet.Get( ATTR_BACKGROUND )).GetColor(); - // if background color attribute is transparent, use window color for brightness comparisons + // if background color attribute is transparent, use window color for brightness comparisons if ( aBackColor == COL_TRANSPARENT || eAutoMode == SC_AUTOCOL_IGNOREBACK || eAutoMode == SC_AUTOCOL_IGNOREALL ) { @@ -456,7 +456,7 @@ void ScPatternAttr::GetFont( aBackColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); } - // get system text color for comparison + // get system text color for comparison Color aSysTextColor; if ( eAutoMode == SC_AUTOCOL_PRINT ) aSysTextColor.SetColor( COL_BLACK ); @@ -468,26 +468,26 @@ void ScPatternAttr::GetFont( else aSysTextColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::FONTCOLOR).nColor ); - // select the resulting color + // select the resulting color if ( aBackColor.IsDark() && aSysTextColor.IsDark() ) { - // use white instead of dark on dark + // use white instead of dark on dark aColor.SetColor( COL_WHITE ); } else if ( aBackColor.IsBright() && aSysTextColor.IsBright() ) { - // use black instead of bright on bright + // use black instead of bright on bright aColor.SetColor( COL_BLACK ); } else { - // use aSysTextColor (black for SC_AUTOCOL_PRINT, from style settings otherwise) + // use aSysTextColor (black for SC_AUTOCOL_PRINT, from style settings otherwise) aColor = aSysTextColor; } } } - // set font effects + // set font effects rFont.SetWeight( eWeight ); rFont.SetItalic( eItalic ); rFont.SetUnderline( eUnder ); @@ -514,29 +514,29 @@ void ScPatternAttr::GetFont( void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& rSrcSet, const SfxItemSet* pCondSet ) { - // Items auslesen - - SvxColorItem aColorItem(EE_CHAR_COLOR); // use item as-is - SvxFontItem aFontItem(EE_CHAR_FONTINFO); // use item as-is - SvxFontItem aCjkFontItem(EE_CHAR_FONTINFO_CJK); - SvxFontItem aCtlFontItem(EE_CHAR_FONTINFO_CTL); - long nTHeight, nCjkTHeight, nCtlTHeight; // Twips - FontWeight eWeight, eCjkWeight, eCtlWeight; + // Items auslesen + + SvxColorItem aColorItem(EE_CHAR_COLOR); // use item as-is + SvxFontItem aFontItem(EE_CHAR_FONTINFO); // use item as-is + SvxFontItem aCjkFontItem(EE_CHAR_FONTINFO_CJK); + SvxFontItem aCtlFontItem(EE_CHAR_FONTINFO_CTL); + long nTHeight, nCjkTHeight, nCtlTHeight; // Twips + FontWeight eWeight, eCjkWeight, eCtlWeight; SvxUnderlineItem aUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE); SvxOverlineItem aOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE); - BOOL bWordLine; - FontStrikeout eStrike; - FontItalic eItalic, eCjkItalic, eCtlItalic; - BOOL bOutline; - BOOL bShadow; - BOOL bForbidden; + BOOL bWordLine; + FontStrikeout eStrike; + FontItalic eItalic, eCjkItalic, eCtlItalic; + BOOL bOutline; + BOOL bShadow; + BOOL bForbidden; FontEmphasisMark eEmphasis; - FontRelief eRelief; - LanguageType eLang, eCjkLang, eCtlLang; - BOOL bHyphenate; + FontRelief eRelief; + LanguageType eLang, eCjkLang, eCtlLang; + BOOL bHyphenate; SvxFrameDirection eDirection; - //! additional parameter to control if language is needed? + //! additional parameter to control if language is needed? if ( pCondSet ) { @@ -639,7 +639,7 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r pItem = &rSrcSet.Get( ATTR_WRITINGDIR ); eDirection = (SvxFrameDirection)((const SvxFrameDirectionItem*)pItem)->GetValue(); } - else // alles direkt aus Pattern + else // alles direkt aus Pattern { aColorItem = (const SvxColorItem&) rSrcSet.Get( ATTR_FONT_COLOR ); aFontItem = (const SvxFontItem&) rSrcSet.Get( ATTR_FONT ); @@ -697,15 +697,15 @@ void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& r long nCjkHeight = TwipsToHMM(nCjkTHeight); long nCtlHeight = TwipsToHMM(nCtlTHeight); - // put items into EditEngine ItemSet + // put items into EditEngine ItemSet if ( aColorItem.GetValue().GetColor() == COL_AUTO ) { - // #108979# When cell attributes are converted to EditEngine paragraph attributes, - // don't create a hard item for automatic color, because that would be converted - // to black when the item's Store method is used in CreateTransferable/WriteBin. - // COL_AUTO is the EditEngine's pool default, so ClearItem will result in automatic - // color, too, without having to store the item. + // #108979# When cell attributes are converted to EditEngine paragraph attributes, + // don't create a hard item for automatic color, because that would be converted + // to black when the item's Store method is used in CreateTransferable/WriteBin. + // COL_AUTO is the EditEngine's pool default, so ClearItem will result in automatic + // color, too, without having to store the item. rEditSet.ClearItem( EE_CHAR_COLOR ); } else @@ -871,8 +871,8 @@ void ScPatternAttr::GetFromEditItemSet( const SfxItemSet* pEditSet ) void ScPatternAttr::FillEditParaItems( SfxItemSet* pEditSet ) const { - // in GetFromEditItemSet schon dabei, in FillEditItemSet aber nicht - // Hor. Ausrichtung Standard wird immer als "links" umgesetzt + // in GetFromEditItemSet schon dabei, in FillEditItemSet aber nicht + // Hor. Ausrichtung Standard wird immer als "links" umgesetzt const SfxItemSet& rMySet = GetItemSet(); @@ -882,10 +882,10 @@ void ScPatternAttr::FillEditParaItems( SfxItemSet* pEditSet ) const SvxAdjust eSvxAdjust; switch (eHorJust) { - case SVX_HOR_JUSTIFY_RIGHT: eSvxAdjust = SVX_ADJUST_RIGHT; break; + case SVX_HOR_JUSTIFY_RIGHT: eSvxAdjust = SVX_ADJUST_RIGHT; break; case SVX_HOR_JUSTIFY_CENTER: eSvxAdjust = SVX_ADJUST_CENTER; break; - case SVX_HOR_JUSTIFY_BLOCK: eSvxAdjust = SVX_ADJUST_BLOCK; break; - default: eSvxAdjust = SVX_ADJUST_LEFT; break; + case SVX_HOR_JUSTIFY_BLOCK: eSvxAdjust = SVX_ADJUST_BLOCK; break; + default: eSvxAdjust = SVX_ADJUST_LEFT; break; } pEditSet->Put( SvxAdjustItem( eSvxAdjust, EE_PARA_JUST ) ); } @@ -900,19 +900,19 @@ void ScPatternAttr::DeleteUnchanged( const ScPatternAttr* pOldAttrs ) for ( USHORT nSubWhich=ATTR_PATTERN_START; nSubWhich<=ATTR_PATTERN_END; nSubWhich++ ) { - // only items that are set are interesting + // only items that are set are interesting if ( rThisSet.GetItemState( nSubWhich, FALSE, &pThisItem ) == SFX_ITEM_SET ) { SfxItemState eOldState = rOldSet.GetItemState( nSubWhich, TRUE, &pOldItem ); if ( eOldState == SFX_ITEM_SET ) { - // item is set in OldAttrs (or its parent) -> compare pointers + // item is set in OldAttrs (or its parent) -> compare pointers if ( pThisItem == pOldItem ) rThisSet.ClearItem( nSubWhich ); } else if ( eOldState != SFX_ITEM_DONTCARE ) { - // not set in OldAttrs -> compare item value to default item + // not set in OldAttrs -> compare item value to default item if ( *pThisItem == rThisSet.GetPool()->GetDefaultItem( nSubWhich ) ) rThisSet.ClearItem( nSubWhich ); } @@ -938,9 +938,9 @@ void ScPatternAttr::ClearItems( const USHORT* pWhich ) SfxStyleSheetBase* lcl_CopyStyleToPool ( - SfxStyleSheetBase* pSrcStyle, - SfxStyleSheetBasePool* pSrcPool, - SfxStyleSheetBasePool* pDestPool, + SfxStyleSheetBase* pSrcStyle, + SfxStyleSheetBasePool* pSrcPool, + SfxStyleSheetBasePool* pDestPool, const SvNumberFormatterIndexTable* pFormatExchangeList ) { @@ -952,9 +952,9 @@ SfxStyleSheetBase* lcl_CopyStyleToPool //-------------------------------------------------------- - const String aStrSrcStyle = pSrcStyle->GetName(); - const SfxStyleFamily eFamily = pSrcStyle->GetFamily(); - SfxStyleSheetBase* pDestStyle = pDestPool->Find( aStrSrcStyle, eFamily ); + const String aStrSrcStyle = pSrcStyle->GetName(); + const SfxStyleFamily eFamily = pSrcStyle->GetFamily(); + SfxStyleSheetBase* pDestStyle = pDestPool->Find( aStrSrcStyle, eFamily ); if ( !pDestStyle ) { @@ -1028,7 +1028,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD if ( nAttrId == ATTR_CONDITIONAL ) { - // Bedingte Formate ins neue Dokument kopieren + // Bedingte Formate ins neue Dokument kopieren ULONG nNewIndex = 0; ScConditionalFormatList* pSrcList = pSrcDoc->GetCondFormList(); @@ -1040,8 +1040,8 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD { nNewIndex = pDestDoc->AddCondFormat( *pOldData ); - // zugehoerige Styles auch mitkopieren - //! nur wenn Format bei Add neu angelegt + // zugehoerige Styles auch mitkopieren + //! nur wenn Format bei Add neu angelegt ScStyleSheetPool* pSrcSPool = pSrcDoc->GetStyleSheetPool(); ScStyleSheetPool* pDestSPool = pDestDoc->GetStyleSheetPool(); @@ -1060,7 +1060,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD } else if ( nAttrId == ATTR_VALIDDATA ) { - // Gueltigkeit ins neue Dokument kopieren + // Gueltigkeit ins neue Dokument kopieren ULONG nNewIndex = 0; ScValidationDataList* pSrcList = pSrcDoc->GetValidationList(); @@ -1075,7 +1075,7 @@ ScPatternAttr* ScPatternAttr::PutInPool( ScDocument* pDestDoc, ScDocument* pSrcD } else if ( nAttrId == ATTR_VALUE_FORMAT && pDestDoc->GetFormatExchangeList() ) { - // Zahlformate nach Exchange-Liste + // Zahlformate nach Exchange-Liste ULONG nOldFormat = ((const SfxUInt32Item*)pSrcItem)->GetValue(); sal_uInt32* pNewFormat = static_cast<sal_uInt32*>(pDestDoc->GetFormatExchangeList()->Get(nOldFormat)); @@ -1156,7 +1156,7 @@ BOOL ScPatternAttr::IsVisibleEqual( const ScPatternAttr& rOther ) const OneEqual( rThisSet, rOtherSet, ATTR_BORDER_BLTR ) && OneEqual( rThisSet, rOtherSet, ATTR_SHADOW ); - //! auch hier nur wirklich sichtbare Werte testen !!! + //! auch hier nur wirklich sichtbare Werte testen !!! } const String* ScPatternAttr::GetStyleName() const @@ -1169,7 +1169,7 @@ void ScPatternAttr::SetStyleSheet( ScStyleSheet* pNewStyle ) { if (pNewStyle) { - SfxItemSet& rPatternSet = GetItemSet(); + SfxItemSet& rPatternSet = GetItemSet(); const SfxItemSet& rStyleSet = pNewStyle->GetItemSet(); for (USHORT i=ATTR_PATTERN_START; i<=ATTR_PATTERN_END; i++) @@ -1195,9 +1195,9 @@ void ScPatternAttr::UpdateStyleSheet() { pStyle = (ScStyleSheet*)pDoc->GetStyleSheetPool()->Find(*pName, SFX_STYLE_FAMILY_PARA); - // wenn Style nicht gefunden, Standard nehmen, - // damit keine leere Anzeige im Toolbox-Controller - //! es wird vorausgesetzt, dass "Standard" immer der erste Eintrag ist! + // wenn Style nicht gefunden, Standard nehmen, + // damit keine leere Anzeige im Toolbox-Controller + //! es wird vorausgesetzt, dass "Standard" immer der erste Eintrag ist! if (!pStyle) { SfxStyleSheetIterator* pIter = pDoc->GetStyleSheetPool()->CreateIterator( @@ -1249,13 +1249,13 @@ ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const LanguageType eLang = ((SvxLanguageItem*)&GetItemSet().Get( ATTR_LANGUAGE_FORMAT ))->GetLanguage(); if ( nFormat < SV_COUNTRY_LANGUAGE_OFFSET && eLang == LANGUAGE_SYSTEM ) - ; // es bleibt wie es ist + ; // es bleibt wie es ist else if ( pFormatter ) nFormat = pFormatter->GetFormatForLanguageIfBuiltIn( nFormat, eLang ); return nFormat; } -// dasselbe, wenn bedingte Formatierung im Spiel ist: +// dasselbe, wenn bedingte Formatierung im Spiel ist: ULONG ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter, const SfxItemSet* pCondSet ) const @@ -1288,7 +1288,7 @@ const SfxPoolItem& ScPatternAttr::GetItem( USHORT nSubWhich, const SfxItemSet* p return GetItem( nSubWhich, GetItemSet(), pCondSet ); } -// GetRotateVal testet vorher ATTR_ORIENTATION +// GetRotateVal testet vorher ATTR_ORIENTATION long ScPatternAttr::GetRotateVal( const SfxItemSet* pCondSet ) const { @@ -1320,7 +1320,7 @@ BYTE ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const nRet = SC_ROTDIR_CENTER; else if ( eRotMode == SVX_ROTATE_MODE_TOP || eRotMode == SVX_ROTATE_MODE_BOTTOM ) { - long nRot180 = nAttrRotate % 18000; // 1/100 Grad + long nRot180 = nAttrRotate % 18000; // 1/100 Grad if ( nRot180 == 9000 ) nRet = SC_ROTDIR_CENTER; else if ( ( eRotMode == SVX_ROTATE_MODE_TOP && nRot180 < 9000 ) || diff --git a/sc/source/core/data/pivot2.cxx b/sc/source/core/data/pivot2.cxx index dd9980340cda..dde609aee859 100644 --- a/sc/source/core/data/pivot2.cxx +++ b/sc/source/core/data/pivot2.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 @@ -53,7 +53,7 @@ #include "userlist.hxx" #include "pivot.hxx" #include "rechead.hxx" -#include "formula/errorcodes.hxx" // fuer errNoValue +#include "formula/errorcodes.hxx" // fuer errNoValue #include "refupdat.hxx" #include "stlpool.hxx" #include "stlsheet.hxx" diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index 99e22727bd89..69eea16a35b3 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.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 @@ // ----------------------------------------------------------------------- -ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc ) +ScPoolHelper::ScPoolHelper( ScDocument* pSourceDoc ) :pFormTable(NULL) ,pEditPool(NULL) ,pEnginePool(NULL) @@ -64,18 +64,18 @@ ScPoolHelper::~ScPoolHelper() mxStylePool.clear(); SfxItemPool::Free(pDocPool); } -SfxItemPool* ScPoolHelper::GetEditPool() const +SfxItemPool* ScPoolHelper::GetEditPool() const { if ( !pEditPool ) { pEditPool = EditEngine::CreatePool(); pEditPool->SetDefaultMetric( SFX_MAPUNIT_100TH_MM ); pEditPool->FreezeIdRanges(); - pEditPool->SetFileFormatVersion( SOFFICE_FILEFORMAT_50 ); // used in ScGlobal::EETextObjEqual + pEditPool->SetFileFormatVersion( SOFFICE_FILEFORMAT_50 ); // used in ScGlobal::EETextObjEqual } return pEditPool; } -SfxItemPool* ScPoolHelper::GetEnginePool() const +SfxItemPool* ScPoolHelper::GetEnginePool() const { if ( !pEnginePool ) { @@ -85,7 +85,7 @@ SfxItemPool* ScPoolHelper::GetEnginePool() const } // ifg ( pEnginePool ) return pEnginePool; } -SvNumberFormatter* ScPoolHelper::GetFormTable() const +SvNumberFormatter* ScPoolHelper::GetFormTable() const { if ( !pFormTable ) { @@ -118,7 +118,7 @@ void ScPoolHelper::SetFormTableOpt(const ScDocOptions& rOpt) void ScPoolHelper::SourceDocumentGone() { - // reset all pointers to the source document + // reset all pointers to the source document mxStylePool->SetDocument( NULL ); if ( pFormTable ) pFormTable->SetColorLink( Link() ); diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index a80567b3c302..77a332ff18ff 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.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/core/data/scdpoutputimpl.cxx b/sc/source/core/data/scdpoutputimpl.cxx index 0ca69195dd63..330ebfa21c74 100644 --- a/sc/source/core/data/scdpoutputimpl.cxx +++ b/sc/source/core/data/scdpoutputimpl.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -50,16 +50,16 @@ void OutputImpl::OutputDataArea() AddRow( mnDataStartRow ); AddCol( mnDataStartCol ); - mnCols.push_back( mnTabEndCol+1); //set last row bottom + mnCols.push_back( mnTabEndCol+1); //set last row bottom mnRows.push_back( mnTabEndRow+1); //set last col bottom - + BOOL bAllRows = ( ( mnTabEndRow - mnDataStartRow + 2 ) == (SCROW) mnRows.size() ); - + std::sort( mnCols.begin(), mnCols.end(), lcl_compareColfuc ); std::sort( mnRows.begin(), mnRows.end(), lcl_compareRowfuc ); - + for( SCCOL nCol = 0; nCol < (SCCOL)mnCols.size()-1; nCol ++ ) - { + { if ( !bAllRows ) { if ( nCol < (SCCOL)mnCols.size()-2) @@ -67,7 +67,7 @@ void OutputImpl::OutputDataArea() for ( SCROW i = nCol%2; i < (SCROW)mnRows.size()-2; i +=2 ) OutputBlockFrame( mnCols[nCol], mnRows[i], mnCols[nCol+1]-1, mnRows[i+1]-1 ); if ( mnRows.size()>=2 ) - OutputBlockFrame( mnCols[nCol], mnRows[mnRows.size()-2], mnCols[nCol+1]-1, mnRows[mnRows.size()-1]-1 ); + OutputBlockFrame( mnCols[nCol], mnRows[mnRows.size()-2], mnCols[nCol+1]-1, mnRows[mnRows.size()-1]-1 ); } else { @@ -75,7 +75,7 @@ void OutputImpl::OutputDataArea() OutputBlockFrame( mnCols[nCol], mnRows[i], mnCols[nCol+1]-1, mnRows[i+1]-1 ); } } - else + else OutputBlockFrame( mnCols[nCol], mnRows.front(), mnCols[nCol+1]-1, mnRows.back()-1, bAllRows ); } //out put rows area outer framer @@ -89,14 +89,14 @@ void OutputImpl::OutputDataArea() OutputBlockFrame( mnDataStartCol, mnTabStartRow, mnTabEndCol, mnDataStartRow-1 ); } -OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab, - SCCOL nTabStartCol, - SCROW nTabStartRow, - SCCOL nMemberStartCol, - SCROW nMemberStartRow, - SCCOL nDataStartCol, - SCROW nDataStartRow, - SCCOL nTabEndCol, +OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab, + SCCOL nTabStartCol, + SCROW nTabStartRow, + SCCOL nMemberStartCol, + SCROW nMemberStartRow, + SCCOL nDataStartCol, + SCROW nDataStartRow, + SCCOL nTabEndCol, SCROW nTabEndRow ): mpDoc( pDoc ), mnTab( nTab ), @@ -105,13 +105,13 @@ OutputImpl::OutputImpl( ScDocument* pDoc, USHORT nTab, mnMemberStartCol( nMemberStartCol), mnMemberStartRow( nMemberStartRow), mnDataStartCol ( nDataStartCol ), - mnDataStartRow ( nDataStartRow ), + mnDataStartRow ( nDataStartRow ), mnTabEndCol( nTabEndCol ), mnTabEndRow( nTabEndRow ) { mbNeedLineCols.resize( nTabEndCol-nDataStartCol+1, false ); mbNeedLineRows.resize( nTabEndRow-nDataStartRow+1, false ); - + } BOOL OutputImpl::AddRow( SCROW nRow ) @@ -128,7 +128,7 @@ BOOL OutputImpl::AddRow( SCROW nRow ) BOOL OutputImpl::AddCol( SCCOL nCol ) { - + if ( !mbNeedLineCols[ nCol - mnDataStartCol ] ) { mbNeedLineCols[ nCol - mnDataStartCol ] = true; @@ -136,7 +136,7 @@ BOOL OutputImpl::AddCol( SCCOL nCol ) return TRUE; } else - return FALSE; + return FALSE; } void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bHori ) @@ -147,7 +147,7 @@ void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEnd aLine.SetOutWidth( SC_DP_FRAME_INNER_BOLD ); aOutLine.SetColor( SC_DP_FRAME_COLOR ); aOutLine.SetOutWidth( SC_DP_FRAME_OUTER_BOLD ); - + SvxBoxItem aBox( ATTR_BORDER ); if ( nStartCol == mnTabStartCol ) @@ -159,18 +159,18 @@ void OutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEnd aBox.SetLine(&aOutLine, BOX_LINE_TOP); else aBox.SetLine(&aLine, BOX_LINE_TOP); - + if ( nEndCol == mnTabEndCol ) //bottom row aBox.SetLine(&aOutLine, BOX_LINE_RIGHT); - else + else aBox.SetLine(&aLine, BOX_LINE_RIGHT); - if ( nEndRow == mnTabEndRow ) //bottom + if ( nEndRow == mnTabEndRow ) //bottom aBox.SetLine(&aOutLine, BOX_LINE_BOTTOM); else aBox.SetLine(&aLine, BOX_LINE_BOTTOM); - + SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER ); aBoxInfo.SetValid(VALID_VERT,FALSE ); if ( bHori ) diff --git a/sc/source/core/data/scdpoutputimpl.hxx b/sc/source/core/data/scdpoutputimpl.hxx index 1ccf002efa58..7e1ec84c64d7 100644 --- a/sc/source/core/data/scdpoutputimpl.hxx +++ b/sc/source/core/data/scdpoutputimpl.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright IBM Corporation 2009. * Copyright 2009 by Sun Microsystems, Inc. * @@ -34,49 +34,49 @@ #include "document.hxx" -#define SC_DP_FRAME_INNER_BOLD 20 -#define SC_DP_FRAME_OUTER_BOLD 40 +#define SC_DP_FRAME_INNER_BOLD 20 +#define SC_DP_FRAME_OUTER_BOLD 40 -#define SC_DP_FRAME_COLOR Color(0,0,0) //( 0x20, 0x40, 0x68 ) +#define SC_DP_FRAME_COLOR Color(0,0,0) //( 0x20, 0x40, 0x68 ) class OutputImpl { - ScDocument* mpDoc; - USHORT mnTab; + ScDocument* mpDoc; + USHORT mnTab; ::std::vector< bool > mbNeedLineCols; ::std::vector< SCCOL > mnCols; - + ::std::vector< bool > mbNeedLineRows; ::std::vector< SCROW > mnRows; - SCCOL mnTabStartCol; - SCROW mnTabStartRow; - SCCOL mnMemberStartCol; - SCROW mnMemberStartRow; - - SCCOL mnDataStartCol; - SCROW mnDataStartRow; - SCCOL mnTabEndCol; - SCROW mnTabEndRow; + SCCOL mnTabStartCol; + SCROW mnTabStartRow; + SCCOL mnMemberStartCol; + SCROW mnMemberStartRow; + + SCCOL mnDataStartCol; + SCROW mnDataStartRow; + SCCOL mnTabEndCol; + SCROW mnTabEndRow; public: - OutputImpl( ScDocument* pDoc, USHORT nTab, - SCCOL nTabStartCol, - SCROW nTabStartRow, - SCCOL nMemberStartCol, - SCROW nMemberStartRow, - SCCOL nDataStartCol, - SCROW nDataStartRow, - SCCOL nTabEndCol, + OutputImpl( ScDocument* pDoc, USHORT nTab, + SCCOL nTabStartCol, + SCROW nTabStartRow, + SCCOL nMemberStartCol, + SCROW nMemberStartRow, + SCCOL nDataStartCol, + SCROW nDataStartRow, + SCCOL nTabEndCol, SCROW nTabEndRow ); BOOL AddRow( SCROW nRow ); BOOL AddCol( SCCOL nCol ); - + void OutputDataArea(); void OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, BOOL bHori = FALSE ); - + }; -#endif +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index dd40e726fd9e..b24ba260879b 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.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 @@ -137,7 +137,7 @@ typename ScFlatSegmentsImpl<_ValueType, _ExtValueType>::ValueType ScFlatSegments } template<typename _ValueType, typename _ExtValueType> -typename ScFlatSegmentsImpl<_ValueType, _ExtValueType>::ExtValueType +typename ScFlatSegmentsImpl<_ValueType, _ExtValueType>::ExtValueType ScFlatSegmentsImpl<_ValueType, _ExtValueType>::getSumValue(SCCOLROW nPos1, SCCOLROW nPos2) { RangeData aData; @@ -209,7 +209,7 @@ SCCOLROW ScFlatSegmentsImpl<_ValueType, _ExtValueType>::findLastNotOf(ValueType { SCCOLROW nPos = numeric_limits<SCCOLROW>::max(); // position not found. typename fst_type::const_reverse_iterator itr = maSegments.rbegin(), itrEnd = maSegments.rend(); - // Note that when searching in reverse direction, we need to skip the first + // Note that when searching in reverse direction, we need to skip the first // node, since the right-most leaf node does not store a valid value. for (++itr; itr != itrEnd; ++itr) { @@ -301,7 +301,7 @@ bool ScFlatBoolRowSegments::ForwardIterator::getValue(SCROW nPos, bool& rVal) ScFlatBoolRowSegments::RangeData aData; if (!mrSegs.getRangeData(mnCurPos, aData)) return false; - + mbCurValue = aData.mbValue; mnLastPos = aData.mnRow2; } @@ -499,7 +499,7 @@ bool ScFlatUInt16RowSegments::ForwardIterator::getValue(SCROW nPos, sal_uInt16& ScFlatUInt16RowSegments::RangeData aData; if (!mrSegs.getRangeData(mnCurPos, aData)) return false; - + mnCurValue = aData.mnValue; mnLastPos = aData.mnRow2; } diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index d1df2bb04df6..c6d49409b04c 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -132,7 +132,7 @@ const ScSheetEvents& ScSheetEvents::operator=(const ScSheetEvents& rOther) if (rOther.mpScriptNames[nEvent]) mpScriptNames[nEvent] = new rtl::OUString(*rOther.mpScriptNames[nEvent]); else - mpScriptNames[nEvent] = NULL; + mpScriptNames[nEvent] = NULL; } return *this; } diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index 00f9bc6386a0..9d662659774c 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.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,8 +58,8 @@ ScSortParam::ScSortParam( const ScSortParam& r ) : { for (USHORT i=0; i<MAXSORT; i++) { - bDoSort[i] = r.bDoSort[i]; - nField[i] = r.nField[i]; + bDoSort[i] = r.bDoSort[i]; + nField[i] = r.nField[i]; bAscending[i] = r.bAscending[i]; } } @@ -74,14 +74,14 @@ void ScSortParam::Clear() nDestTab = 0; nUserIndex = 0; bHasHeader=bCaseSens=bUserDef=bNaturalSort = FALSE; - bByRow=bIncludePattern=bInplace = TRUE; + bByRow=bIncludePattern=bInplace = TRUE; aCollatorLocale = ::com::sun::star::lang::Locale(); aCollatorAlgorithm.Erase(); for (USHORT i=0; i<MAXSORT; i++) { - bDoSort[i] = FALSE; - nField[i] = 0; + bDoSort[i] = FALSE; + nField[i] = 0; bAscending[i] = TRUE; } } @@ -90,29 +90,29 @@ void ScSortParam::Clear() ScSortParam& ScSortParam::operator=( const ScSortParam& r ) { - nCol1 = r.nCol1; - nRow1 = r.nRow1; - nCol2 = r.nCol2; - nRow2 = r.nRow2; - bHasHeader = r.bHasHeader; - bByRow = r.bByRow; - bCaseSens = r.bCaseSens; - bNaturalSort = r.bNaturalSort; - bUserDef = r.bUserDef; - nUserIndex = r.nUserIndex; - bIncludePattern = r.bIncludePattern; - bInplace = r.bInplace; - nDestTab = r.nDestTab; - nDestCol = r.nDestCol; - nDestRow = r.nDestRow; - aCollatorLocale = r.aCollatorLocale; - aCollatorAlgorithm = r.aCollatorAlgorithm; + nCol1 = r.nCol1; + nRow1 = r.nRow1; + nCol2 = r.nCol2; + nRow2 = r.nRow2; + bHasHeader = r.bHasHeader; + bByRow = r.bByRow; + bCaseSens = r.bCaseSens; + bNaturalSort = r.bNaturalSort; + bUserDef = r.bUserDef; + nUserIndex = r.nUserIndex; + bIncludePattern = r.bIncludePattern; + bInplace = r.bInplace; + nDestTab = r.nDestTab; + nDestCol = r.nDestCol; + nDestRow = r.nDestRow; + aCollatorLocale = r.aCollatorLocale; + aCollatorAlgorithm = r.aCollatorAlgorithm; nCompatHeader = r.nCompatHeader; for (USHORT i=0; i<MAXSORT; i++) { - bDoSort[i] = r.bDoSort[i]; - nField[i] = r.nField[i]; + bDoSort[i] = r.bDoSort[i]; + nField[i] = r.nField[i]; bAscending[i] = r.bAscending[i]; } @@ -125,38 +125,38 @@ BOOL ScSortParam::operator==( const ScSortParam& rOther ) const { BOOL bEqual = FALSE; // Anzahl der Sorts gleich? - USHORT nLast = 0; + USHORT nLast = 0; USHORT nOtherLast = 0; while ( bDoSort[nLast++] && nLast < MAXSORT ) ; while ( rOther.bDoSort[nOtherLast++] && nOtherLast < MAXSORT ) ; nLast--; nOtherLast--; - if ( (nLast == nOtherLast) - && (nCol1 == rOther.nCol1) - && (nRow1 == rOther.nRow1) - && (nCol2 == rOther.nCol2) - && (nRow2 == rOther.nRow2) - && (bHasHeader == rOther.bHasHeader) - && (bByRow == rOther.bByRow) - && (bCaseSens == rOther.bCaseSens) - && (bNaturalSort == rOther.bNaturalSort) - && (bUserDef == rOther.bUserDef) - && (nUserIndex == rOther.nUserIndex) + if ( (nLast == nOtherLast) + && (nCol1 == rOther.nCol1) + && (nRow1 == rOther.nRow1) + && (nCol2 == rOther.nCol2) + && (nRow2 == rOther.nRow2) + && (bHasHeader == rOther.bHasHeader) + && (bByRow == rOther.bByRow) + && (bCaseSens == rOther.bCaseSens) + && (bNaturalSort == rOther.bNaturalSort) + && (bUserDef == rOther.bUserDef) + && (nUserIndex == rOther.nUserIndex) && (bIncludePattern == rOther.bIncludePattern) - && (bInplace == rOther.bInplace) - && (nDestTab == rOther.nDestTab) - && (nDestCol == rOther.nDestCol) - && (nDestRow == rOther.nDestRow) - && (aCollatorLocale.Language == rOther.aCollatorLocale.Language) - && (aCollatorLocale.Country == rOther.aCollatorLocale.Country) - && (aCollatorLocale.Variant == rOther.aCollatorLocale.Variant) - && (aCollatorAlgorithm == rOther.aCollatorAlgorithm) + && (bInplace == rOther.bInplace) + && (nDestTab == rOther.nDestTab) + && (nDestCol == rOther.nDestCol) + && (nDestRow == rOther.nDestRow) + && (aCollatorLocale.Language == rOther.aCollatorLocale.Language) + && (aCollatorLocale.Country == rOther.aCollatorLocale.Country) + && (aCollatorLocale.Variant == rOther.aCollatorLocale.Variant) + && (aCollatorAlgorithm == rOther.aCollatorAlgorithm) ) { bEqual = TRUE; for ( USHORT i=0; i<=nLast && bEqual; i++ ) { - bEqual = (nField[i] == rOther.nField[i]) && (bAscending[i] == rOther.bAscending[i]); + bEqual = (nField[i] == rOther.nField[i]) && (bAscending[i] == rOther.bAscending[i]); } } return bEqual; @@ -176,21 +176,21 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) USHORT nNewCount = 0; USHORT i; - // zuerst die Gruppen aus den Teilergebnissen + // zuerst die Gruppen aus den Teilergebnissen if (rSub.bDoSort) for (i=0; i<MAXSUBTOTAL; i++) if (rSub.bGroupActive[i]) { if (nNewCount < MAXSORT) { - bDoSort[nNewCount] = TRUE; - nField[nNewCount] = rSub.nField[i]; + bDoSort[nNewCount] = TRUE; + nField[nNewCount] = rSub.nField[i]; bAscending[nNewCount] = rSub.bAscending; ++nNewCount; } } - // dann dahinter die alten Einstellungen + // dann dahinter die alten Einstellungen for (i=0; i<MAXSORT; i++) if (rOld.bDoSort[i]) { @@ -199,22 +199,22 @@ ScSortParam::ScSortParam( const ScSubTotalParam& rSub, const ScSortParam& rOld ) for (USHORT j=0; j<nNewCount; j++) if ( nField[j] == nThisField ) bDouble = TRUE; - if (!bDouble) // ein Feld nicht zweimal eintragen + if (!bDouble) // ein Feld nicht zweimal eintragen { if (nNewCount < MAXSORT) { - bDoSort[nNewCount] = TRUE; - nField[nNewCount] = nThisField; + bDoSort[nNewCount] = TRUE; + nField[nNewCount] = nThisField; bAscending[nNewCount] = rOld.bAscending[i]; ++nNewCount; } } } - for (i=nNewCount; i<MAXSORT; i++) // Rest loeschen + for (i=nNewCount; i<MAXSORT; i++) // Rest loeschen { - bDoSort[i] = FALSE; - nField[i] = 0; + bDoSort[i] = FALSE; + nField[i] = 0; bAscending[i] = TRUE; } } @@ -235,8 +235,8 @@ ScSortParam::ScSortParam( const ScQueryParam& rParam, SCCOL nCol ) : bAscending[0] = TRUE; for (USHORT i=1; i<MAXSORT; i++) { - bDoSort[i] = FALSE; - nField[i] = 0; + bDoSort[i] = FALSE; + nField[i] = 0; bAscending[i] = TRUE; } } diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index c391f09b1380..b6f609389645 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.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 @@ //======================================================================== ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP, - ScDocument* pDocument ) + ScDocument* pDocument ) : SfxStyleSheetPool( rPoolP ), pActualStyleSheet( NULL ), pDoc( pDocument ), @@ -97,11 +97,11 @@ void ScStyleSheetPool::SetDocument( ScDocument* pDocument ) SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName, SfxStyleFamily eFam, USHORT mask, USHORT nPos ) { - // When updating styles from a template, Office 5.1 sometimes created - // files with multiple default styles. - // Create new styles in that case: + // When updating styles from a template, Office 5.1 sometimes created + // files with multiple default styles. + // Create new styles in that case: - //! only when loading? + //! only when loading? if ( rName.EqualsAscii(STRING_STANDARD) && Find( rName, eFam ) != NULL ) { @@ -122,8 +122,8 @@ SfxStyleSheetBase& ScStyleSheetPool::Make( const String& rName, //------------------------------------------------------------------------ SfxStyleSheetBase* __EXPORT ScStyleSheetPool::Create( - const String& rName, - SfxStyleFamily eFamily, + const String& rName, + SfxStyleFamily eFamily, USHORT nMaskP ) { ScStyleSheet* pSheet = new ScStyleSheet( rName, *this, eFamily, nMaskP ); @@ -160,7 +160,7 @@ void __EXPORT ScStyleSheetPool::Remove( SfxStyleSheetBase* pStyle ) void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, const String& rName, SfxStyleFamily eFamily ) { - // this ist Dest-Pool + // this ist Dest-Pool SfxStyleSheetBase* pStyleSheet = pSrcPool->Find( rName, eFamily ); if (pStyleSheet) @@ -175,7 +175,7 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, const SfxPoolItem* pItem; if ( eFamily == SFX_STYLE_FAMILY_PAGE ) { - // Set-Items + // Set-Items if ( rSourceSet.GetItemState( ATTR_PAGE_HEADERSET, FALSE, &pItem ) == SFX_ITEM_SET ) { @@ -210,23 +210,23 @@ void ScStyleSheetPool::CopyStyleFrom( ScStyleSheetPool* pSrcPool, //------------------------------------------------------------------------ // -// Standard-Vorlagen +// Standard-Vorlagen // //------------------------------------------------------------------------ -#define SCSTR(id) ScGlobal::GetRscString(id) +#define SCSTR(id) ScGlobal::GetRscString(id) void ScStyleSheetPool::CopyStdStylesFrom( ScStyleSheetPool* pSrcPool ) { - // Default-Styles kopieren - - CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA ); - CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA ); - CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT1), SFX_STYLE_FAMILY_PARA ); - CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_HEADLINE), SFX_STYLE_FAMILY_PARA ); - CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_HEADLINE1), SFX_STYLE_FAMILY_PARA ); - CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PAGE ); - CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT), SFX_STYLE_FAMILY_PAGE ); + // Default-Styles kopieren + + CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PARA ); + CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA ); + CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_RESULT1), SFX_STYLE_FAMILY_PARA ); + CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_HEADLINE), SFX_STYLE_FAMILY_PARA ); + CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_HEADLINE1), SFX_STYLE_FAMILY_PARA ); + CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_STANDARD), SFX_STYLE_FAMILY_PAGE ); + CopyStyleFrom( pSrcPool, SCSTR(STR_STYLENAME_REPORT), SFX_STYLE_FAMILY_PAGE ); } //------------------------------------------------------------------------ @@ -248,27 +248,27 @@ void lcl_CheckFont( SfxItemSet& rSet, LanguageType eLang, USHORT nFontType, USHO void ScStyleSheetPool::CreateStandardStyles() { - // neue Eintraege auch bei CopyStdStylesFrom eintragen - - Color aColBlack ( COL_BLACK ); - Color aColGrey ( COL_LIGHTGRAY ); - String aStr; - xub_StrLen nStrLen; - String aHelpFile;//XXX JN welcher Text??? - //ULONG nNumFmt = 0L; - SfxItemSet* pSet = NULL; - SfxItemSet* pHFSet = NULL; - SvxSetItem* pHFSetItem = NULL; - ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE ); + // neue Eintraege auch bei CopyStdStylesFrom eintragen + + Color aColBlack ( COL_BLACK ); + Color aColGrey ( COL_LIGHTGRAY ); + String aStr; + xub_StrLen nStrLen; + String aHelpFile;//XXX JN welcher Text??? + //ULONG nNumFmt = 0L; + SfxItemSet* pSet = NULL; + SfxItemSet* pHFSet = NULL; + SvxSetItem* pHFSetItem = NULL; + ScEditEngineDefaulter* pEdEngine = new ScEditEngineDefaulter( EditEngine::CreatePool(), TRUE ); pEdEngine->SetUpdateMode( FALSE ); - EditTextObject* pEmptyTxtObj = pEdEngine->CreateTextObject(); - EditTextObject* pTxtObj = NULL; - ScPageHFItem* pHeaderItem = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT ); - ScPageHFItem* pFooterItem = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT ); - ScStyleSheet* pSheet = NULL; - SvxBorderLine aBorderLine ( &aColBlack, DEF_LINE_WIDTH_2 ); - SvxBoxItem aBoxItem ( ATTR_BORDER ); - SvxBoxInfoItem aBoxInfoItem ( ATTR_BORDER_INNER ); + EditTextObject* pEmptyTxtObj = pEdEngine->CreateTextObject(); + EditTextObject* pTxtObj = NULL; + ScPageHFItem* pHeaderItem = new ScPageHFItem( ATTR_PAGE_HEADERRIGHT ); + ScPageHFItem* pFooterItem = new ScPageHFItem( ATTR_PAGE_FOOTERRIGHT ); + ScStyleSheet* pSheet = NULL; + SvxBorderLine aBorderLine ( &aColBlack, DEF_LINE_WIDTH_2 ); + SvxBoxItem aBoxItem ( ATTR_BORDER ); + SvxBoxInfoItem aBoxInfoItem ( ATTR_BORDER_INNER ); String aStrStandard = ScGlobal::GetRscString(STR_STYLENAME_STANDARD); @@ -282,18 +282,18 @@ void ScStyleSheetPool::CreateStandardStyles() pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_STD ); - // if default fonts for the document's languages are different from the pool default, - // put them into the default style - // (not as pool defaults, because pool defaults can't be changed by the user) - // the document languages must be set before creating the default styles! + // if default fonts for the document's languages are different from the pool default, + // put them into the default style + // (not as pool defaults, because pool defaults can't be changed by the user) + // the document languages must be set before creating the default styles! pSet = &pSheet->GetItemSet(); LanguageType eLatin, eCjk, eCtl; pDoc->GetLanguage( eLatin, eCjk, eCtl ); - // #108374# / #107782#: If the UI language is Korean, the default Latin font has to - // be queried for Korean, too (the Latin language from the document can't be Korean). - // This is the same logic as in SwDocShell::InitNew. + // #108374# / #107782#: If the UI language is Korean, the default Latin font has to + // be queried for Korean, too (the Latin language from the document can't be Korean). + // This is the same logic as in SwDocShell::InitNew. LanguageType eUiLanguage = Application::GetSettings().GetUILanguage(); switch( eUiLanguage ) { @@ -340,7 +340,7 @@ void ScStyleSheetPool::CreateStandardStyles() // will now be done in GetItemSet(); // pSet = &pSheet->GetItemSet(); // nNumFmt = pDoc->GetFormatTable()->GetStandardFormat( NUMBERFORMAT_CURRENCY, - // ScGlobal::eLnge ); + // ScGlobal::eLnge ); // pSet->Put( SfxUInt32Item( ATTR_VALUE_FORMAT, nNumFmt ) ); //---------------- diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index c77fc710b325..72e7cee320f6 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.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,7 +52,7 @@ #include "attrib.hxx" -#include <vcl/svapp.hxx> // GetSettings() +#include <vcl/svapp.hxx> // GetSettings() #include "globstr.hrc" #include "sc.hrc" @@ -60,14 +60,14 @@ TYPEINIT1(ScStyleSheet, SfxStyleSheet); -#define TWO_CM 1134 -#define HFDIST_CM 142 +#define TWO_CM 1134 +#define HFDIST_CM 142 //======================================================================== -ScStyleSheet::ScStyleSheet( const String& rName, +ScStyleSheet::ScStyleSheet( const String& rName, ScStyleSheetPool& rPoolP, - SfxStyleFamily eFamily, + SfxStyleFamily eFamily, USHORT nMaskP ) : SfxStyleSheet ( rName, rPoolP, eFamily, nMaskP ) @@ -78,7 +78,7 @@ ScStyleSheet::ScStyleSheet( const String& rName, //------------------------------------------------------------------------ ScStyleSheet::ScStyleSheet( const ScStyleSheet& rStyle ) - : SfxStyleSheet ( rStyle ) + : SfxStyleSheet ( rStyle ) , eUsage( UNKNOWN ) { } @@ -104,8 +104,8 @@ BOOL __EXPORT ScStyleSheet::HasParentSupport () const switch ( GetFamily() ) { - case SFX_STYLE_FAMILY_PARA: bHasParentSupport = TRUE; break; - case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = FALSE; break; + case SFX_STYLE_FAMILY_PARA: bHasParentSupport = TRUE; break; + case SFX_STYLE_FAMILY_PAGE: bHasParentSupport = FALSE; break; default: { // added to avoid warnings @@ -166,40 +166,40 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet() ATTR_USERDEF, ATTR_USERDEF, 0 ); - // Wenn gerade geladen wird, wird auch der Set hinterher aus der Datei - // gefuellt, es brauchen also keine Defaults gesetzt zu werden. - // GetPrinter wuerde dann auch einen neuen Printer anlegen, weil der - // gespeicherte Printer noch nicht geladen ist! + // Wenn gerade geladen wird, wird auch der Set hinterher aus der Datei + // gefuellt, es brauchen also keine Defaults gesetzt zu werden. + // GetPrinter wuerde dann auch einen neuen Printer anlegen, weil der + // gespeicherte Printer noch nicht geladen ist! ScDocument* pDoc = ((ScStyleSheetPool&)GetPool()).GetDocument(); if ( pDoc ) { // Setzen von sinnvollen Default-Werten: - SvxPageItem aPageItem( ATTR_PAGE ); - SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetDefaultPaperSize() ); + SvxPageItem aPageItem( ATTR_PAGE ); + SvxSizeItem aPaperSizeItem( ATTR_PAGE_SIZE, SvxPaperInfo::GetDefaultPaperSize() ); - SvxSetItem aHFSetItem( + SvxSetItem aHFSetItem( (const SvxSetItem&) rItemPool.GetDefaultItem(ATTR_PAGE_HEADERSET) ); - SfxItemSet& rHFSet = aHFSetItem.GetItemSet(); - SvxSizeItem aHFSizeItem( // 0,5 cm + Abstand + SfxItemSet& rHFSet = aHFSetItem.GetItemSet(); + SvxSizeItem aHFSizeItem( // 0,5 cm + Abstand ATTR_PAGE_SIZE, Size( 0, (long)( 500 / HMM_PER_TWIPS ) + HFDIST_CM ) ); - SvxULSpaceItem aHFDistItem ( HFDIST_CM,// nUp + SvxULSpaceItem aHFDistItem ( HFDIST_CM,// nUp HFDIST_CM,// nLow ATTR_ULSPACE ); - SvxLRSpaceItem aLRSpaceItem( TWO_CM, // nLeft - TWO_CM, // nRight - TWO_CM, // nTLeft - 0, // nFirstLineOffset + SvxLRSpaceItem aLRSpaceItem( TWO_CM, // nLeft + TWO_CM, // nRight + TWO_CM, // nTLeft + 0, // nFirstLineOffset ATTR_LRSPACE ); - SvxULSpaceItem aULSpaceItem( TWO_CM, // nUp - TWO_CM, // nLow + SvxULSpaceItem aULSpaceItem( TWO_CM, // nUp + TWO_CM, // nLow ATTR_ULSPACE ); - SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER ); + SvxBoxInfoItem aBoxInfoItem( ATTR_BORDER_INNER ); aBoxInfoItem.SetTable( FALSE ); aBoxInfoItem.SetDist( TRUE ); @@ -218,10 +218,10 @@ SfxItemSet& __EXPORT ScStyleSheet::GetItemSet() pSet->Put( aBoxInfoItem ); // PoolDefault wg. Formatvorlagen // nicht ueberschreiben! - // Writing direction: not as pool default because the default for cells - // must remain FRMDIR_ENVIRONMENT, and each page style's setting is - // supposed to be saved in the file format. - // The page default depends on the system language. + // Writing direction: not as pool default because the default for cells + // must remain FRMDIR_ENVIRONMENT, and each page style's setting is + // supposed to be saved in the file format. + // The page default depends on the system language. SvxFrameDirection eDirection = ScGlobal::IsSystemRTL() ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP; pSet->Put( SvxFrameDirectionItem( eDirection, ATTR_WRITINGDIR ), ATTR_WRITINGDIR ); @@ -293,8 +293,8 @@ void __EXPORT ScStyleSheet::Notify( SfxBroadcaster&, const SfxHint& rHint ) //------------------------------------------------------------------------ -// #66123# schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern, -// obwohl der fuer den Benutzer sichtbare Name uebersetzt ist: +// #66123# schmutzige Tricks, um die Standard-Vorlage immer als "Standard" zu speichern, +// obwohl der fuer den Benutzer sichtbare Name uebersetzt ist: const String& ScStyleSheet::GetName() const { @@ -326,13 +326,13 @@ const String& ScStyleSheet::GetFollow() const return rBase; } -// Verhindern, dass ein Style "Standard" angelegt wird, wenn das nicht der -// Standard-Name ist, weil sonst beim Speichern zwei Styles denselben Namen haetten -// (Beim Laden wird der Style direkt per Make mit dem Namen erzeugt, so dass diese -// Abfrage dann nicht gilt) -//! Wenn irgendwann aus dem Laden SetName aufgerufen wird, muss fuer das Laden ein -//! Flag gesetzt und abgefragt werden. -//! Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt. +// Verhindern, dass ein Style "Standard" angelegt wird, wenn das nicht der +// Standard-Name ist, weil sonst beim Speichern zwei Styles denselben Namen haetten +// (Beim Laden wird der Style direkt per Make mit dem Namen erzeugt, so dass diese +// Abfrage dann nicht gilt) +//! Wenn irgendwann aus dem Laden SetName aufgerufen wird, muss fuer das Laden ein +//! Flag gesetzt und abgefragt werden. +//! Die ganze Abfrage muss raus, wenn fuer eine neue Datei-Version die Namens-Umsetzung wegfaellt. BOOL ScStyleSheet::SetName( const String& rNew ) { diff --git a/sc/source/core/data/tabbgcolor.cxx b/sc/source/core/data/tabbgcolor.cxx index 5e8479d4bdd6..a6ecb1a8a71a 100644 --- a/sc/source/core/data/tabbgcolor.cxx +++ b/sc/source/core/data/tabbgcolor.cxx @@ -39,25 +39,25 @@ #include "tabbgcolor.hxx" bool ScUndoTabColorInfo::IsDefaultOldTabBgColor() const -{ - return maOldTabBgColor == Color(COL_AUTO); +{ + return maOldTabBgColor == Color(COL_AUTO); } -bool ScUndoTabColorInfo::IsDefaultNewTabBgColor() const -{ - return maOldTabBgColor == Color(COL_AUTO); +bool ScUndoTabColorInfo::IsDefaultNewTabBgColor() const +{ + return maOldTabBgColor == Color(COL_AUTO); } ScUndoTabColorInfo::ScUndoTabColorInfo(SCTAB nTab) : - mnTabId(nTab), - maOldTabBgColor(COL_AUTO), + mnTabId(nTab), + maOldTabBgColor(COL_AUTO), maNewTabBgColor(COL_AUTO) { } ScUndoTabColorInfo::ScUndoTabColorInfo(const ScUndoTabColorInfo& r) : - mnTabId(r.mnTabId), - maOldTabBgColor(r.maOldTabBgColor), + mnTabId(r.mnTabId), + maOldTabBgColor(r.maOldTabBgColor), maNewTabBgColor(r.maNewTabBgColor) { } diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 007e873902ce..68904d2820ef 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -48,7 +48,7 @@ #include "refupdat.hxx" #include "markdata.hxx" #include "progress.hxx" -#include "hints.hxx" // fuer Paint-Broadcast +#include "hints.hxx" // fuer Paint-Broadcast #include "prnsave.hxx" #include "tabprotection.hxx" #include "sheetevents.hxx" @@ -88,14 +88,14 @@ void GetOptimalHeightsInColumn( { SCSIZE nCount = static_cast<SCSIZE>(nEndRow-nStartRow+1); - // zuerst einmal ueber den ganzen Bereich - // (mit der letzten Spalte in der Hoffnung, dass die am ehesten noch auf - // Standard formatiert ist) + // zuerst einmal ueber den ganzen Bereich + // (mit der letzten Spalte in der Hoffnung, dass die am ehesten noch auf + // Standard formatiert ist) pCol[MAXCOL].GetOptimalHeight( nStartRow, nEndRow, &aHeights[0], pDev, nPPTX, nPPTY, rZoomX, rZoomY, bForce, 0, 0 ); - // daraus Standardhoehe suchen, die im unteren Bereich gilt + // daraus Standardhoehe suchen, die im unteren Bereich gilt USHORT nMinHeight = aHeights[nCount-1]; SCSIZE nPos = nCount-1; @@ -104,7 +104,7 @@ void GetOptimalHeightsInColumn( SCROW nMinStart = nStartRow + nPos; ULONG nWeightedCount = 0; - for (SCCOL nCol=0; nCol<MAXCOL; nCol++) // MAXCOL schon oben + for (SCCOL nCol=0; nCol<MAXCOL; nCol++) // MAXCOL schon oben { pCol[nCol].GetOptimalHeight( nStartRow, nEndRow, &aHeights[0], pDev, nPPTX, nPPTY, rZoomX, rZoomY, bForce, @@ -113,7 +113,7 @@ void GetOptimalHeightsInColumn( if (pProgress) { ULONG nWeight = pCol[nCol].GetWeightedCount(); - if (nWeight) // nochmal denselben Status muss auch nicht sein + if (nWeight) // nochmal denselben Status muss auch nicht sein { nWeightedCount += nWeight; pProgress->SetState( nWeightedCount + nProgressStart ); @@ -293,8 +293,8 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName, if ( pDocument->IsDocVisible() ) { - // when a sheet is added to a visible document, - // initialize its RTL flag from the system locale + // when a sheet is added to a visible document, + // initialize its RTL flag from the system locale bLayoutRTL = ScGlobal::IsSystemRTL(); } @@ -304,7 +304,7 @@ ScTable::ScTable( ScDocument* pDoc, SCTAB nNewTab, const String& rNewName, if ( pDrawLayer->ScAddPage( nTab ) ) // FALSE (not inserted) during Undo { pDrawLayer->ScRenamePage( nTab, aName ); - ULONG nx = (ULONG) ((double) (MAXCOL+1) * STD_COL_WIDTH * HMM_PER_TWIPS ); + ULONG nx = (ULONG) ((double) (MAXCOL+1) * STD_COL_WIDTH * HMM_PER_TWIPS ); ULONG ny = (ULONG) ((double) (MAXROW+1) * ScGlobal::nStdRowHeight * HMM_PER_TWIPS ); pDrawLayer->SetPageSize( static_cast<sal_uInt16>(nTab), Size( nx, ny ), false ); } @@ -318,9 +318,9 @@ ScTable::~ScTable() { if (!pDocument->IsInDtorClear()) { - // nicht im dtor die Pages in der falschen Reihenfolge loeschen - // (nTab stimmt dann als Page-Number nicht!) - // In ScDocument::Clear wird hinterher per Clear am Draw Layer alles geloescht. + // nicht im dtor die Pages in der falschen Reihenfolge loeschen + // (nTab stimmt dann als Page-Number nicht!) + // In ScDocument::Clear wird hinterher per Clear am Draw Layer alles geloescht. ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); if (pDrawLayer) @@ -415,11 +415,11 @@ void ScTable::SetLink( BYTE nMode, const String& rTab, ULONG nRefreshDelay ) { nLinkMode = nMode; - aLinkDoc = rDoc; // Datei - aLinkFlt = rFlt; // Filter - aLinkOpt = rOpt; // Filter-Optionen - aLinkTab = rTab; // Tabellenname in Quelldatei - nLinkRefreshDelay = nRefreshDelay; // refresh delay in seconds, 0==off + aLinkDoc = rDoc; // Datei + aLinkFlt = rFlt; // Filter + aLinkOpt = rOpt; // Filter-Optionen + aLinkTab = rTab; // Tabellenname in Quelldatei + nLinkRefreshDelay = nRefreshDelay; // refresh delay in seconds, 0==off if (IsStreamValid()) SetStreamValid(FALSE); @@ -442,7 +442,7 @@ long ScTable::GetNeededSize( SCCOL nCol, SCROW nRow, BOOL bWidth, BOOL bTotalSize ) { ScNeededSizeOptions aOptions; - aOptions.bSkipMerged = FALSE; // zusammengefasste mitzaehlen + aOptions.bSkipMerged = FALSE; // zusammengefasste mitzaehlen aOptions.bTotalSize = bTotalSize; return aCol[nCol].GetNeededSize @@ -517,7 +517,7 @@ BOOL ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const SCCOL nMaxX = 0; SCROW nMaxY = 0; for (SCCOL i=0; i<=MAXCOL; i++) - if (!aCol[i].IsEmptyVisData(TRUE)) // TRUE = Notizen zaehlen auch + if (!aCol[i].IsEmptyVisData(TRUE)) // TRUE = Notizen zaehlen auch { bFound = TRUE; nMaxX = i; @@ -533,7 +533,7 @@ BOOL ScTable::GetCellArea( SCCOL& rEndCol, SCROW& rEndRow ) const BOOL ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const { - BOOL bRet = TRUE; //! merken? + BOOL bRet = TRUE; //! merken? if (!bTableAreaValid) { bRet = GetPrintArea( ((ScTable*)this)->nTableAreaX, @@ -545,7 +545,7 @@ BOOL ScTable::GetTableArea( SCCOL& rEndCol, SCROW& rEndRow ) const return bRet; } -/* vorher: +/* vorher: BOOL bFound = FALSE; SCCOL nMaxX = 0; @@ -574,7 +574,7 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const SCROW nMaxY = 0; SCCOL i; - for (i=0; i<=MAXCOL; i++) // Daten testen + for (i=0; i<=MAXCOL; i++) // Daten testen if (!aCol[i].IsEmptyVisData(bNotes)) { bFound = TRUE; @@ -587,7 +587,7 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const SCCOL nMaxDataX = nMaxX; - for (i=0; i<=MAXCOL; i++) // Attribute testen + for (i=0; i<=MAXCOL; i++) // Attribute testen { SCROW nLastRow; if (aCol[i].GetLastVisibleAttr( nLastRow )) @@ -599,7 +599,7 @@ BOOL ScTable::GetPrintArea( SCCOL& rEndCol, SCROW& rEndRow, BOOL bNotes ) const } } - if (nMaxX == MAXCOL) // Attribute rechts weglassen + if (nMaxX == MAXCOL) // Attribute rechts weglassen { --nMaxX; while ( nMaxX>0 && aCol[nMaxX].IsVisibleAttrEqual(aCol[nMaxX+1]) ) @@ -645,7 +645,7 @@ BOOL ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, SCCOL nMaxX = 0; SCCOL i; - for (i=0; i<=MAXCOL; i++) // Attribute testen + for (i=0; i<=MAXCOL; i++) // Attribute testen { if (aCol[i].HasVisibleAttrIn( nStartRow, nEndRow )) { @@ -654,16 +654,16 @@ BOOL ScTable::GetPrintAreaHor( SCROW nStartRow, SCROW nEndRow, } } - if (nMaxX == MAXCOL) // Attribute rechts weglassen + if (nMaxX == MAXCOL) // Attribute rechts weglassen { --nMaxX; while ( nMaxX>0 && aCol[nMaxX].IsVisibleAttrEqual(aCol[nMaxX+1], nStartRow, nEndRow) ) --nMaxX; } - for (i=0; i<=MAXCOL; i++) // Daten testen + for (i=0; i<=MAXCOL; i++) // Daten testen { - if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow )) //! bNotes ?????? + if (!aCol[i].IsEmptyBlock( nStartRow, nEndRow )) //! bNotes ?????? { bFound = TRUE; if (i>nMaxX) @@ -682,7 +682,7 @@ BOOL ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, SCROW nMaxY = 0; SCCOL i; - for (i=nStartCol; i<=nEndCol; i++) // Attribute testen + for (i=nStartCol; i<=nEndCol; i++) // Attribute testen { SCROW nLastRow; if (aCol[i].GetLastVisibleAttr( nLastRow )) @@ -693,7 +693,7 @@ BOOL ScTable::GetPrintAreaVer( SCCOL nStartCol, SCCOL nEndCol, } } - for (i=nStartCol; i<=nEndCol; i++) // Daten testen + for (i=nStartCol; i<=nEndCol; i++) // Daten testen if (!aCol[i].IsEmptyVisData(bNotes)) { bFound = TRUE; @@ -713,7 +713,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const SCROW nMinY = MAXROW; SCCOL i; - for (i=0; i<=MAXCOL; i++) // Attribute testen + for (i=0; i<=MAXCOL; i++) // Attribute testen { SCROW nFirstRow; if (aCol[i].GetFirstVisibleAttr( nFirstRow )) @@ -726,9 +726,9 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const } } - if (nMinX == 0) // Attribute links weglassen + if (nMinX == 0) // Attribute links weglassen { - if ( aCol[0].IsVisibleAttrEqual(aCol[1]) ) // keine einzelnen + if ( aCol[0].IsVisibleAttrEqual(aCol[1]) ) // keine einzelnen { ++nMinX; while ( nMinX<MAXCOL && aCol[nMinX].IsVisibleAttrEqual(aCol[nMinX-1]) ) @@ -737,7 +737,7 @@ BOOL ScTable::GetDataStart( SCCOL& rStartCol, SCROW& rStartRow ) const } BOOL bDatFound = FALSE; - for (i=0; i<=MAXCOL; i++) // Daten testen + for (i=0; i<=MAXCOL; i++) // Daten testen if (!aCol[i].IsEmptyVisData(TRUE)) { if (!bDatFound && i<nMinX) @@ -855,28 +855,18 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S } -bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rStartRow, +bool ScTable::ShrinkToUsedDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const { - o_bShrunk = false; - - PutInOrder( rStartCol, rEndCol); - PutInOrder( rStartRow, rEndRow); - if (rStartCol < 0) - rStartCol = 0, o_bShrunk = true; - if (rStartRow < 0) - rStartRow = 0, o_bShrunk = true; - if (rEndCol > MAXCOL) - rEndCol = MAXCOL, o_bShrunk = true; - if (rEndRow > MAXROW) - rEndRow = MAXROW, o_bShrunk = true; - + bool bRet = false; bool bChanged; + do { bChanged = false; - while (rStartCol < rEndCol) + bool bCont = true; + while (rEndCol > 0 && bCont && rStartCol < rEndCol) { if (aCol[rEndCol].IsEmptyBlock( rStartRow, rEndRow)) { @@ -884,10 +874,11 @@ bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rS bChanged = true; } else - break; // while + bCont = false; } - while (rStartCol < rEndCol) + bCont = true; + while (rStartCol < MAXCOL && bCont && rStartCol < rEndCol) { if (aCol[rStartCol].IsEmptyBlock( rStartRow, rEndRow)) { @@ -895,12 +886,12 @@ bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rS bChanged = true; } else - break; // while + bCont = false; } if (!bColumnsOnly) { - if (rStartRow < rEndRow) + if (rStartRow < MAXROW && rStartRow < rEndRow) { bool bFound = false; for (SCCOL i=rStartCol; i<=rEndCol && !bFound; i++) @@ -913,7 +904,7 @@ bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rS } } - if (rStartRow < rEndRow) + if (rEndRow > 0 && rStartRow < rEndRow) { bool bFound = false; for (SCCOL i=rStartCol; i<=rEndCol && !bFound; i++) @@ -928,12 +919,9 @@ bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rS } if (bChanged) - o_bShrunk = true; + bRet = true; } while( bChanged ); - - return rStartCol != rEndCol || (bColumnsOnly ? - !aCol[rStartCol].IsEmptyBlock( rStartRow, rEndRow) : - (rStartRow != rEndRow || aCol[rStartCol].HasDataAt( rStartRow))); + return bRet; } @@ -1051,11 +1039,11 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, GetAttr(nCol,nRow,ATTR_PROTECTION))->GetProtection()) return FALSE; - if (bMarked || bUnprotected) //! auch sonst ??? + if (bMarked || bUnprotected) //! auch sonst ??? { - // #53697# ausgeblendete muessen uebersprungen werden, weil der Cursor sonst - // auf der naechsten Zelle landet, auch wenn die geschuetzt/nicht markiert ist. - //! per Extra-Parameter steuern, nur fuer Cursor-Bewegung ??? + // #53697# ausgeblendete muessen uebersprungen werden, weil der Cursor sonst + // auf der naechsten Zelle landet, auch wenn die geschuetzt/nicht markiert ist. + //! per Extra-Parameter steuern, nur fuer Cursor-Bewegung ??? if (RowHidden(nRow)) return FALSE; @@ -1070,7 +1058,7 @@ BOOL ScTable::ValidNextPos( SCCOL nCol, SCROW nRow, const ScMarkData& rMark, void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark ) { - if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt? + if (bUnprotected && !IsProtected()) // Tabelle ueberhaupt geschuetzt? bUnprotected = FALSE; USHORT nWrap = 0; @@ -1090,7 +1078,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, while ( VALIDROW(nRow) && (RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) ) { - // #53697# ausgeblendete ueberspringen (s.o.) + // #53697# ausgeblendete ueberspringen (s.o.) nRow += nMovY; nRow = rMark.GetNextMarked( nCol, nRow, bUp ); } @@ -1099,7 +1087,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, { nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) ); while ( VALIDCOL(nCol) && ColHidden(nCol) ) - nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) ); // #53697# skip hidden rows (see above) + nCol = sal::static_int_cast<SCsCOL>( nCol + static_cast<SCsCOL>(nMovY) ); // #53697# skip hidden rows (see above) if (nCol < 0) { nCol = MAXCOL; @@ -1120,7 +1108,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, while ( VALIDROW(nRow) && (RowHidden(nRow) || pDocument->HasAttrib(nCol, nRow, nTab, nCol, nRow, nTab, HASATTR_OVERLAPPED)) ) { - // #53697# ausgeblendete ueberspringen (s.o.) + // #53697# ausgeblendete ueberspringen (s.o.) nRow += nMovY; nRow = rMark.GetNextMarked( nCol, nRow, bUp ); } @@ -1150,7 +1138,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, SCsROW* pNextRows = new SCsROW[MAXCOL+1]; SCCOL i; - if ( nMovX > 0 ) // vorwaerts + if ( nMovX > 0 ) // vorwaerts { for (i=0; i<=MAXCOL; i++) pNextRows[i] = (i<nCol) ? (nRow+1) : nRow; @@ -1165,7 +1153,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, SCsROW nMinRow = MAXROW+1; for (i=0; i<=MAXCOL; i++) - if (pNextRows[i] < nMinRow) // bei gleichen den linken + if (pNextRows[i] < nMinRow) // bei gleichen den linken { nMinRow = pNextRows[i]; nCol = i; @@ -1174,16 +1162,16 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, if ( nRow > MAXROW ) { - if (++nWrap >= 2) break; // ungueltigen Wert behalten + if (++nWrap >= 2) break; // ungueltigen Wert behalten nCol = 0; nRow = 0; for (i=0; i<=MAXCOL; i++) - pNextRows[i] = 0; // alles ganz von vorne + pNextRows[i] = 0; // alles ganz von vorne } } while ( !ValidNextPos(nCol, nRow, rMark, bMarked, bUnprotected) ); } - else // rueckwaerts + else // rueckwaerts { for (i=0; i<=MAXCOL; i++) pNextRows[i] = (i>nCol) ? (nRow-1) : nRow; @@ -1198,7 +1186,7 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, SCsROW nMaxRow = -1; for (i=0; i<=MAXCOL; i++) - if (pNextRows[i] >= nMaxRow) // bei gleichen den rechten + if (pNextRows[i] >= nMaxRow) // bei gleichen den rechten { nMaxRow = pNextRows[i]; nCol = i; @@ -1207,11 +1195,11 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, if ( nRow < 0 ) { - if (++nWrap >= 2) break; // ungueltigen Wert behalten + if (++nWrap >= 2) break; // ungueltigen Wert behalten nCol = MAXCOL; nRow = MAXROW; for (i=0; i<=MAXCOL; i++) - pNextRows[i] = MAXROW; // alles ganz von vorne + pNextRows[i] = MAXROW; // alles ganz von vorne } } while ( !ValidNextPos(nCol, nRow, rMark, bMarked, bUnprotected) ); @@ -1221,9 +1209,9 @@ void ScTable::GetNextPos( SCCOL& rCol, SCROW& rRow, SCsCOL nMovX, SCsROW nMovY, } } - // ungueltige Werte kommen z.b. bei Tab heraus, - // wenn nicht markiert und nicht geschuetzt ist (linker / rechter Rand), - // dann Werte unveraendert lassen + // ungueltige Werte kommen z.b. bei Tab heraus, + // wenn nicht markiert und nicht geschuetzt ist (linker / rechter Rand), + // dann Werte unveraendert lassen if (VALIDCOLROW(nCol,nRow)) { @@ -1239,7 +1227,7 @@ BOOL ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa if ( !pMarkArray ) return FALSE; - ++rRow; // naechste Zelle ist gesucht + ++rRow; // naechste Zelle ist gesucht while ( rCol <= MAXCOL ) { @@ -1258,33 +1246,33 @@ BOOL ScTable::GetNextMarkedCell( SCCOL& rCol, SCROW& rRow, const ScMarkData& rMa if ( pCell && pCell->GetCellType() != CELLTYPE_NOTE ) { rRow = nCellRow; - return TRUE; // Zelle gefunden + return TRUE; // Zelle gefunden } } - rRow = nEnd + 1; // naechsten markierten Bereich suchen + rRow = nEnd + 1; // naechsten markierten Bereich suchen } else - rRow = MAXROW + 1; // Ende der Spalte + rRow = MAXROW + 1; // Ende der Spalte } rRow = 0; - ++rCol; // naechste Spalte testen + ++rCol; // naechste Spalte testen } - return FALSE; // alle Spalten durch + return FALSE; // alle Spalten durch } void ScTable::UpdateDrawRef( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, SCsCOL nDx, SCsROW nDy, SCsTAB nDz, bool bUpdateNoteCaptionPos ) { - if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // only within the table + if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // only within the table { InitializeNoteCaptions(); ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); if ( eUpdateRefMode != URM_COPY && pDrawLayer ) { if ( eUpdateRefMode == URM_MOVE ) - { // source range + { // source range nCol1 = sal::static_int_cast<SCCOL>( nCol1 - nDx ); nRow1 = sal::static_int_cast<SCROW>( nRow1 - nDy ); nCol2 = sal::static_int_cast<SCCOL>( nCol2 - nDx ); @@ -1319,7 +1307,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW if ( bIncludeDraw ) UpdateDrawRef( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, nDy, nDz, bUpdateNoteCaptionPos ); - if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // print ranges: only within the table + if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // print ranges: only within the table { SCTAB nSTab = nTab; SCTAB nETab = nTab; @@ -1362,7 +1350,7 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW { *pRepeatColRange = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 ); bRecalcPages = TRUE; - nRepeatStartX = nSCol; // fuer UpdatePageBreaks + nRepeatStartX = nSCol; // fuer UpdatePageBreaks nRepeatEndX = nECol; } } @@ -1382,12 +1370,12 @@ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, SCCOL nCol1, SCROW { *pRepeatRowRange = ScRange( nSCol, nSRow, 0, nECol, nERow, 0 ); bRecalcPages = TRUE; - nRepeatStartY = nSRow; // fuer UpdatePageBreaks + nRepeatStartY = nSRow; // fuer UpdatePageBreaks nRepeatEndY = nERow; } } - // updating print ranges is not necessary with multiple print ranges + // updating print ranges is not necessary with multiple print ranges if ( bRecalcPages && GetPrintRangeCount() <= 1 ) { UpdatePageBreaks(NULL); @@ -1647,14 +1635,14 @@ void ScTable::DoColResize( SCCOL nCol1, SCCOL nCol2, SCSIZE nAdd ) } #define SET_PRINTRANGE( p1, p2 ) \ - if ( (p2) ) \ - { \ - if ( (p1) ) \ - *(p1) = *(p2); \ - else \ - (p1) = new ScRange( *(p2) ); \ - } \ - else \ + if ( (p2) ) \ + { \ + if ( (p1) ) \ + *(p1) = *(p2); \ + else \ + (p1) = new ScRange( *(p2) ); \ + } \ + else \ DELETEZ( (p1) ) void ScTable::SetRepeatColRange( const ScRange* pNew ) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 5e7d2d940282..a852f7c0c1f7 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.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 @@ #include "olinetab.hxx" #include "rechead.hxx" #include "stlpool.hxx" -#include "attarray.hxx" // Iterator +#include "attarray.hxx" // Iterator #include "markdata.hxx" #include "progress.hxx" #include "dociter.hxx" @@ -89,7 +89,7 @@ BOOL ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline ) else pOutlineTable = NULL; - return ( nNewSizeX != nOldSizeX || nNewSizeY != nOldSizeY ); // Groesse geaendert ? + return ( nNewSizeX != nOldSizeX || nNewSizeY != nOldSizeY ); // Groesse geaendert ? } @@ -293,7 +293,7 @@ void ScTable::InsertCol( SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE aCol[MAXCOL - nSize - i].MoveTo(nStartRow, nEndRow, aCol[MAXCOL - i]); } - if (nStartCol>0) // copy old attributes + if (nStartCol>0) // copy old attributes { USHORT nWhichArray[2]; nWhichArray[0] = ATTR_MERGE; @@ -380,7 +380,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH if (nRow2 > MAXROW) nRow2 = MAXROW; if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2)) { -// IncRecalcLevel(); +// IncRecalcLevel(); { // scope for bulk broadcast ScBulkBroadcast aBulkBroadcast( pDocument->GetBASM()); @@ -399,7 +399,7 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USH ApplyPatternArea( nCol1, nRow1, nCol2, nRow2, aPattern ); } -// DecRecalcLevel(); +// DecRecalcLevel(); } } @@ -427,20 +427,20 @@ void ScTable::DeleteSelection( USHORT nDelFlag, const ScMarkData& rMark ) } -// pTable = Clipboard +// pTable = Clipboard void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScTable* pTable, BOOL bKeepScenarioFlags, BOOL bCloneNoteCaptions) { if (ValidColRow(nCol1, nRow1) && ValidColRow(nCol2, nRow2)) { - // Inhalte kopieren + // Inhalte kopieren SCCOL i; for ( i = nCol1; i <= nCol2; i++) aCol[i].CopyToClip(nRow1, nRow2, pTable->aCol[i], bKeepScenarioFlags, bCloneNoteCaptions); - // copy widths/heights, and only "hidden", "filtered" and "manual" flags - // also for all preceding columns/rows, to have valid positions for drawing objects + // copy widths/heights, and only "hidden", "filtered" and "manual" flags + // also for all preceding columns/rows, to have valid positions for drawing objects if (pColWidth && pTable->pColWidth) for (i=0; i<=nCol2; i++) @@ -458,7 +458,7 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, pTable->CopyRowHidden(*this, 0, nRow2); pTable->CopyRowFiltered(*this, 0, nRow2); - // ggf. Formeln durch Werte ersetzen + // ggf. Formeln durch Werte ersetzen if ( IsProtected() ) for (i = nCol1; i <= nCol2; i++) @@ -466,13 +466,13 @@ void ScTable::CopyToClip(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } } -void ScTable::CopyToClip(const ScRangeList& rRanges, ScTable* pTable, +void ScTable::CopyToClip(const ScRangeList& rRanges, ScTable* pTable, bool bKeepScenarioFlags, bool bCloneNoteCaptions) { ScRangeList aRanges(rRanges); for (ScRangePtr p = aRanges.First(); p; p = aRanges.Next()) { - CopyToClip(p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), + CopyToClip(p->aStart.Col(), p->aStart.Row(), p->aEnd.Col(), p->aEnd.Row(), pTable, bKeepScenarioFlags, bCloneNoteCaptions); } } @@ -535,7 +535,7 @@ void ScTable::MixData( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } -// Markierung von diesem Dokument +// Markierung von diesem Dokument void ScTable::MixMarked( const ScMarkData& rMark, USHORT nFunction, BOOL bSkipEmpty, ScTable* pSrcTab ) { @@ -558,18 +558,18 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if ( bAsLink && nFlags == IDF_ALL ) { - // #68989# with IDF_ALL, also create links (formulas) for empty cells + // #68989# with IDF_ALL, also create links (formulas) for empty cells for ( nRow=nRow1; nRow<=nRow2; nRow++ ) { - // create simple formula, as in ScColumn::CreateRefCell + // create simple formula, as in ScColumn::CreateRefCell ScAddress aDestPos( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), pTransClip->nTab ); ScSingleRefData aRef; aRef.nCol = nCol; aRef.nRow = nRow; aRef.nTab = nTab; - aRef.InitFlags(); // -> all absolute + aRef.InitFlags(); // -> all absolute aRef.SetFlag3D(TRUE); aRef.CalcRelFromAbs( aDestPos ); ScTokenArray aArr; @@ -586,19 +586,19 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, { ScAddress aDestPos( static_cast<SCCOL>(nRow-nRow1), static_cast<SCROW>(nCol-nCol1), pTransClip->nTab ); ScBaseCell* pNew; - if ( bAsLink ) // Referenz erzeugen ? + if ( bAsLink ) // Referenz erzeugen ? { pNew = aCol[nCol].CreateRefCell( pDestDoc, aDestPos, aIter.GetIndex(), nFlags ); } - else // kopieren + else // kopieren { ScAddress aOwnPos( nCol, nRow, nTab ); if (pCell->GetCellType() == CELLTYPE_FORMULA) { pNew = pCell->CloneWithNote( aOwnPos, *pDestDoc, aDestPos, SC_CLONECELL_STARTLISTENING ); - // Referenzen drehen - // bei Cut werden Referenzen spaeter per UpdateTranspose angepasst + // Referenzen drehen + // bei Cut werden Referenzen spaeter per UpdateTranspose angepasst if (!bWasCut) ((ScFormulaCell*)pNew)->TransposeReference(); @@ -612,7 +612,7 @@ void ScTable::TransposeClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } } - // Attribute + // Attribute SCROW nAttrRow1; SCROW nAttrRow2; @@ -730,9 +730,9 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, aCol[i].CopyToColumn(nRow1, nRow2, nFlags, bMarked, pDestTab->aCol[i], pMarkData, bAsLink); - if (bColRowFlags) // Spaltenbreiten/Zeilenhoehen/Flags + if (bColRowFlags) // Spaltenbreiten/Zeilenhoehen/Flags { - // Charts muessen beim Ein-/Ausblenden angepasst werden + // Charts muessen beim Ein-/Ausblenden angepasst werden ScChartListenerCollection* pCharts = pDestTab->pDocument->GetChartListenerCollection(); bool bFlagChange = false; @@ -754,8 +754,8 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, pDestTab->pColWidth[i] = pColWidth[i]; pDestTab->pColFlags[i] = pColFlags[i]; pDestTab->SetColHidden(i, i, bThisHidden); - //! Aenderungen zusammenfassen? - if (bHiddenChange && pCharts) + //! Aenderungen zusammenfassen? + if (bHiddenChange && pCharts) pCharts->SetRangeDirty(ScRange( i, 0, nTab, i, MAXROW, nTab )); if (bChange) @@ -775,23 +775,19 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, pDestTab->pRowFlags->CopyFrom(*pRowFlags, nRow1, nRow2); // Hidden flags. - // #i116164# Collect information first, then apply the changes, - // so RowHidden doesn't rebuild the tree for each row range. - std::vector<ScShowRowsEntry> aEntries; for (SCROW i = nRow1; i <= nRow2; ++i) { SCROW nThisLastRow, nDestLastRow; bool bThisHidden = RowHidden(i, NULL, &nThisLastRow); bool bDestHidden = pDestTab->RowHidden(i, NULL, &nDestLastRow); - + // If the segment sizes differ, we take the shorter segment of the two. SCROW nLastRow = ::std::min(nThisLastRow, nDestLastRow); if (nLastRow >= nRow2) // the last row shouldn't exceed the upper bound the caller specified. nLastRow = nRow2; - - //pDestTab->SetRowHidden(i, nLastRow, bThisHidden); - aEntries.push_back(ScShowRowsEntry(i, nLastRow, bThisHidden)); + + pDestTab->SetRowHidden(i, nLastRow, bThisHidden); bool bThisHiddenChange = (bThisHidden != bDestHidden); if (bThisHiddenChange && pCharts) @@ -799,27 +795,14 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, // Hidden flags differ. pCharts->SetRangeDirty(ScRange(0, i, nTab, MAXCOL, nLastRow, nTab)); } - + if (bThisHiddenChange) bFlagChange = true; - + // Jump to the last row of the identical flag segment. i = nLastRow; } - std::vector<ScShowRowsEntry>::const_iterator aEnd = aEntries.end(); - std::vector<ScShowRowsEntry>::const_iterator aIter = aEntries.begin(); - if ( aIter != aEnd ) - { - pDestTab->mpHiddenRows->setInsertFromBack(true); // important for undo document - while (aIter != aEnd) - { - pDestTab->SetRowHidden(aIter->mnRow1, aIter->mnRow2, !aIter->mbShow); - ++aIter; - } - pDestTab->mpHiddenRows->setInsertFromBack(false); - } - // Filtered flags. for (SCROW i = nRow1; i <= nRow2; ++i) { @@ -839,7 +822,7 @@ void ScTable::CopyToTable(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (bFlagChange) pDestTab->InvalidatePageBreaks(); - pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags + pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags } } } @@ -921,7 +904,7 @@ void ScTable::MarkScenarioIn( ScMarkData& rDestMark, USHORT nNeededBits ) const { DBG_ASSERT( bScenario, "bScenario == FALSE" ); - if ( ( nScenarioFlags & nNeededBits ) != nNeededBits ) // alle Bits gesetzt? + if ( ( nScenarioFlags & nNeededBits ) != nNeededBits ) // alle Bits gesetzt? return; for (SCCOL i=0; i<=MAXCOL; i++) @@ -932,16 +915,16 @@ BOOL ScTable::HasScenarioRange( const ScRange& rRange ) const { DBG_ASSERT( bScenario, "bScenario == FALSE" ); -// ScMarkData aMark; -// MarkScenarioIn( aMark, 0 ); //! Bits als Parameter von HasScenarioRange? -// return aMark.IsAllMarked( rRange ); +// ScMarkData aMark; +// MarkScenarioIn( aMark, 0 ); //! Bits als Parameter von HasScenarioRange? +// return aMark.IsAllMarked( rRange ); ScRange aTabRange = rRange; aTabRange.aStart.SetTab( nTab ); aTabRange.aEnd.SetTab( nTab ); const ScRangeList* pList = GetScenarioRanges(); -// return ( pList && pList->Find( aTabRange ) ); +// return ( pList && pList->Find( aTabRange ) ); if (pList) { @@ -971,7 +954,7 @@ const ScRangeList* ScTable::GetScenarioRanges() const { ((ScTable*)this)->pScenarioRanges = new ScRangeList; ScMarkData aMark; - MarkScenarioIn( aMark, 0 ); // immer + MarkScenarioIn( aMark, 0 ); // immer aMark.FillRangeListWithMarks( pScenarioRanges, FALSE ); } return pScenarioRanges; @@ -1023,11 +1006,11 @@ void ScTable::PutCell( const ScAddress& rPos, ScBaseCell* pCell ) } -BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, +BOOL ScTable::SetString( SCCOL nCol, SCROW nRow, SCTAB nTabP, const String& rString, ScSetStringParam* pParam ) { if (ValidColRow(nCol,nRow)) - return aCol[nCol].SetString( + return aCol[nCol].SetString( nRow, nTabP, rString, pDocument->GetAddressConvention(), pParam ); else return FALSE; @@ -1144,16 +1127,10 @@ ScBaseCell* ScTable::GetCell( SCCOL nCol, SCROW nRow ) const void ScTable::GetFirstDataPos(SCCOL& rCol, SCROW& rRow) const { rCol = 0; - rRow = MAXROW+1; + rRow = 0; while (aCol[rCol].IsEmptyData() && rCol < MAXCOL) ++rCol; - SCCOL nCol = rCol; - while (nCol <= MAXCOL && rRow > 0) - { - if (!aCol[nCol].IsEmptyData()) - rRow = ::std::min( rRow, aCol[nCol].GetFirstDataPos()); - ++nCol; - } + rRow = aCol[rCol].GetFirstDataPos(); } void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const @@ -1163,8 +1140,11 @@ void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const while (aCol[rCol].IsEmptyData() && (rCol > 0)) rCol--; SCCOL nCol = rCol; - while (nCol >= 0 && rRow < MAXROW) - rRow = ::std::max( rRow, aCol[nCol--].GetLastDataPos()); + while ((SCsCOL)nCol >= 0) + { + rRow = Max(rRow, aCol[nCol].GetLastDataPos()); + nCol--; + } } @@ -1217,7 +1197,7 @@ void ScTable::SetDirtyVar() void ScTable::SetDirty() { BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].SetDirty(); pDocument->SetAutoCalc( bOldAutoCalc ); @@ -1227,7 +1207,7 @@ void ScTable::SetDirty() void ScTable::SetDirty( const ScRange& rRange ) { BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden SCCOL nCol2 = rRange.aEnd.Col(); for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++) aCol[i].SetDirty( rRange ); @@ -1238,7 +1218,7 @@ void ScTable::SetDirty( const ScRange& rRange ) void ScTable::SetTableOpDirty( const ScRange& rRange ) { BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // no multiple recalculation + pDocument->SetAutoCalc( FALSE ); // no multiple recalculation SCCOL nCol2 = rRange.aEnd.Col(); for (SCCOL i=rRange.aStart.Col(); i<=nCol2; i++) aCol[i].SetTableOpDirty( rRange ); @@ -1249,7 +1229,7 @@ void ScTable::SetTableOpDirty( const ScRange& rRange ) void ScTable::SetDirtyAfterLoad() { BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].SetDirtyAfterLoad(); pDocument->SetAutoCalc( bOldAutoCalc ); @@ -1259,7 +1239,7 @@ void ScTable::SetDirtyAfterLoad() void ScTable::SetRelNameDirty() { BOOL bOldAutoCalc = pDocument->GetAutoCalc(); - pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden + pDocument->SetAutoCalc( FALSE ); // Mehrfachberechnungen vermeiden for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].SetRelNameDirty(); pDocument->SetAutoCalc( bOldAutoCalc ); @@ -1314,7 +1294,7 @@ void ScTable::ResetChanged( const ScRange& rRange ) aCol[nCol].ResetChanged(nStartRow, nEndRow); } -// Attribute +// Attribute const SfxPoolItem* ScTable::GetAttr( SCCOL nCol, SCROW nRow, USHORT nWhich ) const { @@ -1416,16 +1396,16 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO SCCOL nCol, SCROW nAttrRow1, SCROW nAttrRow2, SCSIZE nArrY, const ScPatternAttr* pPattern, const SfxItemSet* pCondSet ) { - // Rueckgabe = neues nArrY + // Rueckgabe = neues nArrY BYTE nRotDir = pPattern->GetRotateDir( pCondSet ); if ( nRotDir != SC_ROTDIR_NONE ) { BOOL bHit = TRUE; - if ( nCol+1 < nX1 ) // column to the left + if ( nCol+1 < nX1 ) // column to the left bHit = ( nRotDir != SC_ROTDIR_LEFT ); - else if ( nCol > nX2+1 ) // column to the right - bHit = ( nRotDir != SC_ROTDIR_RIGHT ); // SC_ROTDIR_STANDARD may now also be extended to the left + else if ( nCol > nX2+1 ) // column to the right + bHit = ( nRotDir != SC_ROTDIR_RIGHT ); // SC_ROTDIR_STANDARD may now also be extended to the left if ( bHit ) { @@ -1434,14 +1414,14 @@ SCSIZE ScTable::FillMaxRot( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCCO { long nRotVal = ((const SfxInt32Item&) pPattern-> GetItem( ATTR_ROTATE_VALUE, pCondSet )).GetValue(); - double nRealOrient = nRotVal * F_PI18000; // 1/100 Grad + double nRealOrient = nRotVal * F_PI18000; // 1/100 Grad double nCos = cos( nRealOrient ); double nSin = sin( nRealOrient ); - //! begrenzen !!! - //! zusaetzlich Faktor fuer unterschiedliche PPT X/Y !!! + //! begrenzen !!! + //! zusaetzlich Faktor fuer unterschiedliche PPT X/Y !!! - // bei SC_ROTDIR_LEFT kommt immer ein negativer Wert heraus, - // wenn der Modus beruecksichtigt wird + // bei SC_ROTDIR_LEFT kommt immer ein negativer Wert heraus, + // wenn der Modus beruecksichtigt wird nFactor = -fabs( nCos / nSin ); } @@ -1489,7 +1469,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC return; } - // nRotMaxCol ist auf SC_ROTMAX_NONE initialisiert, nRowNo ist schon gesetzt + // nRotMaxCol ist auf SC_ROTMAX_NONE initialisiert, nRowNo ist schon gesetzt SCROW nY1 = pRowInfo[0].nRowNo; SCROW nY2 = pRowInfo[nArrCount-1].nRowNo; @@ -1509,8 +1489,8 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC if ( pPattern->GetItemSet().GetItemState( ATTR_CONDITIONAL, TRUE, &pCondItem ) == SFX_ITEM_SET ) { - // alle Formate durchgehen, damit die Zellen nicht einzeln - // angeschaut werden muessen + // alle Formate durchgehen, damit die Zellen nicht einzeln + // angeschaut werden muessen ULONG nIndex = ((const SfxUInt32Item*)pCondItem)->GetValue(); ScConditionalFormatList* pList = pDocument->GetCondFormList(); @@ -1533,7 +1513,7 @@ void ScTable::FindMaxRotCol( RowInfo* pRowInfo, SCSIZE nArrCount, SCCOL nX1, SCC FillMaxRot( pRowInfo, nArrCount, nX1, nX2, nCol, nAttrRow1, nAttrRow2, nArrY, pPattern, &pStyleSheet->GetItemSet() ); - // nArrY nicht veraendern + // nArrY nicht veraendern } } } @@ -1557,28 +1537,28 @@ BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR USHORT nEdges; if ( nCol1 == nCol2 ) - { // linke und rechte Spalte + { // linke und rechte Spalte const USHORT n = 4 | 16; nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, n ); // nicht (4 und 16) oder 1 oder 32 if ( nEdges && (((nEdges & n) != n) || (nEdges & 33)) ) - return TRUE; // linke oder rechte Kante fehlt oder offen + return TRUE; // linke oder rechte Kante fehlt oder offen } else - { // linke Spalte + { // linke Spalte nEdges = aCol[nCol1].GetBlockMatrixEdges( nRow1, nRow2, 4 ); // nicht 4 oder 1 oder 32 if ( nEdges && (((nEdges & 4) != 4) || (nEdges & 33)) ) - return TRUE; // linke Kante fehlt oder offen + return TRUE; // linke Kante fehlt oder offen // rechte Spalte nEdges = aCol[nCol2].GetBlockMatrixEdges( nRow1, nRow2, 16 ); // nicht 16 oder 1 oder 32 if ( nEdges && (((nEdges & 16) != 16) || (nEdges & 33)) ) - return TRUE; // rechte Kante fehlt oder offen + return TRUE; // rechte Kante fehlt oder offen } if ( nRow1 == nRow2 ) - { // obere und untere Zeile + { // obere und untere Zeile BOOL bOpen = FALSE; const USHORT n = 2 | 8; for ( SCCOL i=nCol1; i<=nCol2; i++) @@ -1587,17 +1567,17 @@ BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR if ( nEdges ) { if ( (nEdges & n) != n ) - return TRUE; // obere oder untere Kante fehlt + return TRUE; // obere oder untere Kante fehlt if ( nEdges & 4 ) - bOpen = TRUE; // linke Kante oeffnet, weitersehen + bOpen = TRUE; // linke Kante oeffnet, weitersehen else if ( !bOpen ) - return TRUE; // es gibt was, was nicht geoeffnet wurde + return TRUE; // es gibt was, was nicht geoeffnet wurde if ( nEdges & 16 ) - bOpen = FALSE; // rechte Kante schliesst + bOpen = FALSE; // rechte Kante schliesst } } if ( bOpen ) - return TRUE; // es geht noch weiter + return TRUE; // es geht noch weiter } else { @@ -1617,15 +1597,15 @@ BOOL ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR if ( (nEdges & n) != n ) return TRUE; if ( nEdges & 4 ) - bOpen = TRUE; // linke Kante oeffnet, weitersehen + bOpen = TRUE; // linke Kante oeffnet, weitersehen else if ( !bOpen ) - return TRUE; // es gibt was, was nicht geoeffnet wurde + return TRUE; // es gibt was, was nicht geoeffnet wurde if ( nEdges & 16 ) - bOpen = FALSE; // rechte Kante schliesst + bOpen = FALSE; // rechte Kante schliesst } } if ( bOpen ) - return TRUE; // es geht noch weiter + return TRUE; // es geht noch weiter } } return FALSE; @@ -1946,8 +1926,8 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r { rFound = FALSE; - BOOL bEqual = TRUE; - BOOL bColFound; + BOOL bEqual = TRUE; + BOOL bColFound; const ScStyleSheet* pStyle = NULL; const ScStyleSheet* pNewStyle; @@ -1960,7 +1940,7 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r { rFound = TRUE; if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } } @@ -1969,13 +1949,13 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, BOOL& r } -const ScStyleSheet* ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1, +const ScStyleSheet* ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const { rFound = FALSE; - BOOL bEqual = TRUE; - BOOL bColFound; + BOOL bEqual = TRUE; + BOOL bColFound; const ScStyleSheet* pStyle = NULL; const ScStyleSheet* pNewStyle; @@ -1987,7 +1967,7 @@ const ScStyleSheet* ScTable::GetAreaStyle( BOOL& rFound, SCCOL nCol1, SCROW nRow { rFound = TRUE; if ( !pNewStyle || ( pStyle && pNewStyle != pStyle ) ) - bEqual = FALSE; // unterschiedliche + bEqual = FALSE; // unterschiedliche pStyle = pNewStyle; } } @@ -2098,7 +2078,7 @@ void ScTable::ClearSelectionItems( const USHORT* pWhich, const ScMarkData& rMark } -// Spaltenbreiten / Zeilenhoehen +// Spaltenbreiten / Zeilenhoehen void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth ) { @@ -2106,7 +2086,7 @@ void ScTable::SetColWidth( SCCOL nCol, USHORT nNewWidth ) { if (!nNewWidth) { -// DBG_ERROR("Spaltenbreite 0 in SetColWidth"); +// DBG_ERROR("Spaltenbreite 0 in SetColWidth"); nNewWidth = STD_COL_WIDTH; } @@ -2173,12 +2153,12 @@ void ScTable::SetRowHeight( SCROW nRow, USHORT nNewHeight ) namespace { -/** - * Check if the new pixel size is different from the old size between - * specified ranges. +/** + * Check if the new pixel size is different from the old size between + * specified ranges. */ bool lcl_pixelSizeChanged( - ScFlatUInt16RowSegments& rRowHeights, SCROW nStartRow, SCROW nEndRow, + ScFlatUInt16RowSegments& rRowHeights, SCROW nStartRow, SCROW nEndRow, sal_uInt16 nNewHeight, double nPPTY) { long nNewPix = static_cast<long>(nNewHeight * nPPTY); @@ -2191,7 +2171,7 @@ bool lcl_pixelSizeChanged( break; if (nHeight != nNewHeight) - { + { bool bChanged = (nNewPix != static_cast<long>(nHeight * nPPTY)); if (bChanged) return true; @@ -2339,7 +2319,7 @@ USHORT ScTable::GetColWidth( SCCOL nCol ) const } -USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte +USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte { DBG_ASSERT(VALIDCOL(nCol),"Falsche Spaltennummer"); @@ -2352,7 +2332,7 @@ USHORT ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingest USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) { - // get the width that is used in the largest continuous column range (up to nEndCol) + // get the width that is used in the largest continuous column range (up to nEndCol) if ( !ValidCol(nEndCol) ) { @@ -2365,7 +2345,7 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) SCCOL nRangeStart = 0; while ( nRangeStart <= nEndCol ) { - // skip hidden columns + // skip hidden columns while ( nRangeStart <= nEndCol && ColHidden(nRangeStart) ) ++nRangeStart; if ( nRangeStart <= nEndCol ) @@ -2378,7 +2358,7 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) ++nThisCount; ++nRangeEnd; - // skip hidden columns + // skip hidden columns while ( nRangeEnd <= nEndCol && ColHidden(nRangeEnd) ) ++nRangeEnd; } @@ -2389,7 +2369,7 @@ USHORT ScTable::GetCommonWidth( SCCOL nEndCol ) nMaxWidth = nThisWidth; } - nRangeStart = nRangeEnd; // next range + nRangeStart = nRangeEnd; // next range } } @@ -2418,9 +2398,9 @@ USHORT ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool return 0; } - // If bHiddenAsZero, pStartRow and pEndRow were initialized to - // boundaries of a non-hidden segment. Assume that the previous and - // next segment are hidden then and limit the current height + // If bHiddenAsZero, pStartRow and pEndRow were initialized to + // boundaries of a non-hidden segment. Assume that the previous and + // next segment are hidden then and limit the current height // segment. if (pStartRow) *pStartRow = (bHiddenAsZero ? std::max( *pStartRow, aData.mnRow1) : aData.mnRow1); @@ -2493,7 +2473,7 @@ ULONG ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale } -USHORT ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hidden +USHORT ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hidden { DBG_ASSERT(VALIDROW(nRow),"wrong row number"); @@ -2504,7 +2484,7 @@ USHORT ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hid } -// Spalten-/Zeilen-Flags +// Spalten-/Zeilen-Flags SCROW ScTable::GetHiddenRowCount( SCROW nRow ) @@ -2520,7 +2500,7 @@ SCROW ScTable::GetHiddenRowCount( SCROW nRow ) } -//! ShowRows / DBShowRows zusammenfassen +//! ShowRows / DBShowRows zusammenfassen void ScTable::ShowCol(SCCOL nCol, bool bShow) { @@ -2611,7 +2591,7 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow) } } - // Filter-Flag immer setzen, auch wenn Hidden unveraendert + // Filter-Flag immer setzen, auch wenn Hidden unveraendert SetRowHidden(nRow, nRow, !bShow); SetRowFiltered(nRow, nRow, !bShow); DecRecalcLevel(); @@ -2635,9 +2615,8 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow) } -void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bSetFlags) +void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow) { - // #i116164# IncRecalcLevel/DecRecalcLevel is in ScTable::Query SCROW nStartRow = nRow1; while (nStartRow <= nRow2) { @@ -2647,7 +2626,7 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bSetFlags) nEndRow = nRow2; BOOL bChanged = ( bWasVis != bShow ); - if ( bChanged && bSetFlags ) + if ( bChanged ) { ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); if (pDrawLayer) @@ -2660,13 +2639,8 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bSetFlags) } } - // #i116164# Directly modify the flags only if there are drawing objects within the area. - // Otherwise, all modifications are made together in ScTable::Query, so the tree isn't constantly rebuilt. - if ( bSetFlags ) - { - SetRowHidden(nStartRow, nEndRow, !bShow); - SetRowFiltered(nStartRow, nEndRow, !bShow); - } + SetRowHidden(nStartRow, nEndRow, !bShow); + SetRowFiltered(nStartRow, nEndRow, !bShow); if ( bChanged ) { @@ -2678,9 +2652,9 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow, bool bSetFlags) nStartRow = nEndRow + 1; } - // #i12341# For Show/Hide rows, the outlines are updated separately from the outside. - // For filtering, the changes aren't visible to the caller, so UpdateOutlineRow has - // to be done here. + // #i12341# For Show/Hide rows, the outlines are updated separately from the outside. + // For filtering, the changes aren't visible to the caller, so UpdateOutlineRow has + // to be done here. if (pOutlineTable) UpdateOutlineRow( nRow1, nRow2, bShow ); } @@ -2691,14 +2665,6 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow) SCROW nStartRow = nRow1; IncRecalcLevel(); InitializeNoteCaptions(); - - // #i116164# if there are no drawing objects within the row range, a single HeightChanged call is enough - ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); - bool bHasObjects = pDrawLayer && pDrawLayer->HasObjectsInRows( nTab, nRow1, nRow2, false ); - long nOldHeight = 0; - if ( pDrawLayer && !bHasObjects ) - nOldHeight = static_cast<long>(GetRowHeight(nRow1, nRow2)); - while (nStartRow <= nRow2) { SCROW nEndRow = -1; @@ -2707,8 +2673,9 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow) nEndRow = nRow2; BOOL bChanged = ( bWasVis != bShow ); - if ( bChanged && bHasObjects ) + if ( bChanged ) { + ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); if (pDrawLayer) { long nHeight = static_cast<long>(mpRowHeights->getSumValue(nStartRow, nEndRow)); @@ -2719,14 +2686,9 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow) } } - // #i116164# Directly modify the flags only if there are drawing objects within the area. - // Otherwise, all rows are modified together after the loop, so the tree isn't constantly rebuilt. - if ( bHasObjects ) - { - SetRowHidden(nStartRow, nEndRow, !bShow); - if (bShow) - SetRowFiltered(nStartRow, nEndRow, false); - } + SetRowHidden(nStartRow, nEndRow, !bShow); + if (bShow) + SetRowFiltered(nStartRow, nEndRow, false); if ( bChanged ) { @@ -2739,25 +2701,6 @@ void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow) nStartRow = nEndRow + 1; } - - if ( !bHasObjects ) - { - // #i116164# set the flags for the whole range at once - SetRowHidden(nRow1, nRow2, !bShow); - if (bShow) - SetRowFiltered(nRow1, nRow2, false); - - if ( pDrawLayer ) - { - // if there are no objects in the range, a single HeightChanged call is enough - long nNewHeight = 0; - if ( bShow ) - nNewHeight = static_cast<long>(GetRowHeight(nRow1, nRow2)); - if ( nNewHeight != nOldHeight ) - pDrawLayer->HeightChanged( nTab, nRow1, nNewHeight - nOldHeight ); - } - } - DecRecalcLevel(); } @@ -2817,7 +2760,7 @@ SCROW ScTable::GetLastFlaggedRow() const { SCROW nLastFound = 0; if (pRowFlags) - { + { SCROW nRow = pRowFlags->GetLastAnyBitAccess( 0, sal::static_int_cast<BYTE>(CR_ALL) ); if (ValidRow(nRow)) nLastFound = nRow; @@ -2955,7 +2898,7 @@ void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) } -// Auto-Outline +// Auto-Outline template< typename T > short DiffSign( T a, T b ) @@ -2968,7 +2911,7 @@ short DiffSign( T a, T b ) void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { BOOL bSizeChanged = FALSE; - BOOL bMissed = FALSE; + BOOL bMissed = FALSE; SCCOL nCol; SCROW nRow; @@ -2977,7 +2920,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC ScOutlineArray* pArray; ScBaseCell* pCell; ScRange aRef; -/* ScPatternAttr aBoldPattern( pDocument->GetPool() ); //! spezielle Format-Vorlage +/* ScPatternAttr aBoldPattern( pDocument->GetPool() ); //! spezielle Format-Vorlage aBoldPattern.GetItemSet().Put( SvxWeightItem( WEIGHT_BOLD ) ); */ @@ -2985,8 +2928,8 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC // Zeilen - SCROW nCount = nEndRow-nStartRow+1; - BOOL* pUsed = new BOOL[nCount]; + SCROW nCount = nEndRow-nStartRow+1; + BOOL* pUsed = new BOOL[nCount]; for (i=0; i<nCount; i++) pUsed[i] = FALSE; for (nCol=nStartCol; nCol<=nEndCol; nCol++) @@ -3012,7 +2955,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC { if (pArray->Insert( aRef.aStart.Row(), aRef.aEnd.Row(), bSizeChanged )) { -// ApplyPatternArea( nStartCol, nRow, nEndCol, nRow, aBoldPattern ); +// ApplyPatternArea( nStartCol, nRow, nEndCol, nRow, aBoldPattern ); bFound = TRUE; } else @@ -3043,7 +2986,7 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC { if (pArray->Insert( aRef.aStart.Col(), aRef.aEnd.Col(), bSizeChanged )) { -// ApplyPatternArea( nCol, nStartRow, nCol, nEndRow, aBoldPattern ); +// ApplyPatternArea( nCol, nStartRow, nCol, nEndRow, aBoldPattern ); bFound = TRUE; } else @@ -3054,12 +2997,12 @@ void ScTable::DoAutoOutline( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC } } - // CopyData - fuer Query in anderen Bereich + // CopyData - fuer Query in anderen Bereich void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCCOL nDestCol, SCROW nDestRow, SCTAB nDestTab ) { - //! wenn fuer mehrere Zeilen benutzt, nach Spalten optimieren! + //! wenn fuer mehrere Zeilen benutzt, nach Spalten optimieren! ScAddress aSrc( nStartCol, nStartRow, nTab ); ScAddress aDest( nDestCol, nDestRow, nDestTab ); @@ -3125,7 +3068,7 @@ BOOL ScTable::RefVisible(ScFormulaCell* pCell) } } - return TRUE; // irgendwie anders + return TRUE; // irgendwie anders } @@ -3153,7 +3096,7 @@ void ScTable::SetDrawPageSize(bool bResetStreamValid, bool bUpdateNoteCaptionPos long x = ( fValX > (double)nMax ) ? nMax : (long) fValX; long y = ( fValY > (double)nMax ) ? nMax : (long) fValY; - if ( IsLayoutRTL() ) // IsNegativePage + if ( IsLayoutRTL() ) // IsNegativePage x = -x; pDrawLayer->SetPageSize( static_cast<sal_uInt16>(nTab), Size( x, y ), bUpdateNoteCaptionPos ); diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 496e24520dec..c02939c2f78d 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.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,8 +60,6 @@ #include "cellform.hxx" #include "postit.hxx" #include "queryparam.hxx" -#include "segmenttree.hxx" -#include "drwlayer.hxx" #include <vector> @@ -204,12 +202,12 @@ short Compare( const String &sInput1, const String &sInput2, // STATIC DATA ----------------------------------------------------------- -const USHORT nMaxSorts = 3; // maximale Anzahl Sortierkriterien in aSortParam +const USHORT nMaxSorts = 3; // maximale Anzahl Sortierkriterien in aSortParam struct ScSortInfo { - ScBaseCell* pCell; - SCCOLROW nOrg; + ScBaseCell* pCell; + SCCOLROW nOrg; DECL_FIXEDMEMPOOL_NEWDEL( ScSortInfo ); }; const USHORT nMemPoolSortInfo = (0x8000 - 64) / sizeof(ScSortInfo); @@ -221,10 +219,10 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo, nMemPoolSortInfo, nMemPoolSortInfo ) class ScSortInfoArray { private: - ScSortInfo** pppInfo[nMaxSorts]; - SCSIZE nCount; - SCCOLROW nStart; - USHORT nUsedSorts; + ScSortInfo** pppInfo[nMaxSorts]; + SCSIZE nCount; + SCCOLROW nStart; + USHORT nUsedSorts; public: ScSortInfoArray( USHORT nSorts, SCCOLROW nInd1, SCCOLROW nInd2 ) : @@ -249,9 +247,9 @@ public: delete [] ppInfo; } } - ScSortInfo* Get( USHORT nSort, SCCOLROW nInd ) + ScSortInfo* Get( USHORT nSort, SCCOLROW nInd ) { return (pppInfo[nSort])[ nInd - nStart ]; } - void Swap( SCCOLROW nInd1, SCCOLROW nInd2 ) + void Swap( SCCOLROW nInd1, SCCOLROW nInd2 ) { SCSIZE n1 = static_cast<SCSIZE>(nInd1 - nStart); SCSIZE n2 = static_cast<SCSIZE>(nInd2 - nStart); @@ -263,10 +261,10 @@ public: ppInfo[n2] = pTmp; } } - USHORT GetUsedSorts() { return nUsedSorts; } - ScSortInfo** GetFirstArray() { return pppInfo[0]; } - SCCOLROW GetStart() { return nStart; } - SCSIZE GetCount() { return nCount; } + USHORT GetUsedSorts() { return nUsedSorts; } + ScSortInfo** GetFirstArray() { return pppInfo[0]; } + SCCOLROW GetStart() { return nStart; } + SCSIZE GetCount() { return nCount; } }; ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 ) @@ -310,7 +308,7 @@ ScSortInfoArray* ScTable::CreateSortInfoArray( SCCOLROW nInd1, SCCOLROW nInd2 ) BOOL ScTable::IsSortCollatorGlobal() const { - return pSortCollator == ScGlobal::GetCollator() || + return pSortCollator == ScGlobal::GetCollator() || pSortCollator == ScGlobal::GetCaseCollator(); } @@ -325,7 +323,7 @@ void ScTable::InitSortCollator( const ScSortParam& rPar ) rPar.aCollatorLocale, (rPar.bCaseSens ? 0 : SC_COLLATOR_IGNORES) ); } else - { // SYSTEM + { // SYSTEM DestroySortCollator(); pSortCollator = (rPar.bCaseSens ? ScGlobal::GetCaseCollator() : ScGlobal::GetCollator()); @@ -408,7 +406,7 @@ short ScTable::CompareCell( USHORT nSort, if ( eType2 == CELLTYPE_FORMULA && ((ScFormulaCell*)pCell2)->IsValue() ) bStr2 = FALSE; - if ( bStr1 && bStr2 ) // nur Strings untereinander als String vergleichen! + if ( bStr1 && bStr2 ) // nur Strings untereinander als String vergleichen! { String aStr1; String aStr2; @@ -421,9 +419,9 @@ short ScTable::CompareCell( USHORT nSort, else GetString(nCell2Col, nCell2Row, aStr2); - BOOL bUserDef = aSortParam.bUserDef; // custom sort order - BOOL bNaturalSort = aSortParam.bNaturalSort; // natural sort - BOOL bCaseSens = aSortParam.bCaseSens; // case sensitivity + BOOL bUserDef = aSortParam.bUserDef; // custom sort order + BOOL bNaturalSort = aSortParam.bNaturalSort; // natural sort + BOOL bCaseSens = aSortParam.bCaseSens; // case sensitivity if (bUserDef) { @@ -455,11 +453,11 @@ short ScTable::CompareCell( USHORT nSort, nRes = static_cast<short>( pSortCollator->compareString( aStr1, aStr2 ) ); } } - else if ( bStr1 ) // String <-> Zahl - nRes = 1; // Zahl vorne - else if ( bStr2 ) // Zahl <-> String - nRes = -1; // Zahl vorne - else // Zahlen untereinander + else if ( bStr1 ) // String <-> Zahl + nRes = 1; // Zahl vorne + else if ( bStr2 ) // Zahl <-> String + nRes = -1; // Zahl vorne + else // Zahlen untereinander { double nVal1; double nVal2; @@ -491,7 +489,7 @@ short ScTable::CompareCell( USHORT nSort, if ( pCell2 ) nRes = 1; else - nRes = 0; // beide leer + nRes = 0; // beide leer } return nRes; } @@ -716,15 +714,15 @@ void ScTable::Sort(const ScSortParam& rSortParam, BOOL bKeepQuery) } -// Testen, ob beim Loeschen von Zwischenergebnissen andere Daten mit geloescht werden -// (fuer Hinweis-Box) +// Testen, ob beim Loeschen von Zwischenergebnissen andere Daten mit geloescht werden +// (fuer Hinweis-Box) BOOL ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam ) { SCCOL nStartCol = rParam.nCol1; - SCROW nStartRow = rParam.nRow1 + 1; // Header + SCROW nStartRow = rParam.nRow1 + 1; // Header SCCOL nEndCol = rParam.nCol2; - SCROW nEndRow = rParam.nRow2; + SCROW nEndRow = rParam.nRow2; SCCOL nCol; SCROW nRow; @@ -749,15 +747,15 @@ BOOL ScTable::TestRemoveSubTotals( const ScSubTotalParam& rParam ) return bWillDelete; } -// alte Ergebnisse loeschen -// rParam.nRow2 wird veraendert ! +// alte Ergebnisse loeschen +// rParam.nRow2 wird veraendert ! void ScTable::RemoveSubTotals( ScSubTotalParam& rParam ) { SCCOL nStartCol = rParam.nCol1; - SCROW nStartRow = rParam.nRow1 + 1; // Header + SCROW nStartRow = rParam.nRow1 + 1; // Header SCCOL nEndCol = rParam.nCol2; - SCROW nEndRow = rParam.nRow2; // wird veraendert + SCROW nEndRow = rParam.nRow2; // wird veraendert SCCOL nCol; SCROW nRow; @@ -779,10 +777,10 @@ void ScTable::RemoveSubTotals( ScSubTotalParam& rParam ) } } - rParam.nRow2 = nEndRow; // neues Ende + rParam.nRow2 = nEndRow; // neues Ende } -// harte Zahlenformate loeschen (fuer Ergebnisformeln) +// harte Zahlenformate loeschen (fuer Ergebnisformeln) void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow ) { @@ -809,24 +807,24 @@ typedef struct lcl_ScTable_DoSubTotals_RowEntry SCROW nFuncEnd; } RowEntry; -// neue Zwischenergebnisse -// rParam.nRow2 wird veraendert ! +// neue Zwischenergebnisse +// rParam.nRow2 wird veraendert ! BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) { SCCOL nStartCol = rParam.nCol1; - SCROW nStartRow = rParam.nRow1 + 1; // Header + SCROW nStartRow = rParam.nRow1 + 1; // Header SCCOL nEndCol = rParam.nCol2; - SCROW nEndRow = rParam.nRow2; // wird veraendert + SCROW nEndRow = rParam.nRow2; // wird veraendert USHORT i; - // Leerzeilen am Ende weglassen, - // damit alle Ueberlaeufe (MAXROW) bei InsertRow gefunden werden (#35180#) - // Wenn sortiert wurde, sind alle Leerzeilen am Ende. + // Leerzeilen am Ende weglassen, + // damit alle Ueberlaeufe (MAXROW) bei InsertRow gefunden werden (#35180#) + // Wenn sortiert wurde, sind alle Leerzeilen am Ende. SCSIZE nEmpty = GetEmptyLinesInBlock( nStartCol, nStartRow, nEndCol, nEndRow, DIR_BOTTOM ); nEndRow -= nEmpty; - USHORT nLevelCount = 0; // Anzahl Gruppierungen + USHORT nLevelCount = 0; // Anzahl Gruppierungen BOOL bDoThis = TRUE; for (i=0; i<MAXSUBTOTAL && bDoThis; i++) if (rParam.bGroupActive[i]) @@ -834,23 +832,23 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) else bDoThis = FALSE; - if (nLevelCount==0) // nichts tun + if (nLevelCount==0) // nichts tun return TRUE; - SCCOL* nGroupCol = rParam.nField; // Spalten nach denen + SCCOL* nGroupCol = rParam.nField; // Spalten nach denen // gruppiert wird - // #44444# Durch (leer) als eigene Kategorie muss immer auf - // Teilergebniszeilen aus den anderen Spalten getestet werden - // (frueher nur, wenn eine Spalte mehrfach vorkam) + // #44444# Durch (leer) als eigene Kategorie muss immer auf + // Teilergebniszeilen aus den anderen Spalten getestet werden + // (frueher nur, wenn eine Spalte mehrfach vorkam) BOOL bTestPrevSub = ( nLevelCount > 1 ); - String aSubString; - String aOutString; + String aSubString; + String aOutString; BOOL bIgnoreCase = !rParam.bCaseSens; - String *pCompString[MAXSUBTOTAL]; // Pointer wegen Compiler-Problemen + String *pCompString[MAXSUBTOTAL]; // Pointer wegen Compiler-Problemen for (i=0; i<MAXSUBTOTAL; i++) pCompString[i] = new String; @@ -859,7 +857,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) ScStyleSheet* pStyle = (ScStyleSheet*) pDocument->GetStyleSheetPool()->Find( ScGlobal::GetRscString(STR_STYLENAME_RESULT), SFX_STYLE_FAMILY_PARA ); - BOOL bSpaceLeft = TRUE; // Erfolg beim Einfuegen? + BOOL bSpaceLeft = TRUE; // Erfolg beim Einfuegen? // #90279# For performance reasons collect formula entries so their // references don't have to be tested for updates each time a new row is @@ -867,7 +865,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) RowEntry aRowEntry; ::std::vector< RowEntry > aRowVector; - for (USHORT nLevel=0; nLevel<=nLevelCount && bSpaceLeft; nLevel++) // incl. Gesamtergebnis + for (USHORT nLevel=0; nLevel<=nLevelCount && bSpaceLeft; nLevel++) // incl. Gesamtergebnis { BOOL bTotal = ( nLevel == nLevelCount ); aRowEntry.nGroupNo = bTotal ? 0 : (nLevelCount-nLevel-1); @@ -877,7 +875,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) // result functions ScSubTotalFunc* eResFunc = rParam.pFunctions[aRowEntry.nGroupNo]; - if (nResCount > 0) // sonst nur sortieren + if (nResCount > 0) // sonst nur sortieren { for (i=0; i<=aRowEntry.nGroupNo; i++) { @@ -886,9 +884,9 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) *pCompString[i] = ScGlobal::pCharClass->upper( aSubString ); else *pCompString[i] = aSubString; - } // aSubString bleibt auf dem letzten stehen + } // aSubString bleibt auf dem letzten stehen - BOOL bBlockVis = FALSE; // Gruppe eingeblendet? + BOOL bBlockVis = FALSE; // Gruppe eingeblendet? aRowEntry.nSubStartRow = nStartRow; for (SCROW nRow=nStartRow; nRow<=nEndRow+1 && bSpaceLeft; nRow++) { @@ -906,8 +904,8 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) GetString( nGroupCol[i], nRow, aString ); if (bIgnoreCase) ScGlobal::pCharClass->toUpper( aString ); - // #41427# wenn sortiert, ist "leer" eine eigene Gruppe - // sonst sind leere Zellen unten erlaubt + // #41427# wenn sortiert, ist "leer" eine eigene Gruppe + // sonst sind leere Zellen unten erlaubt bChanged = ( ( aString.Len() || rParam.bDoSort ) && aString != *pCompString[i] ); } @@ -959,10 +957,10 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) // collect formula positions aRowVector.push_back( aRowEntry ); - if (bTotal) // "Gesamtergebnis" + if (bTotal) // "Gesamtergebnis" aOutString = ScGlobal::GetRscString( STR_TABLE_GESAMTERGEBNIS ); else - { // " Ergebnis" + { // " Ergebnis" aOutString = aSubString; if (!aOutString.Len()) aOutString = ScGlobal::GetRscString( STR_EMPTYDATA ); @@ -971,17 +969,17 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) if ( nResCount == 1 ) switch ( eResFunc[0] ) { - case SUBTOTAL_FUNC_AVE: nStrId = STR_FUN_TEXT_AVG; break; + case SUBTOTAL_FUNC_AVE: nStrId = STR_FUN_TEXT_AVG; break; case SUBTOTAL_FUNC_CNT: - case SUBTOTAL_FUNC_CNT2: nStrId = STR_FUN_TEXT_COUNT; break; - case SUBTOTAL_FUNC_MAX: nStrId = STR_FUN_TEXT_MAX; break; - case SUBTOTAL_FUNC_MIN: nStrId = STR_FUN_TEXT_MIN; break; - case SUBTOTAL_FUNC_PROD: nStrId = STR_FUN_TEXT_PRODUCT; break; + case SUBTOTAL_FUNC_CNT2: nStrId = STR_FUN_TEXT_COUNT; break; + case SUBTOTAL_FUNC_MAX: nStrId = STR_FUN_TEXT_MAX; break; + case SUBTOTAL_FUNC_MIN: nStrId = STR_FUN_TEXT_MIN; break; + case SUBTOTAL_FUNC_PROD: nStrId = STR_FUN_TEXT_PRODUCT; break; case SUBTOTAL_FUNC_STD: - case SUBTOTAL_FUNC_STDP: nStrId = STR_FUN_TEXT_STDDEV; break; - case SUBTOTAL_FUNC_SUM: nStrId = STR_FUN_TEXT_SUM; break; + case SUBTOTAL_FUNC_STDP: nStrId = STR_FUN_TEXT_STDDEV; break; + case SUBTOTAL_FUNC_SUM: nStrId = STR_FUN_TEXT_SUM; break; case SUBTOTAL_FUNC_VAR: - case SUBTOTAL_FUNC_VARP: nStrId = STR_FUN_TEXT_VAR; break; + case SUBTOTAL_FUNC_VARP: nStrId = STR_FUN_TEXT_VAR; break; default: { // added to avoid warnings @@ -1010,7 +1008,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) } else { -// DBG_ERROR( "nSubTotals==0 bei DoSubTotals" ); +// DBG_ERROR( "nSubTotals==0 bei DoSubTotals" ); } } @@ -1048,16 +1046,16 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) { ApplyStyle( nResCols[nResult], iEntry->nDestRow, *pStyle ); - // Zahlformat loeschen + // Zahlformat loeschen lcl_RemoveNumberFormat( this, nResCols[nResult], iEntry->nDestRow ); } } } - //! je nach Einstellung Zwischensummen-Zeilen nach oben verschieben ? + //! je nach Einstellung Zwischensummen-Zeilen nach oben verschieben ? - //! Outlines direkt erzeugen? + //! Outlines direkt erzeugen? if (bSpaceLeft) DoAutoOutline( nStartCol, nStartRow, nEndCol, nEndRow ); @@ -1065,7 +1063,7 @@ BOOL ScTable::DoSubTotals( ScSubTotalParam& rParam ) for (i=0; i<MAXSUBTOTAL; i++) delete pCompString[i]; - rParam.nRow2 = nEndRow; // neues Ende + rParam.nRow2 = nEndRow; // neues Ende return bSpaceLeft; } @@ -1086,9 +1084,9 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, BOOL* pPasst = ( nEntryCount <= nFixedBools ? &aBool[0] : new BOOL[nEntryCount] ); BOOL* pTest = ( nEntryCount <= nFixedBools ? &aTest[0] : new BOOL[nEntryCount] ); - long nPos = -1; - SCSIZE i = 0; - BOOL bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell(); + long nPos = -1; + SCSIZE i = 0; + BOOL bMatchWholeCell = pDocument->GetDocOptions().IsMatchWholeCell(); CollatorWrapper* pCollator = (rParam.bCaseSens ? ScGlobal::GetCaseCollator() : ScGlobal::GetCollator()); ::utl::TransliterationWrapper* pTransliteration = (rParam.bCaseSens ? @@ -1113,7 +1111,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, } else if ( !rEntry.bQueryByString && (pCell ? pCell->HasValueData() : HasValueData( static_cast<SCCOL>(rEntry.nField), nRow))) - { // by Value + { // by Value double nCellVal; if ( pCell ) { @@ -1133,11 +1131,11 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, else nCellVal = GetValue( static_cast<SCCOL>(rEntry.nField), nRow ); - /* NOTE: lcl_PrepareQuery() prepares a filter query such that if a - * date+time format was queried rEntry.bQueryByDate is not set. In - * case other queries wanted to use this mechanism they should do - * the same, in other words only if rEntry.nVal is an integer value - * rEntry.bQueryByDate should be true and the time fraction be + /* NOTE: lcl_PrepareQuery() prepares a filter query such that if a + * date+time format was queried rEntry.bQueryByDate is not set. In + * case other queries wanted to use this mechanism they should do + * the same, in other words only if rEntry.nVal is an integer value + * rEntry.bQueryByDate should be true and the time fraction be * stripped here. */ if (rEntry.bQueryByDate) { @@ -1146,15 +1144,15 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, if (pEntry) { short nNumFmtType = pEntry->GetType(); - /* NOTE: Omitting the check for absence of - * NUMBERFORMAT_TIME would include also date+time formatted - * values of the same day. That may be desired in some - * cases, querying all time values of a day, but confusing - * in other cases. A user can always setup a standard + /* NOTE: Omitting the check for absence of + * NUMBERFORMAT_TIME would include also date+time formatted + * values of the same day. That may be desired in some + * cases, querying all time values of a day, but confusing + * in other cases. A user can always setup a standard * filter query for x >= date AND x < date+1 */ if ((nNumFmtType & NUMBERFORMAT_DATE) && !(nNumFmtType & NUMBERFORMAT_TIME)) { - // The format is of date type. Strip off the time + // The format is of date type. Strip off the time // element. nCellVal = ::rtl::math::approxFloor(nCellVal); } @@ -1192,15 +1190,15 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, } } else if ( (rEntry.eOp == SC_EQUAL || rEntry.eOp == SC_NOT_EQUAL) || - (rEntry.eOp == SC_CONTAINS || rEntry.eOp == SC_DOES_NOT_CONTAIN || + (rEntry.eOp == SC_CONTAINS || rEntry.eOp == SC_DOES_NOT_CONTAIN || rEntry.eOp == SC_BEGINS_WITH || rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_BEGIN_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH) || (rEntry.bQueryByString && (pCell ? pCell->HasStringData() : HasStringData( static_cast<SCCOL>(rEntry.nField), nRow)))) - { // by String - String aCellStr; + { // by String + String aCellStr; if( rEntry.eOp == SC_CONTAINS || rEntry.eOp == SC_DOES_NOT_CONTAIN || rEntry.eOp == SC_BEGINS_WITH || rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_BEGIN_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH ) @@ -1217,7 +1215,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, GetInputString( static_cast<SCCOL>(rEntry.nField), nRow, aCellStr ); BOOL bRealRegExp = (rParam.bRegExp && ((rEntry.eOp == SC_EQUAL) - || (rEntry.eOp == SC_NOT_EQUAL) || (rEntry.eOp == SC_CONTAINS) + || (rEntry.eOp == SC_NOT_EQUAL) || (rEntry.eOp == SC_CONTAINS) || (rEntry.eOp == SC_DOES_NOT_CONTAIN) || (rEntry.eOp == SC_BEGINS_WITH) || (rEntry.eOp == SC_ENDS_WITH) || (rEntry.eOp == SC_DOES_NOT_BEGIN_WITH) || (rEntry.eOp == SC_DOES_NOT_END_WITH))); @@ -1228,7 +1226,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, { xub_StrLen nStart = 0; xub_StrLen nEnd = aCellStr.Len(); - + // from 614 on, nEnd is behind the found text BOOL bMatch = FALSE; if ( rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH ) @@ -1237,7 +1235,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, nStart = aCellStr.Len(); bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens ) ->SearchBkwrd( aCellStr, &nStart, &nEnd ); - } + } else { bMatch = (BOOL) rEntry.GetSearchTextPtr( rParam.bCaseSens ) @@ -1307,7 +1305,7 @@ BOOL ScTable::ValidQuery(SCROW nRow, const ScQueryParam& rParam, String aQuer( pTransliteration->transliterate( *rEntry.pStr, ScGlobal::eLnge, 0, rEntry.pStr->Len(), NULL ) ); - xub_StrLen nIndex = (rEntry.eOp == SC_ENDS_WITH + xub_StrLen nIndex = (rEntry.eOp == SC_ENDS_WITH || rEntry.eOp == SC_DOES_NOT_END_WITH)? (aCell.Len()-aQuer.Len()):0; xub_StrLen nStrPos = aCell.Search( aQuer, nIndex ); switch (rEntry.eOp) @@ -1444,7 +1442,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam ) case SC_BOTPERC: { ScSortParam aLocalSortParam( rParam, static_cast<SCCOL>(rEntry.nField) ); - aSortParam = aLocalSortParam; // used in CreateSortInfoArray, Compare + aSortParam = aLocalSortParam; // used in CreateSortInfoArray, Compare if ( !bSortCollatorInitialized ) { bSortCollatorInitialized = TRUE; @@ -1466,9 +1464,9 @@ void ScTable::TopTenQuery( ScQueryParam& rParam ) if ( nValidCount > 0 ) { if ( rEntry.bQueryByString ) - { // dat wird nix + { // dat wird nix rEntry.bQueryByString = FALSE; - rEntry.nVal = 10; // 10 bzw. 10% + rEntry.nVal = 10; // 10 bzw. 10% } SCSIZE nVal = (rEntry.nVal >= 1 ? static_cast<SCSIZE>(rEntry.nVal) : 1); SCSIZE nOffset = 0; @@ -1479,7 +1477,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam ) rEntry.eOp = SC_GREATER_EQUAL; if ( nVal > nValidCount ) nVal = nValidCount; - nOffset = nValidCount - nVal; // 1 <= nVal <= nValidCount + nOffset = nValidCount - nVal; // 1 <= nVal <= nValidCount } break; case SC_BOTVAL: @@ -1487,7 +1485,7 @@ void ScTable::TopTenQuery( ScQueryParam& rParam ) rEntry.eOp = SC_LESS_EQUAL; if ( nVal > nValidCount ) nVal = nValidCount; - nOffset = nVal - 1; // 1 <= nVal <= nValidCount + nOffset = nVal - 1; // 1 <= nVal <= nValidCount } break; case SC_TOPPERC: @@ -1620,16 +1618,16 @@ static void lcl_PrepareQuery( ScDocument* pDoc, ScTable* pTab, ScQueryParam& rPa SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub) { ScQueryParam aParam( rParamOrg ); - ScStrCollection aScStrCollection; - StrData* pStrData = NULL; + ScStrCollection aScStrCollection; + StrData* pStrData = NULL; - BOOL bStarted = FALSE; - BOOL bOldResult = TRUE; - SCROW nOldStart = 0; - SCROW nOldEnd = 0; + BOOL bStarted = FALSE; + BOOL bOldResult = TRUE; + SCROW nOldStart = 0; + SCROW nOldEnd = 0; - SCSIZE nCount = 0; - SCROW nOutRow = 0; + SCSIZE nCount = 0; + SCROW nOutRow = 0; SCROW nHeader = aParam.bHasHeader ? 1 : 0; SCSIZE nEntryCount = aParam.GetEntryCount(); @@ -1645,19 +1643,12 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub) aParam.nDestCol, aParam.nDestRow, aParam.nDestTab ); } - if (aParam.bInplace) - IncRecalcLevel(); // #i116164# once for all entries - - // #i116164# If there are no drawing objects within the area, call SetRowHidden/SetRowFiltered for all rows at the end - std::vector<ScShowRowsEntry> aEntries; - ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer(); - bool bHasObjects = pDrawLayer && pDrawLayer->HasObjectsInRows( nTab, aParam.nRow1 + nHeader, aParam.nRow2, false ); - - for (SCROW j=aParam.nRow1 + nHeader; j<=aParam.nRow2; j++) + InitializeNoteCaptions(); + for (SCROW j=aParam.nRow1 + nHeader; j<=nEndRow; j++) { - BOOL bResult; // Filterergebnis + BOOL bResult; // Filterergebnis BOOL bValid = ValidQuery(j, aParam, pSpecial); - if (!bValid && bKeepSub) // Subtotals stehenlassen + if (!bValid && bKeepSub) // Subtotals stehenlassen { for (SCCOL nCol=aParam.nCol1; nCol<=aParam.nCol2 && !bValid; nCol++) { @@ -1708,11 +1699,7 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub) else { if (bStarted) - { - DBShowRows(nOldStart,nOldEnd, bOldResult, bHasObjects); - if (!bHasObjects) - aEntries.push_back(ScShowRowsEntry(nOldStart, nOldEnd, bOldResult)); - } + DBShowRows(nOldStart,nOldEnd, bOldResult); nOldStart = nOldEnd = j; bOldResult = bResult; } @@ -1731,74 +1718,23 @@ SCSIZE ScTable::Query(ScQueryParam& rParamOrg, BOOL bKeepSub) } if (aParam.bInplace && bStarted) - { - DBShowRows(nOldStart,nOldEnd, bOldResult, bHasObjects); - if (!bHasObjects) - aEntries.push_back(ScShowRowsEntry(nOldStart, nOldEnd, bOldResult)); - } - - // #i116164# execute the collected SetRowHidden/SetRowFiltered calls - if (!bHasObjects) - { - std::vector<ScShowRowsEntry>::const_iterator aEnd = aEntries.end(); - std::vector<ScShowRowsEntry>::const_iterator aIter = aEntries.begin(); - if ( aIter != aEnd ) - { - // do only one HeightChanged call with the final difference in heights - long nOldHeight = 0; - if ( pDrawLayer ) - nOldHeight = static_cast<long>(GetRowHeight(aParam.nRow1 + nHeader, aParam.nRow2)); - - // clear the range first instead of many changes in the middle of the filled array - SetRowHidden(aParam.nRow1 + nHeader, aParam.nRow2, false); - SetRowFiltered(aParam.nRow1 + nHeader, aParam.nRow2, false); - - // insert from back, in case the filter range is large - mpHiddenRows->setInsertFromBack(true); - mpFilteredRows->setInsertFromBack(true); - - while (aIter != aEnd) - { - if (!aIter->mbShow) - { - SCROW nStartRow = aIter->mnRow1; - SCROW nEndRow = aIter->mnRow2; - SetRowHidden(nStartRow, nEndRow, true); - SetRowFiltered(nStartRow, nEndRow, true); - } - ++aIter; - } - - mpHiddenRows->setInsertFromBack(false); - mpFilteredRows->setInsertFromBack(false); - - if ( pDrawLayer ) - { - // if there are no objects in the filtered range, a single HeightChanged call is enough - long nNewHeight = static_cast<long>(GetRowHeight(aParam.nRow1 + nHeader, aParam.nRow2)); - pDrawLayer->HeightChanged( nTab, aParam.nRow1 + nHeader, nNewHeight - nOldHeight ); - } - } - } - - if (aParam.bInplace) - DecRecalcLevel(); + DBShowRows(nOldStart,nOldEnd, bOldResult); delete[] pSpecial; - + SetDrawPageSize(); return nCount; } BOOL ScTable::CreateExcelQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScQueryParam& rQueryParam) { - BOOL bValid = TRUE; + BOOL bValid = TRUE; SCCOL* pFields = new SCCOL[nCol2-nCol1+1]; - String aCellStr; - SCCOL nCol = nCol1; + String aCellStr; + SCCOL nCol = nCol1; DBG_ASSERT( rQueryParam.nTab != SCTAB_MAX, "rQueryParam.nTab no value, not bad but no good" ); - SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab); - SCROW nDBRow1 = rQueryParam.nRow1; - SCCOL nDBCol2 = rQueryParam.nCol2; + SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab); + SCROW nDBRow1 = rQueryParam.nRow1; + SCCOL nDBCol2 = rQueryParam.nCol2; // Erste Zeile muessen Spaltenkoepfe sein while (bValid && (nCol <= nCol2)) { @@ -1888,9 +1824,9 @@ BOOL ScTable::CreateStarQuery(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 SCSIZE nIndex = 0; SCROW nRow = nRow1; DBG_ASSERT( rQueryParam.nTab != SCTAB_MAX, "rQueryParam.nTab no value, not bad but no good" ); - SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab); - SCROW nDBRow1 = rQueryParam.nRow1; - SCCOL nDBCol2 = rQueryParam.nCol2; + SCTAB nDBTab = (rQueryParam.nTab == SCTAB_MAX ? nTab : rQueryParam.nTab); + SCROW nDBRow1 = rQueryParam.nRow1; + SCCOL nDBCol2 = rQueryParam.nCol2; SCSIZE nNewEntries = static_cast<SCSIZE>(nRow2-nRow1+1); rQueryParam.Resize( nNewEntries ); @@ -1994,13 +1930,13 @@ BOOL ScTable::CreateQueryParam(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow nCount = rQueryParam.GetEntryCount(); if (bValid) { - // bQueryByString muss gesetzt sein + // bQueryByString muss gesetzt sein for (i=0; i < nCount; i++) rQueryParam.GetEntry(i).bQueryByString = TRUE; } else { - // nix + // nix for (i=0; i < nCount; i++) rQueryParam.GetEntry(i).Clear(); } @@ -2093,7 +2029,7 @@ ULONG ScTable::GetWeightedCount() const ULONG nCellCount = 0; for ( SCCOL nCol=0; nCol<=MAXCOL; nCol++ ) - if ( aCol[nCol].GetCellCount() ) // GetCellCount ist inline + if ( aCol[nCol].GetCellCount() ) // GetCellCount ist inline nCellCount += aCol[nCol].GetWeightedCount(); return nCellCount; @@ -2104,7 +2040,7 @@ ULONG ScTable::GetCodeCount() const ULONG nCodeCount = 0; for ( SCCOL nCol=0; nCol<=MAXCOL; nCol++ ) - if ( aCol[nCol].GetCellCount() ) // GetCellCount ist inline + if ( aCol[nCol].GetCellCount() ) // GetCellCount ist inline nCodeCount += aCol[nCol].GetCodeCount(); return nCodeCount; @@ -2119,7 +2055,7 @@ sal_Int32 ScTable::GetMaxStringLen( SCCOL nCol, SCROW nRowStart, return 0; } -xub_StrLen ScTable::GetMaxNumberStringLen( +xub_StrLen ScTable::GetMaxNumberStringLen( sal_uInt16& nPrecision, SCCOL nCol, SCROW nRowStart, SCROW nRowEnd ) const { if ( ValidCol(nCol) ) @@ -2132,8 +2068,8 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) { - // Cursor neben einer Markierung nicht beruecksichtigen: - //! nur noch MarkData uebergeben, Cursorposition ggf. hineinselektieren!!! + // Cursor neben einer Markierung nicht beruecksichtigen: + //! nur noch MarkData uebergeben, Cursorposition ggf. hineinselektieren!!! BOOL bSingle = ( rMark.IsMarked() || !rMark.IsMultiMarked() ); // Mehrfachselektion: @@ -2146,7 +2082,7 @@ void ScTable::UpdateSelectionFunction( ScFunctionData& rData, bSingle && ( nCol >= nStartCol && nCol <= nEndCol ), nStartRow, nEndRow ); - // Einfachselektion (oder Cursor) nur wenn nicht negativ (und s.o.): + // Einfachselektion (oder Cursor) nur wenn nicht negativ (und s.o.): if ( bSingle && !rMark.IsMarkNegative() ) for (nCol=nStartCol; nCol<=nEndCol && !rData.bError; nCol++) diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index 42b655532757..4db009a5f578 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.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,7 +86,7 @@ #define _D_MAX_LONG_ (double) 0x7fffffff -extern USHORT nScFillModeMouseModifier; // global.cxx +extern USHORT nScFillModeMouseModifier; // global.cxx // ----------------------------------------------------------------------- @@ -112,9 +112,9 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits // prefer the one at the beginning only if it's followed by a space. // Otherwise, use the number at the end, to enable things like IP addresses. if ( nNum > nNeg && ( cNext == 0 || cNext == ' ' || !CharClass::isAsciiNumeric(cLast) ) ) - { // number at the beginning + { // number at the beginning nVal = aValue.Copy( 0, nNum ).ToInt32(); - // #60893# any number with a leading zero sets the minimum number of digits + // #60893# any number with a leading zero sets the minimum number of digits if ( p[nNeg] == '0' && pMinDigits && ( nNum - nNeg > *pMinDigits ) ) *pMinDigits = nNum - nNeg; aValue.Erase( 0, nNum ); @@ -132,9 +132,9 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits nNeg = 1; } if ( nNum < nEnd - nNeg ) - { // number at the end + { // number at the end nVal = aValue.Copy( nNum + 1 ).ToInt32(); - // #60893# any number with a leading zero sets the minimum number of digits + // #60893# any number with a leading zero sets the minimum number of digits if ( p[nNum+1+nNeg] == '0' && pMinDigits && ( nEnd - nNum - nNeg > *pMinDigits ) ) *pMinDigits = nEnd - nNum - nNeg; aValue.Erase( nNum + 1 ); @@ -148,7 +148,7 @@ short lcl_DecompValueString( String& aValue, sal_Int32& nVal, USHORT* pMinDigits String lcl_ValueString( sal_Int32 nValue, USHORT nMinDigits ) { if ( nMinDigits <= 1 ) - return String::CreateFromInt32( nValue ); // simple case... + return String::CreateFromInt32( nValue ); // simple case... else { String aStr = String::CreateFromInt32( Abs( nValue ) ); @@ -158,7 +158,7 @@ String lcl_ValueString( sal_Int32 nValue, USHORT nMinDigits ) aZero.Fill( nMinDigits - aStr.Len(), '0' ); aStr.Insert( aZero, 0 ); } - // nMinDigits doesn't include the '-' sign -> add after inserting zeros + // nMinDigits doesn't include the '-' sign -> add after inserting zeros if ( nValue < 0 ) aStr.Insert( '-', 0 ); return aStr; @@ -200,7 +200,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, rListData = NULL; rCmd = FILL_SIMPLE; if ( nScFillModeMouseModifier & KEY_MOD1 ) - return ; // Ctrl-Taste: Copy + return ; // Ctrl-Taste: Copy SCCOL nAddX; SCROW nAddY; @@ -286,7 +286,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, nRow = sal::static_int_cast<SCROW>( nRow + nAddY ); } else - bVal = FALSE; // #50965# kein Datum passt auch nicht + bVal = FALSE; // #50965# kein Datum passt auch nicht } if (bVal) { @@ -301,7 +301,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } } } - else // einzelnes Datum -> Tage hochzaehlen + else // einzelnes Datum -> Tage hochzaehlen { rCmd = FILL_DATE; rDateCmd = FILL_DAY; @@ -360,8 +360,8 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } else if ( nCount > 1 ) { - // pass rMinDigits to all DecompValueString calls - // -> longest number defines rMinDigits + // pass rMinDigits to all DecompValueString calls + // -> longest number defines rMinDigits sal_Int32 nVal1; short nFlag1 = lcl_DecompValueString( aStr, nVal1, &rMinDigits ); @@ -409,7 +409,7 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } else { - // call DecompValueString to set rMinDigits + // call DecompValueString to set rMinDigits sal_Int32 nDummy; lcl_DecompValueString( aStr, nDummy, &rMinDigits ); } @@ -419,11 +419,11 @@ void ScTable::FillAnalyse( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, void ScTable::FillFormula(ULONG& /* nFormulaCounter */, BOOL /* bFirst */, ScFormulaCell* pSrcCell, SCCOL nDestCol, SCROW nDestRow, BOOL bLast ) { -/* USHORT nTokArrLen = pSrcCell->GetTokenArrayLen(); - if ( nTokArrLen > 15 ) // mehr als =A1 oder =67 +/* USHORT nTokArrLen = pSrcCell->GetTokenArrayLen(); + if ( nTokArrLen > 15 ) // mehr als =A1 oder =67 { ScRangeName* pRangeName = pDocument->GetRangeName(); - String aName("___SC_"); // Wird dieser String veraendert, + String aName("___SC_"); // Wird dieser String veraendert, // auch in document2 EraseNonUsed... // mitaendern!! aName += pRangeName->GetSharedMaxIndex() + 1; @@ -456,8 +456,8 @@ void ScTable::FillFormula(ULONG& /* nFormulaCounter */, BOOL /* bFirst */, ScFor aCol[nDestCol].Insert(nDestRow, pDestCell); } else -*/ { - pDocument->SetNoListening( TRUE ); // noch falsche Referenzen +*/ { + pDocument->SetNoListening( TRUE ); // noch falsche Referenzen ScAddress aAddr( nDestCol, nDestRow, nTab ); ScFormulaCell* pDestCell = new ScFormulaCell( *pSrcCell, *pDocument, aAddr ); aCol[nDestCol].Insert(nDestRow, pDestCell); @@ -504,7 +504,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, return; // - // Richtung auswerten + // Richtung auswerten // BOOL bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP); @@ -512,7 +512,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nCol = 0; ULONG nRow = 0; - ULONG& rInner = bVertical ? nRow : nCol; // Schleifenvariablen + ULONG& rInner = bVertical ? nRow : nCol; // Schleifenvariablen ULONG& rOuter = bVertical ? nCol : nRow; ULONG nOStart; ULONG nOEnd; @@ -570,15 +570,15 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nProgress = rProgress.GetState(); // - // ausfuehren + // ausfuehren // ULONG nActFormCnt = 0; for (rOuter = nOStart; rOuter <= nOEnd; rOuter++) { - ULONG nMaxFormCnt = 0; // fuer Formeln + ULONG nMaxFormCnt = 0; // fuer Formeln - // Attributierung uebertragen + // Attributierung uebertragen const ScPatternAttr* pSrcPattern = NULL; const ScStyleSheet* pStyleSheet = NULL; @@ -592,13 +592,13 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, { if ( pNewPattern ) delete pNewPattern; - if (bVertical) // rInner&:=nRow, rOuter&:=nCol + if (bVertical) // rInner&:=nRow, rOuter&:=nCol pSrcPattern = aCol[nCol].GetPattern(static_cast<SCROW>(nAtSrc)); else // rInner&:=nCol, rOuter&:=nRow pSrcPattern = aCol[nAtSrc].GetPattern(static_cast<SCROW>(nRow)); bGetPattern = FALSE; pStyleSheet = pSrcPattern->GetStyleSheet(); - // Merge/Mergeflag nicht uebernehmen, + // Merge/Mergeflag nicht uebernehmen, const SfxItemSet& rSet = pSrcPattern->GetItemSet(); if ( rSet.GetItemState(ATTR_MERGE, FALSE) == SFX_ITEM_SET || rSet.GetItemState(ATTR_MERGE_FLAG, FALSE) == SFX_ITEM_SET ) @@ -614,10 +614,10 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if ( bVertical && nISrcStart == nISrcEnd ) { - // Attribute komplett am Stueck setzen + // Attribute komplett am Stueck setzen if (pNewPattern || pSrcPattern != pDocument->GetDefPattern()) { - // Default steht schon da (DeleteArea) + // Default steht schon da (DeleteArea) SCROW nY1 = static_cast<SCROW>(Min( nIStart, nIEnd )); SCROW nY2 = static_cast<SCROW>(Max( nIStart, nIEnd )); if ( pStyleSheet ) @@ -627,17 +627,17 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, else aCol[nCol].ApplyPatternArea( nY1, nY2, *pSrcPattern ); } - break; // Schleife abbrechen + break; // Schleife abbrechen } if ( pSrcPattern != aCol[nCol].GetPattern( static_cast<SCROW>(nRow) ) ) { - // Vorlage auch uebernehmen - //! am AttrArray mit ApplyPattern zusammenfassen ?? + // Vorlage auch uebernehmen + //! am AttrArray mit ApplyPattern zusammenfassen ?? if ( pStyleSheet ) aCol[nCol].ApplyStyle( static_cast<SCROW>(nRow), *pStyleSheet ); - // ApplyPattern statt SetPattern um alte MergeFlags stehenzulassen + // ApplyPattern statt SetPattern um alte MergeFlags stehenzulassen if ( pNewPattern ) aCol[nCol].ApplyPattern( static_cast<SCROW>(nRow), *pNewPattern ); else @@ -647,7 +647,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (nAtSrc==nISrcEnd) { if ( nAtSrc != nISrcStart ) - { // mehr als eine Source-Zelle + { // mehr als eine Source-Zelle nAtSrc = nISrcStart; bGetPattern = TRUE; } @@ -669,7 +669,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if ( pNewPattern ) delete pNewPattern; - // Analyse + // Analyse FillCmd eFillCmd; FillDateCmd eDateCmd; @@ -694,7 +694,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, USHORT nListCount = pListData->GetSubCount(); if ( !bPositive ) { - // nListIndex auf FillAnalyse zeigt auf den letzten Eintrag -> anpassen + // nListIndex auf FillAnalyse zeigt auf den letzten Eintrag -> anpassen ULONG nSub = nISrcStart - nISrcEnd; for (ULONG i=0; i<nSub; i++) { @@ -724,7 +724,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, nProgress += nIMax - nIMin + 1; rProgress.SetStateOnPercent( nProgress ); } - else if (eFillCmd == FILL_SIMPLE) // Auffuellen mit Muster + else if (eFillCmd == FILL_SIMPLE) // Auffuellen mit Muster { ULONG nSource = nISrcStart; double nDelta; @@ -751,9 +751,9 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, { if ( bGetCell ) { - if (bVertical) // rInner&:=nRow, rOuter&:=nCol + if (bVertical) // rInner&:=nRow, rOuter&:=nCol pSrcCell = aCol[nCol].GetCell( static_cast<SCROW>(nSource) ); - else // rInner&:=nCol, rOuter&:=nRow + else // rInner&:=nCol, rOuter&:=nRow pSrcCell = aCol[nSource].GetCell( static_cast<SCROW>(nRow) ); bGetCell = FALSE; if ( pSrcCell ) @@ -772,7 +772,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ((ScEditCell*)pSrcCell)->GetString( aValue ); if ( !(nScFillModeMouseModifier & KEY_MOD1) ) { - nCellDigits = 0; // look at each source cell individually + nCellDigits = 0; // look at each source cell individually nHeadNoneTail = lcl_DecompValueString( aValue, nStringValue, &nCellDigits ); @@ -852,7 +852,7 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (nSource==nISrcEnd) { if ( nSource != nISrcStart ) - { // mehr als eine Source-Zelle + { // mehr als eine Source-Zelle nSource = nISrcStart; bGetCell = TRUE; } @@ -877,8 +877,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bGetCell = TRUE; } - // Progress in der inneren Schleife nur bei teuren Zellen, - // und auch dann nicht fuer jede einzelne + // Progress in der inneren Schleife nur bei teuren Zellen, + // und auch dann nicht fuer jede einzelne ++nProgress; if ( eCellType == CELLTYPE_FORMULA || eCellType == CELLTYPE_EDIT ) @@ -923,29 +923,29 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n long nIndex = 0; ULONG nSrcCount = 0; FillDir eFillDir = FILL_TO_BOTTOM; - if ( nEndX == nCol2 && nEndY == nRow2 ) // leer + if ( nEndX == nCol2 && nEndY == nRow2 ) // leer bOk = FALSE; - else if ( nEndX == nCol2 ) // nach oben/unten + else if ( nEndX == nCol2 ) // nach oben/unten { - nEndX = nCol2 = nCol1; // nur erste Spalte ansehen + nEndX = nCol2 = nCol1; // nur erste Spalte ansehen nSrcCount = nRow2 - nRow1 + 1; - nIndex = ((long)nEndY) - nRow1; // kann negativ werden + nIndex = ((long)nEndY) - nRow1; // kann negativ werden if ( nEndY >= nRow1 ) eFillDir = FILL_TO_BOTTOM; else eFillDir = FILL_TO_TOP; } - else if ( nEndY == nRow2 ) // nach links/rechts + else if ( nEndY == nRow2 ) // nach links/rechts { - nEndY = nRow2 = nRow1; // nur erste Zeile ansehen + nEndY = nRow2 = nRow1; // nur erste Zeile ansehen nSrcCount = nCol2 - nCol1 + 1; - nIndex = ((long)nEndX) - nCol1; // kann negativ werden + nIndex = ((long)nEndX) - nCol1; // kann negativ werden if ( nEndX >= nCol1 ) eFillDir = FILL_TO_RIGHT; else eFillDir = FILL_TO_LEFT; } - else // Richtung nicht eindeutig + else // Richtung nicht eindeutig bOk = FALSE; if ( bOk ) @@ -959,19 +959,19 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n FillAnalyse(nCol1,nRow1, nCol2,nRow2, eFillCmd,eDateCmd, nInc,nMinDigits, pListData,nListIndex); - if ( pListData ) // benutzerdefinierte Liste + if ( pListData ) // benutzerdefinierte Liste { USHORT nListCount = pListData->GetSubCount(); if ( nListCount ) { - ULONG nSub = nSrcCount - 1; // nListIndex ist vom letzten Source-Eintrag + ULONG nSub = nSrcCount - 1; // nListIndex ist vom letzten Source-Eintrag while ( nIndex < sal::static_int_cast<long>(nSub) ) nIndex += nListCount; ULONG nPos = ( nListIndex + nIndex - nSub ) % nListCount; aValue = pListData->GetSubStr(sal::static_int_cast<USHORT>(nPos)); } } - else if ( eFillCmd == FILL_SIMPLE ) // Auffuellen mit Muster + else if ( eFillCmd == FILL_SIMPLE ) // Auffuellen mit Muster { long nPosIndex = nIndex; while ( nPosIndex < 0 ) @@ -984,14 +984,14 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n else nSrcX = sal::static_int_cast<SCCOL>( nSrcX + static_cast<SCCOL>(nPos) ); - ScBaseCell* pCell = GetCell( nSrcX, nSrcY ); + ScBaseCell* pCell = GetCell( nSrcX, nSrcY ); if ( pCell ) { sal_Int32 nDelta; if (nIndex >= 0) nDelta = nIndex / nSrcCount; else - nDelta = ( nIndex - nSrcCount + 1 ) / nSrcCount; // -1 -> -1 + nDelta = ( nIndex - nSrcCount + 1 ) / nSrcCount; // -1 -> -1 CellType eType = pCell->GetCellType(); switch ( eType ) @@ -1006,7 +1006,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n if ( !(nScFillModeMouseModifier & KEY_MOD1) ) { sal_Int32 nVal; - USHORT nCellDigits = 0; // look at each source cell individually + USHORT nCellDigits = 0; // look at each source cell individually short nFlag = lcl_DecompValueString( aValue, nVal, &nCellDigits ); if ( nFlag < 0 ) { @@ -1022,7 +1022,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n break; case CELLTYPE_VALUE: { - // dabei kann's keinen Ueberlauf geben... + // dabei kann's keinen Ueberlauf geben... double nVal = ((ScValueCell*)pCell)->GetValue(); if ( !(nScFillModeMouseModifier & KEY_MOD1) ) nVal += (double) nDelta; @@ -1033,7 +1033,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n GetOutputString( nVal, nNumFmt, aValue, &pColor ); } break; - // Formeln nicht + // Formeln nicht default: { // added to avoid warnings @@ -1041,13 +1041,13 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n } } } - else if ( eFillCmd == FILL_LINEAR || eFillCmd == FILL_DATE ) // Werte + else if ( eFillCmd == FILL_LINEAR || eFillCmd == FILL_DATE ) // Werte { BOOL bValueOk; double nStart; sal_Int32 nVal = 0; short nHeadNoneTail = 0; - ScBaseCell* pCell = GetCell( nCol1, nRow1 ); + ScBaseCell* pCell = GetCell( nCol1, nRow1 ); if ( pCell ) { CellType eType = pCell->GetCellType(); @@ -1085,7 +1085,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n bValueOk = ( SubTotal::SafeMult( nAdd, (double) nIndex ) && SubTotal::SafePlus( nStart, nAdd ) ); } - else // Datum + else // Datum { bValueOk = TRUE; USHORT nDayOfMonth = 0; @@ -1114,7 +1114,7 @@ String ScTable::GetAutoFillPreview( const ScRange& rSource, SCCOL nEndX, SCROW n } else { - //! Zahlformat je nach Index holen? + //! Zahlformat je nach Index holen? Color* pColor; ULONG nNumFmt = GetNumberFormat( nCol1, nRow1 ); pDocument->GetFormatTable()-> @@ -1143,7 +1143,7 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC const USHORT nMinYear = 1583; const USHORT nMaxYear = 9956; - long nInc = (long) nStep; // nach oben/unten begrenzen ? + long nInc = (long) nStep; // nach oben/unten begrenzen ? Date aNullDate = *pDocument->GetFormatTable()->GetNullDate(); Date aDate = aNullDate; aDate += (long)rVal; @@ -1172,7 +1172,7 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC case FILL_MONTH: { if ( nDayOfMonth == 0 ) - nDayOfMonth = aDate.GetDay(); // init + nDayOfMonth = aDate.GetDay(); // init long nMonth = aDate.GetMonth(); long nYear = aDate.GetYear(); @@ -1191,7 +1191,7 @@ void ScTable::IncDate(double& rVal, USHORT& nDayOfMonth, double nStep, FillDateC { if (nMonth < 1) { - long nYAdd = 1 - nMonth / 12; // positiv + long nYAdd = 1 - nMonth / 12; // positiv nMonth += nYAdd * 12; nYear -= nYAdd; } @@ -1237,7 +1237,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, BOOL bAttribs, ScProgress& rProgress ) { // - // Richtung auswerten + // Richtung auswerten // BOOL bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP); @@ -1245,7 +1245,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nCol = 0; ULONG nRow = 0; - ULONG& rInner = bVertical ? nRow : nCol; // Schleifenvariablen + ULONG& rInner = bVertical ? nRow : nCol; // Schleifenvariablen ULONG& rOuter = bVertical ? nCol : nRow; ULONG nOStart; ULONG nOEnd; @@ -1306,7 +1306,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ULONG nProgress = rProgress.GetState(); // - // ausfuehren + // ausfuehren // ULONG nActFormCnt = 0; @@ -1334,7 +1334,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, { CellType eCellType = pSrcCell->GetCellType(); - if (eFillCmd == FILL_SIMPLE) // kopieren + if (eFillCmd == FILL_SIMPLE) // kopieren { if (eCellType == CELLTYPE_FORMULA) { @@ -1385,8 +1385,8 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, { case FILL_LINEAR: { - // #86365# use multiplication instead of repeated addition - // to avoid accumulating rounding errors + // #86365# use multiplication instead of repeated addition + // to avoid accumulating rounding errors nVal = nStartVal; double nAdd = nStepValue; if ( !SubTotal::SafeMult( nAdd, (double) ++nIndex ) || @@ -1412,7 +1412,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (nStepValue >= 0) { - if (nVal > nMaxValue) // Zielwert erreicht? + if (nVal > nMaxValue) // Zielwert erreicht? { nVal = nMaxValue; bOverflow = TRUE; @@ -1479,8 +1479,8 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, { case FILL_LINEAR: { - // #86365# use multiplication instead of repeated addition - // to avoid accumulating rounding errors + // #86365# use multiplication instead of repeated addition + // to avoid accumulating rounding errors nVal = nStartVal; double nAdd = nStepValue; if ( !SubTotal::SafeMult( nAdd, (double) ++nIndex ) || @@ -1500,7 +1500,7 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (nStepValue >= 0) { - if (nVal > nMaxValue) // Zielwert erreicht? + if (nVal > nMaxValue) // Zielwert erreicht? { nVal = nMaxValue; bOverflow = TRUE; @@ -1576,9 +1576,9 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, FillSeries(nCol1, nRow1, nCol2, nRow2, nFillCount, eFillDir, eFillCmd, eFillDateCmd, nStepValue, nMaxValue, 0, TRUE, aProgress); - if (bSharedNameInserted) // Wurde Shared-Name eingefuegt? + if (bSharedNameInserted) // Wurde Shared-Name eingefuegt? pDocument->GetRangeName()->SetSharedMaxIndex( - pDocument->GetRangeName()->GetSharedMaxIndex()+1); // dann hochzaehlen + pDocument->GetRangeName()->GetSharedMaxIndex()+1); // dann hochzaehlen } @@ -1591,7 +1591,7 @@ void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SC ScAutoFormatData* pData = (*pAutoFormat)[nFormatNo]; if (pData) { -// ScPatternAttr aPattern(pDocument->GetPool()); +// ScPatternAttr aPattern(pDocument->GetPool()); // pData->FillToItemSet(nIndex, aPattern.GetItemSet(), *pDocument); ApplyPatternArea(nStartCol, nStartRow, nEndCol, nEndRow, rAttr); } @@ -1743,7 +1743,7 @@ void ScTable::AutoFormat( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW void ScTable::GetAutoFormatAttr(SCCOL nCol, SCROW nRow, USHORT nIndex, ScAutoFormatData& rData) { UINT32 nFormatIndex = GetNumberFormat( nCol, nRow ); - ScNumFormatAbbrev aNumFormat( nFormatIndex, *pDocument->GetFormatTable() ); + ScNumFormatAbbrev aNumFormat( nFormatIndex, *pDocument->GetFormatTable() ); rData.GetFromItemSet( nIndex, GetPattern( nCol, nRow )->GetItemSet(), aNumFormat ); } @@ -1900,7 +1900,7 @@ void ScTable::UpdateInsertTabAbs(SCTAB nTable) BOOL ScTable::GetNextSpellingCell(SCCOL& rCol, SCROW& rRow, BOOL bInSel, const ScMarkData& rMark) const { - if (rRow == MAXROW+2) // Tabellenende + if (rRow == MAXROW+2) // Tabellenende { rRow = 0; rCol = 0; diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index 04c43a2eaf27..4f39892d9ce1 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.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,7 +63,7 @@ using ::std::set; // STATIC DATA ----------------------------------------------------------- -#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() +#define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) @@ -71,14 +71,14 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) if ( pDocument->IsImportingXML() ) return; - // pUserArea != NULL -> print area is specified. We need to force-update + // pUserArea != NULL -> print area is specified. We need to force-update // the page breaks. if (!pUserArea) { if (!bPageSizeValid) return; - + if (mbPageBreaksValid) return; } @@ -110,7 +110,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) USHORT nAreaCount = GetPrintRangeCount(); if ( nAreaCount > 1 ) { - // bei mehreren Bereichen nichts anzeigen: + // bei mehreren Bereichen nichts anzeigen: for (nX=0; nX<MAXCOL; nX++) RemoveColBreak(nX, true, false); @@ -129,7 +129,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) nEndCol = pArea->aEnd.Col(); nEndRow = pArea->aEnd.Row(); } - } // sonst alles + } // sonst alles } // get bSkipColBreaks/bSkipRowBreaks flags: @@ -168,7 +168,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) long nPageSizeX = aPageSizeTwips.Width(); long nPageSizeY = aPageSizeTwips.Height(); - // Anfang: Breaks loeschen + // Anfang: Breaks loeschen for (nX=0; nX<nStartCol; nX++) RemoveColBreak(nX, true, false); @@ -179,7 +179,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) if (nStartRow > 0) SetRowBreak(nStartRow, true, false); // AREABREAK - // Mittelteil: Breaks verteilen + // Mittelteil: Breaks verteilen BOOL bRepeatCol = ( nRepeatStartX != SCCOL_REPEAT_NONE ); BOOL bColFound = FALSE; @@ -231,7 +231,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) long nThisY = 0; if (!bThisRowHidden) { - sal_uInt16 nTmp; + sal_uInt16 nTmp; aIterHeights.getValue(nY, nTmp); nThisY = static_cast<long>(nTmp); } @@ -287,7 +287,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) SCROW nLastCommon = ::std::min(nLastHidden, nLastHeight); if (nNextManualBreak >= 0) nLastCommon = ::std::min(nLastCommon, nNextManualBreak-1); - + if (nLastCommon > nY) { long nMaxMultiple = static_cast<long>(nLastCommon - nY); @@ -305,7 +305,7 @@ void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) nSizeY += nThisY; } - // Ende: Breaks loeschen + // Ende: Breaks loeschen if (nEndCol < MAXCOL) { @@ -360,7 +360,7 @@ void ScTable::GetAllRowBreaks(set<SCROW>& rBreaks, bool bPage, bool bManual) con if (bManual) { - using namespace std; + using namespace std; copy(maRowManualBreaks.begin(), maRowManualBreaks.end(), inserter(rBreaks, rBreaks.begin())); } } @@ -436,7 +436,7 @@ void ScTable::RemoveRowBreak(SCROW nRow, bool bPage, bool bManual) maRowPageBreaks.erase(nRow); if (bManual) - { + { maRowManualBreaks.erase(nRow); InvalidatePageBreaks(); } @@ -451,7 +451,7 @@ void ScTable::RemoveColBreak(SCCOL nCol, bool bPage, bool bManual) maColPageBreaks.erase(nCol); if (bManual) - { + { maColManualBreaks.erase(nCol); InvalidatePageBreaks(); } @@ -466,7 +466,7 @@ void ScTable::SetRowBreak(SCROW nRow, bool bPage, bool bManual) maRowPageBreaks.insert(nRow); if (bManual) - { + { maRowManualBreaks.insert(nRow); InvalidatePageBreaks(); } @@ -481,7 +481,7 @@ void ScTable::SetColBreak(SCCOL nCol, bool bPage, bool bManual) maColPageBreaks.insert(nCol); if (bManual) - { + { maColManualBreaks.insert(nCol); InvalidatePageBreaks(); } @@ -543,7 +543,7 @@ bool ScTable::RowHidden(SCROW nRow, SCROW* pFirstRow, SCROW* pLastRow) const bool ScTable::RowHidden(SCROW nRow, SCROW& rLastRow) const { - rLastRow = nRow; + rLastRow = nRow; if (!ValidRow(nRow)) return true; @@ -573,7 +573,7 @@ bool ScTable::HasHiddenRows(SCROW nStartRow, SCROW nEndRow) const bool ScTable::ColHidden(SCCOL nCol, SCCOL& rLastCol) const { - rLastCol = nCol; + rLastCol = nCol; if (!ValidCol(nCol)) return true; @@ -1062,7 +1062,7 @@ Size ScTable::GetPageSize() const if ( bPageSizeValid ) return aPageSizeTwips; else - return Size(); // leer + return Size(); // leer } void ScTable::SetRepeatArea( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ) @@ -1087,9 +1087,9 @@ void ScTable::SetPageStyle( const String& rName ) { if ( aPageStyle != rName ) { - String aStrNew = rName; - SfxStyleSheetBasePool* pStylePool = pDocument->GetStyleSheetPool(); - SfxStyleSheetBase* pNewStyle = pStylePool->Find( aStrNew, SFX_STYLE_FAMILY_PAGE ); + String aStrNew = rName; + SfxStyleSheetBasePool* pStylePool = pDocument->GetStyleSheetPool(); + SfxStyleSheetBase* pNewStyle = pStylePool->Find( aStrNew, SFX_STYLE_FAMILY_PAGE ); if ( !pNewStyle ) { @@ -1103,18 +1103,18 @@ void ScTable::SetPageStyle( const String& rName ) if ( pOldStyle && pNewStyle ) { - SfxItemSet& rOldSet = pOldStyle->GetItemSet(); - SfxItemSet& rNewSet = pNewStyle->GetItemSet(); - const USHORT nOldScale = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALE); + SfxItemSet& rOldSet = pOldStyle->GetItemSet(); + SfxItemSet& rNewSet = pNewStyle->GetItemSet(); + const USHORT nOldScale = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALE); const USHORT nOldScaleToPages = GET_SCALEVALUE(rOldSet,ATTR_PAGE_SCALETOPAGES); - const USHORT nNewScale = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALE); + const USHORT nNewScale = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALE); const USHORT nNewScaleToPages = GET_SCALEVALUE(rNewSet,ATTR_PAGE_SCALETOPAGES); if ( (nOldScale != nNewScale) || (nOldScaleToPages != nNewScaleToPages) ) InvalidateTextWidth(NULL, NULL, FALSE, FALSE); } - if ( pNewStyle ) // auch ohne den alten (fuer UpdateStdNames) + if ( pNewStyle ) // auch ohne den alten (fuer UpdateStdNames) aPageStyle = aStrNew; if (IsStreamValid()) @@ -1141,7 +1141,7 @@ void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* p if ( bNumFormatChanged ) pCell->SetScriptType( SC_SCRIPTTYPE_UNKNOWN ); if ( bBroadcast ) - { // nur bei CalcAsShown + { // nur bei CalcAsShown switch ( pCell->GetCellType() ) { case CELLTYPE_VALUE : @@ -1170,8 +1170,8 @@ void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* p for ( SCCOL nCol=nColStart; nCol<=nColEnd; nCol++ ) { ScColumnIterator aIter( &aCol[nCol], nRowStart, nRowEnd ); - ScBaseCell* pCell = NULL; - SCROW nRow = nRowStart; + ScBaseCell* pCell = NULL; + SCROW nRow = nRowStart; while ( aIter.Next( nRow, pCell ) ) { @@ -1179,7 +1179,7 @@ void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* p if ( bNumFormatChanged ) pCell->SetScriptType( SC_SCRIPTTYPE_UNKNOWN ); if ( bBroadcast ) - { // nur bei CalcAsShown + { // nur bei CalcAsShown switch ( pCell->GetCellType() ) { case CELLTYPE_VALUE : diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index b71d55aeebb6..566c420f95ce 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.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,7 +54,7 @@ using ::com::sun::star::util::SearchOptions; BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& rVal ) { - // TRUE = more than 1 paragraph + // TRUE = more than 1 paragraph const EditTextObject* pData = NULL; rCell.GetData( pData ); @@ -67,11 +67,11 @@ BOOL lcl_GetTextWithBreaks( const ScEditCell& rCell, ScDocument* pDoc, String& r BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRow, const ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc) { - BOOL bFound = FALSE; - BOOL bDoSearch = TRUE; - BOOL bDoBack = rSearchItem.GetBackward(); + BOOL bFound = FALSE; + BOOL bDoSearch = TRUE; + BOOL bDoBack = rSearchItem.GetBackward(); - String aString; + String aString; ScBaseCell* pCell; if (rSearchItem.GetSelection()) bDoSearch = rMark.IsCellMarked(nCol, nRow); @@ -162,8 +162,8 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo BOOL bRepeat = !rSearchItem.GetWordOnly(); do { - // wenn der gefundene Text leer ist, nicht weitersuchen, - // sonst wuerde man nie mehr aufhoeren (#35410#) + // wenn der gefundene Text leer ist, nicht weitersuchen, + // sonst wuerde man nie mehr aufhoeren (#35410#) if ( nEnd < nStart || nEnd == STRING_MAXLEN ) bRepeat = FALSE; @@ -181,7 +181,7 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo aString.Insert(rSearchItem.GetReplaceString(), nStart); } - // Indizes anpassen + // Indizes anpassen if (bDoBack) { nEnd = nStart; @@ -193,7 +193,7 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo nEnd = aString.Len(); } - // weitersuchen ? + // weitersuchen ? if (bRepeat) { if ( rSearchItem.GetCommand() != SVX_SEARCHCMD_REPLACE_ALL || nStart >= nEnd ) @@ -222,9 +222,9 @@ BOOL ScTable::SearchCell(const SvxSearchItem& rSearchItem, SCCOL nCol, SCROW nRo pNote->SetText( ScAddress( nCol, nRow, nTab ), aString ); } else if ( cMatrixFlag != MM_NONE ) - { // #60558# Matrix nicht zerreissen + { // #60558# Matrix nicht zerreissen if ( aString.Len() > 2 ) - { // {} raus, erst hier damit auch "{=" durch "{=..." ersetzt werden kann + { // {} raus, erst hier damit auch "{=" durch "{=..." ersetzt werden kann if ( aString.GetChar( aString.Len()-1 ) == '}' ) aString.Erase( aString.Len()-1, 1 ); if ( aString.GetChar(0) == '{' ) @@ -440,7 +440,7 @@ BOOL ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, SCCOL nCol = 0; SCROW nRow = -1; - ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren + ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren aNewMark.ResetMark(); do { @@ -450,8 +450,8 @@ BOOL ScTable::SearchAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, } while (bFound); - rMark = aNewMark; // Markierung kopieren - //! pro Tabelle + rMark = aNewMark; // Markierung kopieren + //! pro Tabelle return (aNewMark.IsMultiMarked()); } @@ -488,15 +488,15 @@ BOOL ScTable::Replace(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow BOOL ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, String& rUndoStr, ScDocument* pUndoDoc) { - BOOL bOldDouble = ScColumn::bDoubleAlloc; // sollte immer FALSE sein? + BOOL bOldDouble = ScColumn::bDoubleAlloc; // sollte immer FALSE sein? DBG_ASSERT(!bOldDouble,"bDoubleAlloc ???"); - ScColumn::bDoubleAlloc = TRUE; // fuer Undo-Doc + ScColumn::bDoubleAlloc = TRUE; // fuer Undo-Doc BOOL bFound = TRUE; SCCOL nCol = 0; SCROW nRow = -1; - ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren + ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren aNewMark.ResetMark(); do { @@ -508,8 +508,8 @@ BOOL ScTable::ReplaceAll(const SvxSearchItem& rSearchItem, ScMarkData& rMark, ScColumn::bDoubleAlloc = bOldDouble; - rMark = aNewMark; // Markierung kopieren - //! pro Tabelle + rMark = aNewMark; // Markierung kopieren + //! pro Tabelle return (aNewMark.IsMultiMarked()); } @@ -530,7 +530,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& BOOL bBack = rSearchItem.GetBackward(); short nAdd = bBack ? -1 : 1; - if (bRows) // zeilenweise + if (bRows) // zeilenweise { nRow += nAdd; do @@ -549,18 +549,18 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& } while (!bFound && ValidCol(nCol)); } - else // spaltenweise + else // spaltenweise { SCsROW nNextRows[MAXCOLCOUNT]; SCsCOL i; for (i=0; i<=MAXCOL; i++) { SCsROW nSRow = nRow; - if (bBack) { if (i>=nCol) --nSRow; } - else { if (i<=nCol) ++nSRow; } + if (bBack) { if (i>=nCol) --nSRow; } + else { if (i<=nCol) ++nSRow; } nNextRows[i] = aCol[i].SearchStyle( nSRow, pSearchStyle, bBack, bSelect, rMark ); } - if (bBack) // rueckwaerts + if (bBack) // rueckwaerts { nRow = -1; for (i=MAXCOL; i>=0; i--) @@ -571,7 +571,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& bFound = TRUE; } } - else // vorwaerts + else // vorwaerts { nRow = MAXROW+1; for (i=0; i<=MAXCOL; i++) @@ -592,7 +592,7 @@ BOOL ScTable::SearchStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& return bFound; } -//! einzelnes Pattern fuer Undo zurueckgeben +//! einzelnes Pattern fuer Undo zurueckgeben BOOL ScTable::ReplaceStyle(const SvxSearchItem& rSearchItem, SCCOL& rCol, SCROW& rRow, ScMarkData& rMark, BOOL bIsUndo) @@ -627,7 +627,7 @@ BOOL ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark BOOL bSelect = rSearchItem.GetSelection(); BOOL bBack = rSearchItem.GetBackward(); - ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren + ScMarkData aNewMark( rMark ); // Tabellen-Markierungen kopieren aNewMark.ResetMark(); for (SCCOL i=0; i<=MAXCOL; i++) { @@ -651,8 +651,8 @@ BOOL ScTable::SearchAllStyle(const SvxSearchItem& rSearchItem, ScMarkData& rMark } } - rMark = aNewMark; // Markierung kopieren - //! pro Tabelle + rMark = aNewMark; // Markierung kopieren + //! pro Tabelle return (aNewMark.IsMultiMarked()); } @@ -711,7 +711,7 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem, } else { - // SearchParam no longer needed - SearchOptions contains all settings + // SearchParam no longer needed - SearchOptions contains all settings com::sun::star::util::SearchOptions aSearchOptions = rSearchItem.GetSearchOptions(); aSearchOptions.Locale = *ScGlobal::GetLocale(); @@ -721,9 +721,9 @@ BOOL ScTable::SearchAndReplace(const SvxSearchItem& rSearchItem, return SearchAndReplaceEmptyCells(rSearchItem, rCol, rRow, rMark, rUndoStr, pUndoDoc); } - // #107259# reflect UseAsianOptions flag in SearchOptions - // (use only ignore case and width if asian options are disabled). - // This is also done in SvxSearchDialog CommandHdl, but not in API object. + // #107259# reflect UseAsianOptions flag in SearchOptions + // (use only ignore case and width if asian options are disabled). + // This is also done in SvxSearchDialog CommandHdl, but not in API object. if ( !rSearchItem.IsUseAsianOptions() ) aSearchOptions.transliterateFlags &= ( com::sun::star::i18n::TransliterationModules_IGNORE_CASE | diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index c53c74b6fa2d..f3e87348adc4 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.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 @@ -322,10 +322,10 @@ void ScTableProtectionImpl::setPasswordHash( bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const { -#if DEBUG_TAB_PROTECTION +#if DEBUG_TAB_PROTECTION fprintf(stdout, "ScTableProtectionImpl::verifyPassword: input = '%s'\n", OUStringToOString(rtl::OUString(aPassText), RTL_TEXTENCODING_UTF8).getStr()); -#endif +#endif if (mbEmptyPass) return aPassText.Len() == 0; @@ -337,12 +337,12 @@ bool ScTableProtectionImpl::verifyPassword(const String& aPassText) const Sequence<sal_Int8> aHash = hashPassword(aPassText, meHash1); aHash = hashPassword(aHash, meHash2); -#if DEBUG_TAB_PROTECTION +#if DEBUG_TAB_PROTECTION fprintf(stdout, "ScTableProtectionImpl::verifyPassword: hash = "); for (sal_Int32 i = 0; i < aHash.getLength(); ++i) printf("%2.2X ", static_cast<sal_uInt8>(aHash[i])); printf("\n"); -#endif +#endif return aHash == maPassHash; } diff --git a/sc/source/core/data/userdat.cxx b/sc/source/core/data/userdat.cxx index 443d056a77f7..3f923ec4f7a3 100644 --- a/sc/source/core/data/userdat.cxx +++ b/sc/source/core/data/userdat.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/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 1891c3a92b23..cf7925159929 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.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,7 +68,7 @@ SV_IMPL_OP_PTRARR_SORT( ScValidationEntries_Impl, ScValidationDataPtr ); //------------------------------------------------------------------------ // -// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) +// Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) // ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOper, @@ -110,7 +110,7 @@ ScValidationData::ScValidationData( const ScValidationData& r ) : aErrorTitle( r.aErrorTitle ), aErrorMessage( r.aErrorMessage ) { - // Formeln per RefCount kopiert + // Formeln per RefCount kopiert } ScValidationData::ScValidationData( ScDocument* pDocument, const ScValidationData& r ) : @@ -126,7 +126,7 @@ ScValidationData::ScValidationData( ScDocument* pDocument, const ScValidationDat aErrorTitle( r.aErrorTitle ), aErrorMessage( r.aErrorMessage ) { - // Formeln wirklich kopiert + // Formeln wirklich kopiert } ScValidationData::~ScValidationData() @@ -142,18 +142,18 @@ BOOL ScValidationData::IsEmpty() const BOOL ScValidationData::EqualEntries( const ScValidationData& r ) const { - // gleiche Parameter eingestellt (ohne Key) + // gleiche Parameter eingestellt (ohne Key) return ScConditionEntry::operator==(r) && - eDataMode == r.eDataMode && - bShowInput == r.bShowInput && - bShowError == r.bShowError && - eErrorStyle == r.eErrorStyle && + eDataMode == r.eDataMode && + bShowInput == r.bShowInput && + bShowError == r.bShowError && + eErrorStyle == r.eErrorStyle && mnListType == r.mnListType && - aInputTitle == r.aInputTitle && - aInputMessage == r.aInputMessage && - aErrorTitle == r.aErrorTitle && - aErrorMessage == r.aErrorMessage; + aInputTitle == r.aInputTitle && + aInputMessage == r.aInputMessage && + aErrorTitle == r.aErrorTitle && + aErrorMessage == r.aErrorMessage; } void ScValidationData::ResetInput() @@ -199,16 +199,16 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput, if ( !pDocSh || !pDocument->CheckMacroWarn() ) return FALSE; - BOOL bScriptReturnedFalse = FALSE; // Standard: kein Abbruch + BOOL bScriptReturnedFalse = FALSE; // Standard: kein Abbruch // Set up parameters ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > aParams(2); - // 1) eingegebener / berechneter Wert + // 1) eingegebener / berechneter Wert String aValStr = rInput; double nValue; BOOL bIsValue = FALSE; - if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen + if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen { bIsValue = pCell->IsValue(); if ( bIsValue ) @@ -221,13 +221,13 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput, else aParams[0] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aValStr ) ); - // 2) Position der Zelle + // 2) Position der Zelle String aPosStr; rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() ); aParams[1] = ::com::sun::star::uno::makeAny( ::rtl::OUString( aPosStr ) ); - // use link-update flag to prevent closing the document - // while the macro is running + // use link-update flag to prevent closing the document + // while the macro is running BOOL bWasInLinkUpdate = pDocument->IsInLinkUpdate(); if ( !bWasInLinkUpdate ) pDocument->SetInLinkUpdate( TRUE ); @@ -262,7 +262,7 @@ BOOL ScValidationData::DoScript( const ScAddress& rPos, const String& rInput, if ( eRet == ERRCODE_BASIC_METHOD_NOT_FOUND && !pCell ) // Makro nicht gefunden (nur bei Eingabe) { - //! andere Fehlermeldung, wenn gefunden, aber nicht bAllowed ?? + //! andere Fehlermeldung, wenn gefunden, aber nicht bAllowed ?? ErrorBox aBox( pParent, WinBits(WB_OK), ScGlobal::GetRscString( STR_VALID_MACRONOTFOUND ) ); @@ -288,18 +288,18 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput, return FALSE; BOOL bDone = FALSE; - BOOL bRet = FALSE; // Standard: kein Abbruch + BOOL bRet = FALSE; // Standard: kein Abbruch SfxApplication* pSfxApp = SFX_APP(); - pSfxApp->EnterBasicCall(); // Dok-Basic anlegen etc. + pSfxApp->EnterBasicCall(); // Dok-Basic anlegen etc. - // Wenn das Dok waehrend eines Basic-Calls geladen wurde, - // ist das Sbx-Objekt evtl. nicht angelegt (?) -// pDocSh->GetSbxObject(); + // Wenn das Dok waehrend eines Basic-Calls geladen wurde, + // ist das Sbx-Objekt evtl. nicht angelegt (?) +// pDocSh->GetSbxObject(); - // keine Sicherheitsabfrage mehr vorneweg (nur CheckMacroWarn), das passiert im CallBasic + // keine Sicherheitsabfrage mehr vorneweg (nur CheckMacroWarn), das passiert im CallBasic - // Funktion ueber den einfachen Namen suchen, - // dann aBasicStr, aMacroStr fuer SfxObjectShell::CallBasic zusammenbauen + // Funktion ueber den einfachen Namen suchen, + // dann aBasicStr, aMacroStr fuer SfxObjectShell::CallBasic zusammenbauen StarBASIC* pRoot = pDocSh->GetBasic(); SbxVariable* pVar = pRoot->Find( aErrorTitle, SbxCLASS_METHOD ); @@ -315,24 +315,24 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput, aMacroStr += pMethod->GetName(); String aBasicStr; - // #95867# the distinction between document- and app-basic has to be done - // by checking the parent (as in ScInterpreter::ScMacro), not by looping - // over all open documents, because this may be called from within loading, - // when SfxObjectShell::GetFirst/GetNext won't find the document. + // #95867# the distinction between document- and app-basic has to be done + // by checking the parent (as in ScInterpreter::ScMacro), not by looping + // over all open documents, because this may be called from within loading, + // when SfxObjectShell::GetFirst/GetNext won't find the document. if ( pObject->GetParent() ) - aBasicStr = pObject->GetParent()->GetName(); // Dokumentenbasic + aBasicStr = pObject->GetParent()->GetName(); // Dokumentenbasic else - aBasicStr = SFX_APP()->GetName(); // Applikationsbasic + aBasicStr = SFX_APP()->GetName(); // Applikationsbasic - // Parameter fuer Makro + // Parameter fuer Makro SbxArrayRef refPar = new SbxArray; - // 1) eingegebener / berechneter Wert + // 1) eingegebener / berechneter Wert String aValStr = rInput; double nValue = 0.0; BOOL bIsValue = FALSE; - if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen + if ( pCell ) // wenn Zelle gesetzt, aus Interpret gerufen { bIsValue = pCell->IsValue(); if ( bIsValue ) @@ -345,13 +345,13 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput, else refPar->Get(1)->PutString( aValStr ); - // 2) Position der Zelle + // 2) Position der Zelle String aPosStr; rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() ); refPar->Get(2)->PutString( aPosStr ); - // use link-update flag to prevent closing the document - // while the macro is running + // use link-update flag to prevent closing the document + // while the macro is running BOOL bWasInLinkUpdate = pDocument->IsInLinkUpdate(); if ( !bWasInLinkUpdate ) pDocument->SetInLinkUpdate( TRUE ); @@ -366,16 +366,16 @@ BOOL ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput, if ( !bWasInLinkUpdate ) pDocument->SetInLinkUpdate( FALSE ); - // Eingabe abbrechen, wenn Basic-Makro FALSE zurueckgibt + // Eingabe abbrechen, wenn Basic-Makro FALSE zurueckgibt if ( eRet == ERRCODE_NONE && refRes->GetType() == SbxBOOL && refRes->GetBool() == FALSE ) bRet = TRUE; bDone = TRUE; } pSfxApp->LeaveBasicCall(); - if ( !bDone && !pCell ) // Makro nicht gefunden (nur bei Eingabe) + if ( !bDone && !pCell ) // Makro nicht gefunden (nur bei Eingabe) { - //! andere Fehlermeldung, wenn gefunden, aber nicht bAllowed ?? + //! andere Fehlermeldung, wenn gefunden, aber nicht bAllowed ?? ErrorBox aBox( pParent, WinBits(WB_OK), ScGlobal::GetRscString( STR_VALID_MACRONOTFOUND ) ); @@ -399,17 +399,17 @@ BOOL ScValidationData::DoError( Window* pParent, const String& rInput, if ( eErrorStyle == SC_VALERR_MACRO ) return DoMacro( rPos, rInput, NULL, pParent ); - // Fehlermeldung ausgeben + // Fehlermeldung ausgeben String aTitle = aErrorTitle; if (!aTitle.Len()) - aTitle = ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ); // application title + aTitle = ScGlobal::GetRscString( STR_MSSG_DOSUBTOTALS_0 ); // application title String aMessage = aErrorMessage; if (!aMessage.Len()) aMessage = ScGlobal::GetRscString( STR_VALID_DEFERROR ); - //! ErrorBox / WarningBox / InfoBox ? - //! (bei InfoBox immer nur OK-Button) + //! ErrorBox / WarningBox / InfoBox ? + //! (bei InfoBox immer nur OK-Button) WinBits nStyle = 0; switch (eErrorStyle) @@ -440,17 +440,17 @@ BOOL ScValidationData::IsDataValid( const String& rTest, const ScPatternAttr& rP const ScAddress& rPos ) const { if ( eDataMode == SC_VALID_ANY ) - return TRUE; // alles erlaubt + return TRUE; // alles erlaubt if ( rTest.GetChar(0) == '=' ) - return FALSE; // Formeln sind sonst immer ungueltig + return FALSE; // Formeln sind sonst immer ungueltig if ( !rTest.Len() ) - return IsIgnoreBlank(); // leer: wie eingestellt + return IsIgnoreBlank(); // leer: wie eingestellt SvNumberFormatter* pFormatter = GetDocument()->GetFormatTable(); - // Test, was es denn ist - wie in ScColumn::SetString + // Test, was es denn ist - wie in ScColumn::SetString sal_uInt32 nFormat = rPattern.GetNumberFormat( pFormatter ); @@ -500,8 +500,8 @@ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) c pFCell->GetString( aString ); } break; - default: // Notizen, Broadcaster - return IsIgnoreBlank(); // wie eingestellt + default: // Notizen, Broadcaster + return IsIgnoreBlank(); // wie eingestellt } BOOL bOk = TRUE; @@ -511,23 +511,23 @@ BOOL ScValidationData::IsDataValid( ScBaseCell* pCell, const ScAddress& rPos ) c case SC_VALID_WHOLE: case SC_VALID_DECIMAL: - case SC_VALID_DATE: // Date/Time ist nur Formatierung + case SC_VALID_DATE: // Date/Time ist nur Formatierung case SC_VALID_TIME: bOk = bIsVal; if ( bOk && eDataMode == SC_VALID_WHOLE ) - bOk = ::rtl::math::approxEqual( nVal, floor(nVal+0.5) ); // ganze Zahlen + bOk = ::rtl::math::approxEqual( nVal, floor(nVal+0.5) ); // ganze Zahlen if ( bOk ) bOk = IsCellValid( pCell, rPos ); break; case SC_VALID_CUSTOM: - // fuer Custom muss eOp == SC_COND_DIRECT sein - //! der Wert muss im Dokument stehen !!!!!!!!!!!!!!!!!!!! + // fuer Custom muss eOp == SC_COND_DIRECT sein + //! der Wert muss im Dokument stehen !!!!!!!!!!!!!!!!!!!! bOk = IsCellValid( pCell, rPos ); break; case SC_VALID_TEXTLEN: - bOk = !bIsVal; // nur Text + bOk = !bIsVal; // nur Text if ( bOk ) { double nLenVal = (double) aString.Len(); @@ -762,7 +762,7 @@ bool ScValidationData::GetSelectionFromFormula( TypedScStrCollection* pStrings, //For external reference and a formula that results in an area or array, date formats are still lost. if ( bRef ) { - pDocument->GetInputString((SCCOL)(nCol+aRange.aStart.Col()), + pDocument->GetInputString((SCCOL)(nCol+aRange.aStart.Col()), (SCROW)(nRow+aRange.aStart.Row()), aRange.aStart.Tab() , aValStr); } else @@ -905,32 +905,32 @@ bool ScValidationData::IsListValid( ScBaseCell* pCell, const ScAddress& rPos ) c ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList) : ScValidationEntries_Impl() { - // fuer Ref-Undo - echte Kopie mit neuen Tokens! + // fuer Ref-Undo - echte Kopie mit neuen Tokens! USHORT nCount = rList.Count(); for (USHORT i=0; i<nCount; i++) InsertNew( rList[i]->Clone() ); - //! sortierte Eintraege aus rList schneller einfuegen ??? + //! sortierte Eintraege aus rList schneller einfuegen ??? } ScValidationDataList::ScValidationDataList(ScDocument* pNewDoc, const ScValidationDataList& rList) { - // fuer neues Dokument - echte Kopie mit neuen Tokens! + // fuer neues Dokument - echte Kopie mit neuen Tokens! USHORT nCount = rList.Count(); for (USHORT i=0; i<nCount; i++) InsertNew( rList[i]->Clone(pNewDoc) ); - //! sortierte Eintraege aus rList schneller einfuegen ??? + //! sortierte Eintraege aus rList schneller einfuegen ??? } ScValidationData* ScValidationDataList::GetData( sal_uInt32 nKey ) { - //! binaer suchen + //! binaer suchen USHORT nCount = Count(); for (USHORT i=0; i<nCount; i++) @@ -978,8 +978,8 @@ BOOL ScValidationDataList::operator==( const ScValidationDataList& r ) const USHORT nCount = Count(); BOOL bEqual = ( nCount == r.Count() ); - for (USHORT i=0; i<nCount && bEqual; i++) // Eintraege sind sortiert - if ( !(*this)[i]->EqualEntries(*r[i]) ) // Eintraege unterschiedlich ? + for (USHORT i=0; i<nCount && bEqual; i++) // Eintraege sind sortiert + if ( !(*this)[i]->EqualEntries(*r[i]) ) // Eintraege unterschiedlich ? bEqual = FALSE; return bEqual; diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index 6618c97b6dc9..01de0ca5f926 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.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/core/inc/addinlis.hxx b/sc/source/core/inc/addinlis.hxx index 122d347fa98f..d3cb130b8956 100644 --- a/sc/source/core/inc/addinlis.hxx +++ b/sc/source/core/inc/addinlis.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 @@ -29,7 +29,7 @@ #ifndef SC_ADDINLIS_HXX #define SC_ADDINLIS_HXX -#include "adiasync.hxx" // for ScAddInDocs PtrArr +#include "adiasync.hxx" // for ScAddInDocs PtrArr #include <tools/list.hxx> #include <com/sun/star/sheet/XResultListener.hpp> #include <com/sun/star/sheet/XVolatileResult.hpp> @@ -48,10 +48,10 @@ class ScAddInListener : public cppu::WeakImplHelper2< { private: com::sun::star::uno::Reference<com::sun::star::sheet::XVolatileResult> xVolRes; - com::sun::star::uno::Any aResult; - ScAddInDocs* pDocs; // documents where this is used + com::sun::star::uno::Any aResult; + ScAddInDocs* pDocs; // documents where this is used - static List aAllListeners; + static List aAllListeners; // always allocated via CreateListener ScAddInListener( @@ -60,29 +60,29 @@ private: ScDocument* pD ); public: - virtual ~ScAddInListener(); + virtual ~ScAddInListener(); // create Listener and put it into global list - static ScAddInListener* CreateListener( + static ScAddInListener* CreateListener( com::sun::star::uno::Reference< com::sun::star::sheet::XVolatileResult> xVR, ScDocument* pDoc ); - static ScAddInListener* Get( com::sun::star::uno::Reference< + static ScAddInListener* Get( com::sun::star::uno::Reference< com::sun::star::sheet::XVolatileResult> xVR ); - static void RemoveDocument( ScDocument* pDocument ); + static void RemoveDocument( ScDocument* pDocument ); - BOOL HasDocument( ScDocument* pDoc ) const { return pDocs->Seek_Entry( pDoc ); } - void AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); } - const com::sun::star::uno::Any& GetResult() const { return aResult; } + BOOL HasDocument( ScDocument* pDoc ) const { return pDocs->Seek_Entry( pDoc ); } + void AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); } + const com::sun::star::uno::Any& GetResult() const { return aResult; } // XResultListener - virtual void SAL_CALL modified( const ::com::sun::star::sheet::ResultEvent& aEvent ) + virtual void SAL_CALL modified( const ::com::sun::star::sheet::ResultEvent& aEvent ) throw(::com::sun::star::uno::RuntimeException); // XEventListener - virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) + virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException); // XServiceInfo diff --git a/sc/source/core/inc/adiasync.hxx b/sc/source/core/inc/adiasync.hxx index 69896c08160a..3931d4651c18 100644 --- a/sc/source/core/inc/adiasync.hxx +++ b/sc/source/core/inc/adiasync.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,7 +42,7 @@ void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData ); class ScAddInAsync; typedef ScAddInAsync* ScAddInAsyncPtr; SV_DECL_PTRARR_SORT( ScAddInAsyncs, ScAddInAsyncPtr, 4, 4 ) -extern ScAddInAsyncs theAddInAsyncTbl; // in adiasync.cxx +extern ScAddInAsyncs theAddInAsyncTbl; // in adiasync.cxx class ScDocument; typedef ScDocument* ScAddInDocPtr; @@ -55,14 +55,14 @@ class ScAddInAsync : public SvtBroadcaster private: union { - double nVal; // aktueller Wert - String* pStr; + double nVal; // aktueller Wert + String* pStr; }; - ScAddInDocs* pDocs; // Liste der benutzenden Dokumente - FuncData* pFuncData; // Zeiger auf die Daten in der Collection - ULONG nHandle; // wird von double auf ULONG gecasted - ParamType eType; // PTR_DOUBLE oder PTR_STRING Ergebnis - BOOL bValid; // ob Wert gueltig + ScAddInDocs* pDocs; // Liste der benutzenden Dokumente + FuncData* pFuncData; // Zeiger auf die Daten in der Collection + ULONG nHandle; // wird von double auf ULONG gecasted + ParamType eType; // PTR_DOUBLE oder PTR_STRING Ergebnis + BOOL bValid; // ob Wert gueltig public: // cTor nur wenn ScAddInAsync::Get fehlschlaegt! @@ -71,17 +71,17 @@ public: ScDocument* pDoc ); // default-cTor nur fuer das eine globale aSeekObj !!! ScAddInAsync(); - virtual ~ScAddInAsync(); - static ScAddInAsync* Get( ULONG nHandle ); - static void CallBack( ULONG nHandle, void* pData ); - static void RemoveDocument( ScDocument* pDocument ); - BOOL IsValid() const { return bValid; } - ParamType GetType() const { return eType; } - double GetValue() const { return nVal; } - const String& GetString() const { return *pStr; } - BOOL HasDocument( ScDocument* pDoc ) const + virtual ~ScAddInAsync(); + static ScAddInAsync* Get( ULONG nHandle ); + static void CallBack( ULONG nHandle, void* pData ); + static void RemoveDocument( ScDocument* pDocument ); + BOOL IsValid() const { return bValid; } + ParamType GetType() const { return eType; } + double GetValue() const { return nVal; } + const String& GetString() const { return *pStr; } + BOOL HasDocument( ScDocument* pDoc ) const { return pDocs->Seek_Entry( pDoc ); } - void AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); } + void AddDocument( ScDocument* pDoc ) { pDocs->Insert( pDoc ); } // Vergleichsoperatoren fuer PtrArrSort BOOL operator < ( const ScAddInAsync& r ) { return nHandle < r.nHandle; } diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index 41d21243f237..9fd920642bba 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.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,11 +45,11 @@ class ScBroadcastArea { private: - ScBroadcastArea* pUpdateChainNext; + ScBroadcastArea* pUpdateChainNext; SvtBroadcaster aBroadcaster; ScRange aRange; - ULONG nRefCount; - BOOL bInUpdateChain; + ULONG nRefCount; + BOOL bInUpdateChain; public: ScBroadcastArea( const ScRange& rRange ) @@ -57,18 +57,18 @@ public: nRefCount( 0 ), bInUpdateChain( FALSE ) {} inline SvtBroadcaster& GetBroadcaster() { return aBroadcaster; } inline const SvtBroadcaster& GetBroadcaster() const { return aBroadcaster; } - inline void UpdateRange( const ScRange& rNewRange ) + inline void UpdateRange( const ScRange& rNewRange ) { aRange = rNewRange; } inline const ScRange& GetRange() const { return aRange; } inline const ScAddress& GetStart() const { return aRange.aStart; } inline const ScAddress& GetEnd() const { return aRange.aEnd; } - inline void IncRef() { ++nRefCount; } - inline ULONG DecRef() { return nRefCount ? --nRefCount : 0; } - inline ULONG GetRef() { return nRefCount; } + inline void IncRef() { ++nRefCount; } + inline ULONG DecRef() { return nRefCount ? --nRefCount : 0; } + inline ULONG GetRef() { return nRefCount; } inline ScBroadcastArea* GetUpdateChainNext() const { return pUpdateChainNext; } - inline void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; } - inline BOOL IsInUpdateChain() const { return bInUpdateChain; } - inline void SetInUpdateChain( BOOL b ) { bInUpdateChain = b; } + inline void SetUpdateChainNext( ScBroadcastArea* p ) { pUpdateChainNext = p; } + inline BOOL IsInUpdateChain() const { return bInUpdateChain; } + inline void SetInUpdateChain( BOOL b ) { bInUpdateChain = b; } /** Equalness of this or range. */ inline bool operator==( const ScBroadcastArea & rArea ) const; @@ -128,19 +128,19 @@ class ScBroadcastAreaSlotMachine; class ScBroadcastAreaSlot { private: - ScBroadcastAreas aBroadcastAreaTbl; + ScBroadcastAreas aBroadcastAreaTbl; mutable ScBroadcastArea aTmpSeekBroadcastArea; // for FindBroadcastArea() - ScDocument* pDoc; + ScDocument* pDoc; ScBroadcastAreaSlotMachine* pBASM; ScBroadcastAreas::iterator FindBroadcastArea( const ScRange& rRange ) const; /** - More hypothetical (memory would probably be doomed anyway) check - whether there would be an overflow when adding an area, setting the + More hypothetical (memory would probably be doomed anyway) check + whether there would be an overflow when adding an area, setting the proper state if so. - @return TRUE if a HardRecalcState is effective and area is not to be + @return TRUE if a HardRecalcState is effective and area is not to be added. */ bool CheckHardRecalcStateCondition() const; @@ -149,49 +149,49 @@ public: ScBroadcastAreaSlot( ScDocument* pDoc, ScBroadcastAreaSlotMachine* pBASM ); ~ScBroadcastAreaSlot(); - const ScBroadcastAreas& GetBroadcastAreas() const + const ScBroadcastAreas& GetBroadcastAreas() const { return aBroadcastAreaTbl; } /** Only here new ScBroadcastArea objects are created, prevention of dupes. @param rpArea - If NULL, a new ScBroadcastArea is created and assigned ton the - reference if a matching area wasn't found. If a matching area was - found, that is assigned. In any case, the SvtListener is added to + If NULL, a new ScBroadcastArea is created and assigned ton the + reference if a matching area wasn't found. If a matching area was + found, that is assigned. In any case, the SvtListener is added to the broadcaster. - If not NULL then no listeners are startet, only the area is - inserted and the reference count incremented. Effectively the same + If not NULL then no listeners are startet, only the area is + inserted and the reference count incremented. Effectively the same as InsertListeningArea(), so use that instead. @return - TRUE if rpArea passed was NULL and ScBroadcastArea is newly - created. + TRUE if rpArea passed was NULL and ScBroadcastArea is newly + created. */ - bool StartListeningArea( const ScRange& rRange, + bool StartListeningArea( const ScRange& rRange, SvtListener* pListener, ScBroadcastArea*& rpArea ); /** - Insert a ScBroadcastArea obtained via StartListeningArea() to + Insert a ScBroadcastArea obtained via StartListeningArea() to subsequent slots. */ void InsertListeningArea( ScBroadcastArea* pArea ); - void EndListeningArea( const ScRange& rRange, + void EndListeningArea( const ScRange& rRange, SvtListener* pListener, ScBroadcastArea*& rpArea ); - BOOL AreaBroadcast( const ScHint& rHint ) const; + BOOL AreaBroadcast( const ScHint& rHint ) const; /// @return TRUE if at least one broadcast occurred. - BOOL AreaBroadcastInRange( const ScRange& rRange, + BOOL AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const; - void DelBroadcastAreasInRange( const ScRange& rRange ); - void UpdateRemove( UpdateRefMode eUpdateRefMode, + void DelBroadcastAreasInRange( const ScRange& rRange ); + void UpdateRemove( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void UpdateRemoveArea( ScBroadcastArea* pArea ); - void UpdateInsert( ScBroadcastArea* pArea ); + void UpdateInsert( ScBroadcastArea* pArea ); }; @@ -223,14 +223,14 @@ private: inline ScBroadcastAreaSlot** getSlots() { return ppSlots; } /** - Obtain slot pointer, no check on validity! It is assumed that - all calls are made with the results of ComputeSlotOffset(), + Obtain slot pointer, no check on validity! It is assumed that + all calls are made with the results of ComputeSlotOffset(), ComputeAreaPoints() and ComputeNextSlot() */ inline ScBroadcastAreaSlot* getAreaSlot( SCSIZE nOff ) { return *(ppSlots + nOff); } private: - ScBroadcastAreaSlot** ppSlots; + ScBroadcastAreaSlot** ppSlots; // prevent usage TableSlots( const TableSlots& ); @@ -248,23 +248,23 @@ private: ScBroadcastArea *pEOUpdateChain; ULONG nInBulkBroadcast; - inline SCSIZE ComputeSlotOffset( const ScAddress& rAddress ) const; - void ComputeAreaPoints( const ScRange& rRange, + inline SCSIZE ComputeSlotOffset( const ScAddress& rAddress ) const; + void ComputeAreaPoints( const ScRange& rRange, SCSIZE& nStart, SCSIZE& nEnd, SCSIZE& nRowBreak ) const; public: ScBroadcastAreaSlotMachine( ScDocument* pDoc ); ~ScBroadcastAreaSlotMachine(); - void StartListeningArea( const ScRange& rRange, + void StartListeningArea( const ScRange& rRange, SvtListener* pListener ); - void EndListeningArea( const ScRange& rRange, + void EndListeningArea( const ScRange& rRange, SvtListener* pListener ); - BOOL AreaBroadcast( const ScHint& rHint ) const; + BOOL AreaBroadcast( const ScHint& rHint ) const; // return: at least one broadcast occurred BOOL AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const; - void DelBroadcastAreasInRange( const ScRange& rRange ); - void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, + void DelBroadcastAreasInRange( const ScRange& rRange ); + void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ); void EnterBulkBroadcast(); diff --git a/sc/source/core/inc/cellkeytranslator.hxx b/sc/source/core/inc/cellkeytranslator.hxx index cc496845020c..3b5d3cba6cd1 100644 --- a/sc/source/core/inc/cellkeytranslator.hxx +++ b/sc/source/core/inc/cellkeytranslator.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 @@ -52,18 +52,18 @@ struct ScCellKeyword typedef ::std::hash_map< String, ::std::list<ScCellKeyword>, ScStringHashCode, ::std::equal_to<String> > ScCellKeywordHashMap; /** Translate cell function keywords. - + This class provides a convenient way to translate a string keyword used as a cell function argument. Since Calc's built-in cell functions don't localize string keywords, this class is used mainly to deal with an Excel document where string names may be localized. - + To use, simply call the - + ScCellKeywordTranslator::transKeyword(...) - + function. - + Note that when the locale and/or the opcode is specified, the function tries to find a string with matching locale and/or opcode. But when it fails to find one that satisfies the specified locale and/or opcode, it @@ -79,8 +79,8 @@ private: ScCellKeywordTranslator(); void init(); - void addToMap(const String& rKey, const sal_Char* pName, - const ::com::sun::star::lang::Locale& rLocale, + void addToMap(const String& rKey, const sal_Char* pName, + const ::com::sun::star::lang::Locale& rLocale, OpCode eOpCode = ocNone); void addToMap(const TransItem* pItems, const ::com::sun::star::lang::Locale& rLocale); diff --git a/sc/source/core/inc/core_pch.hxx b/sc/source/core/inc/core_pch.hxx index 1bf84a913c30..413decef392a 100644 --- a/sc/source/core/inc/core_pch.hxx +++ b/sc/source/core/inc/core_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. must be included first +// ItemID-Defines etc. must be included first #include "scitems.hxx" diff --git a/sc/source/core/inc/ddelink.hxx b/sc/source/core/inc/ddelink.hxx index 89127e4dfba0..48b927607afd 100644 --- a/sc/source/core/inc/ddelink.hxx +++ b/sc/source/core/inc/ddelink.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,18 +42,18 @@ class SvStream; class ScDdeLink : public ::sfx2::SvBaseLink, public SvtBroadcaster { private: -static BOOL bIsInUpdate; +static BOOL bIsInUpdate; - ScDocument* pDoc; + ScDocument* pDoc; - String aAppl; // Verbindungsdaten - String aTopic; - String aItem; - BYTE nMode; // Zahlformat-Modus + String aAppl; // Verbindungsdaten + String aTopic; + String aItem; + BYTE nMode; // Zahlformat-Modus - BOOL bNeedUpdate; // wird gesetzt, wenn Update nicht moeglich war + BOOL bNeedUpdate; // wird gesetzt, wenn Update nicht moeglich war - ScMatrixRef pResult; // Ergebnis + ScMatrixRef pResult; // Ergebnis public: TYPEINFO(); @@ -65,14 +65,14 @@ public: ScDdeLink( ScDocument* pD, const ScDdeLink& rOther ); virtual ~ScDdeLink(); - void Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; + void Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const; // von SvBaseLink ueberladen: - virtual void DataChanged( const String& rMimeType, + virtual void DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ); // von SvtBroadcaster ueberladen: - virtual void ListenersGone(); + virtual void ListenersGone(); // fuer Interpreter: @@ -82,17 +82,17 @@ public: // XML and Excel import after NewData() ScMatrixRef GetModifiableResult() { return pResult; } - const String& GetAppl() const { return aAppl; } - const String& GetTopic() const { return aTopic; } - const String& GetItem() const { return aItem; } - BYTE GetMode() const { return nMode; } + const String& GetAppl() const { return aAppl; } + const String& GetTopic() const { return aTopic; } + const String& GetItem() const { return aItem; } + BYTE GetMode() const { return nMode; } - void ResetValue(); // Wert zuruecksetzen - void TryUpdate(); + void ResetValue(); // Wert zuruecksetzen + void TryUpdate(); - BOOL NeedsUpdate() const { return bNeedUpdate; } + BOOL NeedsUpdate() const { return bNeedUpdate; } - static BOOL IsInUpdate() { return bIsInUpdate; } + static BOOL IsInUpdate() { return bIsInUpdate; } }; diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx index 74094240d218..f4f3f2449ae0 100644 --- a/sc/source/core/inc/doubleref.hxx +++ b/sc/source/core/inc/doubleref.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,8 +42,8 @@ struct ScQueryParamBase; // ============================================================================ -/** - * Base class for abstracting range data backends for database functions. +/** + * Base class for abstracting range data backends for database functions. */ class ScDBRangeBase { @@ -58,9 +58,9 @@ public: virtual SCROW getRowSize() const = 0; virtual SCSIZE getVisibleDataCellCount() const = 0; - /** - * Get a string value of a specified cell position. Note that the - * position of the upper left cell of the range is always (0, 0) even if + /** + * Get a string value of a specified cell position. Note that the + * position of the upper left cell of the range is always (0, 0) even if * the reference type is of internal range. * * @param nCol column position (0 to column size-1) @@ -70,13 +70,13 @@ public: virtual SCCOL getFirstFieldColumn() const = 0; - /** + /** * Get a <i>0-based</i> column index that corresponds with the passed field - * index. Note that the field index passed as the 1st parameter is - * <i>1-based.</i> + * index. Note that the field index passed as the 1st parameter is + * <i>1-based.</i> * * @param nIndex 1-based field index. - * + * * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const = 0; @@ -88,8 +88,8 @@ protected: ScDBRangeBase(ScDocument* pDoc, RefType eType); ScDocument* getDoc() const; - /** - * Populate query options that are always the same for all database + /** + * Populate query options that are always the same for all database * queries. */ static void fillQueryOptions(ScQueryParamBase* pParam); @@ -115,9 +115,9 @@ public: virtual SCROW getRowSize() const; virtual SCSIZE getVisibleDataCellCount() const; - /** - * Get a string value of a specified cell position. Note that the - * position of the upper left cell of the range is always (0, 0) even if + /** + * Get a string value of a specified cell position. Note that the + * position of the upper left cell of the range is always (0, 0) even if * the reference type is of internal range. * * @param nCol column position (0 to column size-1) @@ -126,13 +126,13 @@ public: virtual ::rtl::OUString getString(SCCOL nCol, SCROW nRow) const; virtual SCCOL getFirstFieldColumn() const; - /** + /** * Get a <i>0-based</i> column index that corresponds with the passed field - * index. Note that the field index passed as the 1st parameter is - * <i>1-based.</i> + * index. Note that the field index passed as the 1st parameter is + * <i>1-based.</i> * * @param nIndex 1-based field index. - * + * * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const; @@ -159,9 +159,9 @@ public: virtual SCROW getRowSize() const; virtual SCSIZE getVisibleDataCellCount() const; - /** - * Get a string value of a specified cell position. Note that the - * position of the upper left cell of the range is always (0, 0) even if + /** + * Get a string value of a specified cell position. Note that the + * position of the upper left cell of the range is always (0, 0) even if * the reference type is of internal range. * * @param nCol column position (0 to column size-1) @@ -171,13 +171,13 @@ public: virtual SCCOL getFirstFieldColumn() const; - /** + /** * Get a <i>0-based</i> column index that corresponds with the passed field - * index. Note that the field index passed as the 1st parameter is - * <i>1-based.</i> + * index. Note that the field index passed as the 1st parameter is + * <i>1-based.</i> * * @param nIndex 1-based field index. - * + * * @return 0-based column index */ virtual SCCOL findFieldColumn(SCCOL nIndex) const; diff --git a/sc/source/core/inc/jumpmatrix.hxx b/sc/source/core/inc/jumpmatrix.hxx index d5e3703227fe..38e2480e359a 100644 --- a/sc/source/core/inc/jumpmatrix.hxx +++ b/sc/source/core/inc/jumpmatrix.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/core/inc/parclass.hxx b/sc/source/core/inc/parclass.hxx index de2fba3fb694..e4f419ed524a 100644 --- a/sc/source/core/inc/parclass.hxx +++ b/sc/source/core/inc/parclass.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,10 +72,10 @@ public: of a parameter of this function. */ ForceArray, - /** Area reference is not converted to array, but ForceArray must be - propagated to subsequent operators and functions being part of a - parameter of this function. Used with functions that treat - references separately from arrays, but need the forced array + /** Area reference is not converted to array, but ForceArray must be + propagated to subsequent operators and functions being part of a + parameter of this function. Used with functions that treat + references separately from arrays, but need the forced array calculation of parameters that are not references.*/ ReferenceOrForceArray }; diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx index 2b3946f8ddcf..c66402e1d5f1 100644 --- a/sc/source/core/inc/poolhelp.hxx +++ b/sc/source/core/inc/poolhelp.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,28 +45,28 @@ class ScPoolHelper : public salhelper::SimpleReferenceObject { private: ScDocOptions aOpt; - ScDocumentPool* pDocPool; + ScDocumentPool* pDocPool; rtl::Reference< ScStyleSheetPool > mxStylePool; - mutable SvNumberFormatter* pFormTable; - mutable SfxItemPool* pEditPool; // EditTextObjectPool - mutable SfxItemPool* pEnginePool; // EditEnginePool + mutable SvNumberFormatter* pFormTable; + mutable SfxItemPool* pEditPool; // EditTextObjectPool + mutable SfxItemPool* pEnginePool; // EditEnginePool ScDocument* m_pSourceDoc; void UseDocOptions() const; public: ScPoolHelper( ScDocument* pSourceDoc ); - virtual ~ScPoolHelper(); + virtual ~ScPoolHelper(); // called in dtor of main document - void SourceDocumentGone(); + void SourceDocumentGone(); // access to pointers (are never 0): - ScDocumentPool* GetDocPool() const { return pDocPool; } - ScStyleSheetPool* GetStylePool() const { return mxStylePool.get(); } - SvNumberFormatter* GetFormTable() const; - SfxItemPool* GetEditPool() const; - SfxItemPool* GetEnginePool() const; + ScDocumentPool* GetDocPool() const { return pDocPool; } + ScStyleSheetPool* GetStylePool() const { return mxStylePool.get(); } + SvNumberFormatter* GetFormTable() const; + SfxItemPool* GetEditPool() const; + SfxItemPool* GetEnginePool() const; void SetFormTableOpt(const ScDocOptions& rOpt); }; diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx index 1ecae5f11d1f..ec0695d5e255 100644 --- a/sc/source/core/inc/refupdat.hxx +++ b/sc/source/core/inc/refupdat.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,9 +38,9 @@ class ScAddress; class ScRange; enum ScRefUpdateRes { - UR_NOTHING = 0, // keine Anpassungen - UR_UPDATED = 1, // Anpassungen erfolgt - UR_INVALID = 2 // Referenz wurde ungueltig + UR_NOTHING = 0, // keine Anpassungen + UR_UPDATED = 1, // Anpassungen erfolgt + UR_INVALID = 2 // Referenz wurde ungueltig }; class ScRefUpdate @@ -79,7 +79,7 @@ public: SCsCOL nDx, SCsROW nDy, SCsTAB nDz, ScComplexRefData& rRef, BOOL bWrap, BOOL bAbsolute ); - static void MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos, + static void MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos, SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData& rRef ); /// Before calling, the absolute references must be up-to-date! diff --git a/sc/source/core/inc/scrdata.hxx b/sc/source/core/inc/scrdata.hxx index 7a10045fda26..033d3dae6c44 100644 --- a/sc/source/core/inc/scrdata.hxx +++ b/sc/source/core/inc/scrdata.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/core/src/compiler.src b/sc/source/core/src/compiler.src index a45c2b6aa458..885cb3647a3d 100644 --- a/sc/source/core/src/compiler.src +++ b/sc/source/core/src/compiler.src @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER 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/core/tool/addincfg.cxx b/sc/source/core/tool/addincfg.cxx index 92017aad9f82..1735d4f11f35 100644 --- a/sc/source/core/tool/addincfg.cxx +++ b/sc/source/core/tool/addincfg.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/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index f7e39adfd72a..e44946b11578 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.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 @@ -1576,7 +1576,7 @@ void ScUnoAddInCall::ExecuteCallWithArgs(uno::Sequence<uno::Any>& rCallArgs) else nErrCode = errNoValue; } - + catch(uno::Exception&) { nErrCode = errNoValue; diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index 9ed593f58cde..0a32ca3f0487 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.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/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index 4133e1f4dd9e..6f5cd1a314e2 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.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,7 +37,7 @@ #include "addinlis.hxx" -#include "miscuno.hxx" // SC_IMPL_SERVICE_INFO +#include "miscuno.hxx" // SC_IMPL_SERVICE_INFO #include "document.hxx" #include "brdcst.hxx" #include "sc.hrc" @@ -56,17 +56,17 @@ List ScAddInListener::aAllListeners; //------------------------------------------------------------------------ -// static +// static ScAddInListener* ScAddInListener::CreateListener( uno::Reference<sheet::XVolatileResult> xVR, ScDocument* pDoc ) { ScAddInListener* pNew = new ScAddInListener( xVR, pDoc ); - pNew->acquire(); // for aAllListeners + pNew->acquire(); // for aAllListeners aAllListeners.Insert( pNew, LIST_APPEND ); - if ( xVR.is() ) - xVR->addResultListener( pNew ); // after at least 1 ref exists! + if ( xVR.is() ) + xVR->addResultListener( pNew ); // after at least 1 ref exists! return pNew; } @@ -95,17 +95,17 @@ ScAddInListener* ScAddInListener::Get( uno::Reference<sheet::XVolatileResult> xV if ( pComp == (sheet::XVolatileResult*)pLst->xVolRes.get() ) return pLst; } - return NULL; // not found + return NULL; // not found } -//! move to some container object? +//! move to some container object? // static void ScAddInListener::RemoveDocument( ScDocument* pDocumentP ) { ULONG nPos = aAllListeners.Count(); while (nPos) { - // loop backwards because elements are removed + // loop backwards because elements are removed --nPos; ScAddInListener* pLst = (ScAddInListener*)aAllListeners.GetObject(nPos); ScAddInDocs* p = pLst->pDocs; @@ -116,14 +116,14 @@ void ScAddInListener::RemoveDocument( ScDocument* pDocumentP ) if ( p->Count() == 0 ) { // this AddIn is no longer used - // dont delete, just remove the ref for the list + // dont delete, just remove the ref for the list aAllListeners.Remove( nPos ); - if ( pLst->xVolRes.is() ) + if ( pLst->xVolRes.is() ) pLst->xVolRes->removeResultListener( pLst ); - pLst->release(); // Ref for aAllListeners - pLst may be deleted here + pLst->release(); // Ref for aAllListeners - pLst may be deleted here } } } @@ -136,11 +136,11 @@ void ScAddInListener::RemoveDocument( ScDocument* pDocumentP ) void SAL_CALL ScAddInListener::modified( const ::com::sun::star::sheet::ResultEvent& aEvent ) throw(::com::sun::star::uno::RuntimeException) { - SolarMutexGuard aGuard; //! or generate a UserEvent + SolarMutexGuard aGuard; //! or generate a UserEvent - aResult = aEvent.Value; // store result + aResult = aEvent.Value; // store result - // notify document of changes + // notify document of changes Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) ); diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx index f09812526a0c..969072174d3e 100644 --- a/sc/source/core/tool/address.cxx +++ b/sc/source/core/tool/address.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,16 +62,16 @@ ScAddress::Details::Details ( const ScDocument* pDoc, #include <iostream> -/** - * Parse from the opening single quote to the closing single quote. Inside - * the quotes, a single quote character is encoded by double single-quote - * characters. +/** + * Parse from the opening single quote to the closing single quote. Inside + * the quotes, a single quote character is encoded by double single-quote + * characters. * - * @param p pointer to the first character to begin parsing. - * @param rName (reference) parsed name within the quotes. If the name is + * @param p pointer to the first character to begin parsing. + * @param rName (reference) parsed name within the quotes. If the name is * empty, either the parsing failed or it's an empty quote. - * - * @return pointer to the character immediately after the closing single + * + * @return pointer to the character immediately after the closing single * quote. */ static const sal_Unicode* lcl_ParseQuotedName( const sal_Unicode* p, String& rName ) @@ -87,7 +87,7 @@ static const sal_Unicode* lcl_ParseQuotedName( const sal_Unicode* p, String& rNa if (*p == '\'') { if (cPrev == '\'') - { + { // double single-quote equals one single quote. rName += *p; cPrev = 0; @@ -146,17 +146,17 @@ const sal_Unicode* lcl_eatWhiteSpace( const sal_Unicode* p ) return p; } -/** Determines the number of sheets an external reference spans and sets - rRange.aEnd.nTab accordingly. If a sheet is not found, the corresponding - bits in rFlags are cleared. pExtInfo is filled if it wasn't already. If in - cached order rStartTabName comes after rEndTabName, pExtInfo->maTabName +/** Determines the number of sheets an external reference spans and sets + rRange.aEnd.nTab accordingly. If a sheet is not found, the corresponding + bits in rFlags are cleared. pExtInfo is filled if it wasn't already. If in + cached order rStartTabName comes after rEndTabName, pExtInfo->maTabName is set to rEndTabName. - @returns <FALSE/> if pExtInfo is already filled and rExternDocName does not + @returns <FALSE/> if pExtInfo is already filled and rExternDocName does not result in the identical file ID. Else <TRUE/>. */ static bool lcl_ScRange_External_TabSpan( ScRange & rRange, - USHORT & rFlags, + USHORT & rFlags, ScAddress::ExternalInfo* pExtInfo, const String & rExternDocName, const String & rStartTabName, @@ -210,10 +210,10 @@ static bool lcl_ScRange_External_TabSpan( } /** Returns NULL if the string should be a sheet name, but is invalid. - Returns a pointer to the first character after the sheet name, if there was + Returns a pointer to the first character after the sheet name, if there was any, else pointer to start. @param pMsoxlQuoteStop - Starting _within_ a quoted name, but still may be 3D; quoted name stops + Starting _within_ a quoted name, but still may be 3D; quoted name stops at pMsoxlQuoteStop */ static const sal_Unicode * @@ -236,7 +236,7 @@ lcl_XL_ParseSheetRef( const sal_Unicode* start, // We pre-analyzed the quoting, no checks needed here. if (*++p == '\'') { - aTabName.Append( pCurrentStart, + aTabName.Append( pCurrentStart, sal::static_int_cast<xub_StrLen>( p - pCurrentStart)); pCurrentStart = ++p; } @@ -405,8 +405,8 @@ const sal_Unicode* ScRange::Parse_XL_Header( } else if (*p == '\'') { - // Sickness in Excel's ODF msoxl namespace: - // 'E:\[EXTDATA8.XLS]Sheet1'!$A$7 or + // Sickness in Excel's ODF msoxl namespace: + // 'E:\[EXTDATA8.XLS]Sheet1'!$A$7 or // 'E:\[EXTDATA12B.XLSB]Sheet1:Sheet3'!$A$11 // But, 'Sheet1'!B3 would also be a valid! // Excel does not allow [ and ] characters in sheet names though. @@ -431,7 +431,7 @@ const sal_Unicode* ScRange::Parse_XL_Header( rExternDocName.Erase( nClose); rExternDocName.Erase( nOpen, 1); pMsoxlQuoteStop = p - 1; // the ' quote char - // There may be embedded escaped quotes, just matching the + // There may be embedded escaped quotes, just matching the // doc name's length may not work. for (p = start; *p != '['; ++p) ; @@ -459,7 +459,7 @@ const sal_Unicode* ScRange::Parse_XL_Header( p = lcl_XL_ParseSheetRef( p+1, rEndTabName, false, pMsoxlQuoteStop); if( p == NULL ) { - nFlags = nSaveFlags; + nFlags = nSaveFlags; return start; // invalid tab } nFlags |= SCA_VALID_TAB2 | SCA_TAB2_3D | SCA_TAB2_ABSOLUTE; @@ -514,12 +514,12 @@ const sal_Unicode* ScRange::Parse_XL_Header( if (rEndTabName.Len()) { if (!pDoc->GetTable(rEndTabName, nTab)) - { + { // invalid table name. nFlags &= ~SCA_VALID_TAB2; nTab = -1; } - + aEnd.SetTab(nTab); } } @@ -632,11 +632,11 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r, // Keep in mind that nFlags2 gets left-shifted by 4 bits before being merged. USHORT nFlags2 = SCA_VALID_TAB; - p = r.Parse_XL_Header( p, pDoc, aExternDocName, aStartTabName, + p = r.Parse_XL_Header( p, pDoc, aExternDocName, aStartTabName, aEndTabName, nFlags, bOnlyAcceptSingle, NULL ); if (aExternDocName.Len() > 0) - lcl_ScRange_External_TabSpan( r, nFlags, pExtInfo, aExternDocName, + lcl_ScRange_External_TabSpan( r, nFlags, pExtInfo, aExternDocName, aStartTabName, aEndTabName, pDoc); if( NULL == p ) @@ -672,7 +672,7 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r, return nFlags; } - nFlags |= + nFlags |= SCA_VALID_COL | SCA_VALID_COL2 | SCA_COL_ABSOLUTE | SCA_COL2_ABSOLUTE; r.aStart.SetCol( 0 ); @@ -707,7 +707,7 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r, if (p && p[0] != 0) { // any trailing invalid character must invalidate the whole range. - nFlags &= ~(SCA_VALID | SCA_VALID_COL | SCA_VALID_ROW | SCA_VALID_TAB | + nFlags &= ~(SCA_VALID | SCA_VALID_COL | SCA_VALID_ROW | SCA_VALID_TAB | SCA_VALID_COL2 | SCA_VALID_ROW2 | SCA_VALID_TAB2); return nFlags; } @@ -740,7 +740,7 @@ lcl_ScRange_Parse_XL_R1C1( ScRange& r, return nFlags; } - nFlags |= + nFlags |= SCA_VALID_ROW | SCA_VALID_ROW2 | SCA_ROW_ABSOLUTE | SCA_ROW2_ABSOLUTE; r.aStart.SetRow( 0 ); @@ -807,11 +807,11 @@ lcl_ScRange_Parse_XL_A1( ScRange& r, String aExternDocName, aStartTabName, aEndTabName; // for external link table USHORT nFlags = SCA_VALID | SCA_VALID_TAB, nFlags2 = SCA_VALID_TAB; - p = r.Parse_XL_Header( p, pDoc, aExternDocName, aStartTabName, + p = r.Parse_XL_Header( p, pDoc, aExternDocName, aStartTabName, aEndTabName, nFlags, bOnlyAcceptSingle, pExternalLinks ); if (aExternDocName.Len() > 0) - lcl_ScRange_External_TabSpan( r, nFlags, pExtInfo, aExternDocName, + lcl_ScRange_External_TabSpan( r, nFlags, pExtInfo, aExternDocName, aStartTabName, aEndTabName, pDoc); if( NULL == p ) @@ -824,7 +824,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r, return 0; tmp1 = lcl_a1_get_row( p, &r.aStart, &nFlags ); - + tmp1 = lcl_eatWhiteSpace( tmp1 ); if( !tmp1 || *tmp1++ != ':' ) // Even a singleton requires ':' (eg 2:2) return 0; @@ -835,7 +835,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r, return 0; r.aStart.SetCol( 0 ); r.aEnd.SetCol( MAXCOL ); - nFlags |= + nFlags |= SCA_VALID_COL | SCA_VALID_COL2 | SCA_COL_ABSOLUTE | SCA_COL2_ABSOLUTE; nFlags |= (nFlags2 << 4); @@ -858,7 +858,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r, return 0; r.aStart.SetRow( 0 ); r.aEnd.SetRow( MAXROW ); - nFlags |= + nFlags |= SCA_VALID_ROW | SCA_VALID_ROW2 | SCA_ROW_ABSOLUTE | SCA_ROW2_ABSOLUTE; nFlags |= (nFlags2 << 4); @@ -884,7 +884,7 @@ lcl_ScRange_Parse_XL_A1( ScRange& r, tmp2 = lcl_eatWhiteSpace( tmp2 ); if( *tmp2 != ':' ) { - // Sheet1:Sheet2!C4 is a valid range, without a second sheet it is + // Sheet1:Sheet2!C4 is a valid range, without a second sheet it is // not. Any trailing invalid character invalidates the range. if (*tmp2 == 0 && (nFlags & SCA_TAB2_3D)) { @@ -923,12 +923,12 @@ lcl_ScRange_Parse_XL_A1( ScRange& r, } /** - @param pRange pointer to range where rAddr effectively is *pRange->aEnd, - used in conjunction with pExtInfo to determine the tab span + @param pRange pointer to range where rAddr effectively is *pRange->aEnd, + used in conjunction with pExtInfo to determine the tab span of a 3D reference. */ static USHORT -lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr, +lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAddr, ScAddress::ExternalInfo* pExtInfo = NULL, ScRange* pRange = NULL ) { USHORT nRes = 0; @@ -947,7 +947,7 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd if (*p++ == SC_COMPILER_FILE_TAB_SEP) bExtDoc = true; else - // This is not a document name. Perhaps a quoted relative table + // This is not a document name. Perhaps a quoted relative table // name. p = pStart; } @@ -1110,8 +1110,8 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd pExtInfo->maTabName = aTab; pExtInfo->mnFileId = nFileId; - if (pRefMgr->getSingleRefToken(nFileId, aTab, - ScAddress(nCol, nRow, 0), NULL, + if (pRefMgr->getSingleRefToken(nFileId, aTab, + ScAddress(nCol, nRow, 0), NULL, &nTab).get()) { rAddr.SetTab( nTab); @@ -1122,15 +1122,15 @@ lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDoc, ScAddress& rAdd } else { - // This is a call for the second part of the reference, + // This is a call for the second part of the reference, // we must have the range to adapt tab span. if (!pRange) nRes = 0; else { USHORT nFlags = nRes | SCA_VALID_TAB2; - if (!lcl_ScRange_External_TabSpan( *pRange, nFlags, - pExtInfo, aDocName, + if (!lcl_ScRange_External_TabSpan( *pRange, nFlags, + pExtInfo, aDocName, pExtInfo->maTabName, aTab, pDoc)) nRes &= ~SCA_VALID_TAB; else @@ -1585,7 +1585,7 @@ lcl_r1c1_append_r ( String &r, int nRow, bool bIsAbs, } } -static String +static String getFileNameFromDoc( const ScDocument* pDoc ) { // TODO : er points at ScGlobal::GetAbsDocName() @@ -1606,7 +1606,7 @@ getFileNameFromDoc( const ScDocument* pDoc ) } else sFileName = pShell->GetTitle(); - } + } } return sFileName; } diff --git a/sc/source/core/tool/adiasync.cxx b/sc/source/core/tool/adiasync.cxx index 823dcb597b7f..85916d1e924c 100644 --- a/sc/source/core/tool/adiasync.cxx +++ b/sc/source/core/tool/adiasync.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 @@ #include "brdcst.hxx" #include "global.hxx" #include "document.hxx" -#include "sc.hrc" // FID_DATACHANGED +#include "sc.hrc" // FID_DATACHANGED #include <osl/thread.h> @@ -65,7 +65,7 @@ void CALLTYPE ScAddInAsyncCallBack( double& nHandle, void* pData ) ScAddInAsync::ScAddInAsync() : SvtBroadcaster(), nHandle( 0 ) -{ // nur fuer aSeekObj ! +{ // nur fuer aSeekObj ! } @@ -92,7 +92,7 @@ ScAddInAsync::~ScAddInAsync() { // im dTor wg. theAddInAsyncTbl.DeleteAndDestroy in ScGlobal::Clear pFuncData->Unadvice( (double)nHandle ); - if ( eType == PTR_STRING && pStr ) // mit Typvergleich wg. Union! + if ( eType == PTR_STRING && pStr ) // mit Typvergleich wg. Union! delete pStr; delete pDocs; } @@ -165,14 +165,14 @@ void ScAddInAsync::RemoveDocument( ScDocument* pDocumentP ) const ScAddInAsync** ppAsync = (const ScAddInAsync**) theAddInAsyncTbl.GetData() + nPos - 1; for ( ; nPos-- >0; ppAsync-- ) - { // rueckwaerts wg. Pointer-Aufrueckerei im Array + { // rueckwaerts wg. Pointer-Aufrueckerei im Array ScAddInDocs* p = ((ScAddInAsync*)*ppAsync)->pDocs; USHORT nFoundPos; if ( p->Seek_Entry( pDocumentP, &nFoundPos ) ) { p->Remove( nFoundPos ); if ( p->Count() == 0 ) - { // dieses AddIn wird nicht mehr benutzt + { // dieses AddIn wird nicht mehr benutzt ScAddInAsync* pAsync = (ScAddInAsync*)*ppAsync; theAddInAsyncTbl.Remove( nPos ); delete pAsync; diff --git a/sc/source/core/tool/appoptio.cxx b/sc/source/core/tool/appoptio.cxx index be483c8bf574..03823142ee85 100644 --- a/sc/source/core/tool/appoptio.cxx +++ b/sc/source/core/tool/appoptio.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 @@ -87,19 +87,19 @@ void ScAppOptions::SetDefaults() nTabCountInNewSpreadsheet = 3; if ( ScOptionsUtil::IsMetricSystem() ) - eMetric = FUNIT_CM; // default for countries with metric system + eMetric = FUNIT_CM; // default for countries with metric system else - eMetric = FUNIT_INCH; // default for others + eMetric = FUNIT_INCH; // default for others - nZoom = 100; - eZoomType = SVX_ZOOM_PERCENT; + nZoom = 100; + eZoomType = SVX_ZOOM_PERCENT; bSynchronizeZoom = TRUE; - nStatusFunc = SUBTOTAL_FUNC_SUM; - bAutoComplete = TRUE; - bDetectiveAuto = TRUE; + nStatusFunc = SUBTOTAL_FUNC_SUM; + bAutoComplete = TRUE; + bDetectiveAuto = TRUE; delete [] pLRUList; - pLRUList = new USHORT[5]; // sinnvoll vorbelegen + pLRUList = new USHORT[5]; // sinnvoll vorbelegen pLRUList[0] = SC_OPCODE_SUM; pLRUList[1] = SC_OPCODE_AVERAGE; pLRUList[2] = SC_OPCODE_MIN; @@ -111,7 +111,7 @@ void ScAppOptions::SetDefaults() nTrackInsertColor = COL_TRANSPARENT; nTrackDeleteColor = COL_TRANSPARENT; nTrackMoveColor = COL_TRANSPARENT; - eLinkMode = LM_ON_DEMAND; + eLinkMode = LM_ON_DEMAND; nDefaultObjectSizeWidth = 8000; nDefaultObjectSizeHeight = 5000; @@ -124,19 +124,19 @@ void ScAppOptions::SetDefaults() const ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy ) { nTabCountInNewSpreadsheet = rCpy.nTabCountInNewSpreadsheet; - eMetric = rCpy.eMetric; - eZoomType = rCpy.eZoomType; + eMetric = rCpy.eMetric; + eZoomType = rCpy.eZoomType; bSynchronizeZoom = rCpy.bSynchronizeZoom; - nZoom = rCpy.nZoom; + nZoom = rCpy.nZoom; SetLRUFuncList( rCpy.pLRUList, rCpy.nLRUFuncCount ); - nStatusFunc = rCpy.nStatusFunc; - bAutoComplete = rCpy.bAutoComplete; - bDetectiveAuto = rCpy.bDetectiveAuto; + nStatusFunc = rCpy.nStatusFunc; + bAutoComplete = rCpy.bAutoComplete; + bDetectiveAuto = rCpy.bDetectiveAuto; nTrackContentColor = rCpy.nTrackContentColor; nTrackInsertColor = rCpy.nTrackInsertColor; nTrackDeleteColor = rCpy.nTrackDeleteColor; nTrackMoveColor = rCpy.nTrackMoveColor; - eLinkMode = rCpy.eLinkMode; + eLinkMode = rCpy.eLinkMode; nDefaultObjectSizeWidth = rCpy.nDefaultObjectSizeWidth; nDefaultObjectSizeHeight = rCpy.nDefaultObjectSizeHeight; mbShowSharedDocumentWarning = rCpy.mbShowSharedDocumentWarning; @@ -145,7 +145,7 @@ const ScAppOptions& ScAppOptions::operator=( const ScAppOptions& rCpy ) //------------------------------------------------------------------------ -void ScAppOptions::SetLRUFuncList( const USHORT* pList, const USHORT nCount ) +void ScAppOptions::SetLRUFuncList( const USHORT* pList, const USHORT nCount ) { delete [] pLRUList; @@ -163,7 +163,7 @@ void ScAppOptions::SetLRUFuncList( const USHORT* pList, const USHORT nCount ) } //================================================================== -// Config Item containing app options +// Config Item containing app options //================================================================== void lcl_SetLastFunctions( ScAppOptions& rOpt, const Any& rValue ) @@ -199,7 +199,7 @@ void lcl_GetLastFunctions( Any& rDest, const ScAppOptions& rOpt ) rDest <<= aSeq; } else - rDest <<= Sequence<sal_Int32>(0); // empty + rDest <<= Sequence<sal_Int32>(0); // empty } void lcl_SetSortList( const Any& rValue ) @@ -211,8 +211,8 @@ void lcl_SetSortList( const Any& rValue ) const OUString* pArray = aSeq.getConstArray(); ScUserList aList; - // if setting is "default", keep default values from ScUserList ctor - //! mark "default" in a safe way + // if setting is "default", keep default values from ScUserList ctor + //! mark "default" in a safe way BOOL bDefault = ( nCount == 1 && pArray[0].equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "NULL" ) ) ); @@ -245,60 +245,60 @@ void lcl_GetSortList( Any& rDest ) rDest <<= aSeq; } else - rDest <<= Sequence<OUString>(0); // empty + rDest <<= Sequence<OUString>(0); // empty } //------------------------------------------------------------------ -#define CFGPATH_LAYOUT "Office.Calc/Layout" +#define CFGPATH_LAYOUT "Office.Calc/Layout" -#define SCLAYOUTOPT_MEASURE 0 -#define SCLAYOUTOPT_STATUSBAR 1 -#define SCLAYOUTOPT_ZOOMVAL 2 -#define SCLAYOUTOPT_ZOOMTYPE 3 +#define SCLAYOUTOPT_MEASURE 0 +#define SCLAYOUTOPT_STATUSBAR 1 +#define SCLAYOUTOPT_ZOOMVAL 2 +#define SCLAYOUTOPT_ZOOMTYPE 3 #define SCLAYOUTOPT_SYNCZOOM 4 #define SCLAYOUTOPT_COUNT 5 -#define CFGPATH_INPUT "Office.Calc/Input" +#define CFGPATH_INPUT "Office.Calc/Input" -#define SCINPUTOPT_LASTFUNCS 0 -#define SCINPUTOPT_AUTOINPUT 1 -#define SCINPUTOPT_DET_AUTO 2 -#define SCINPUTOPT_COUNT 3 +#define SCINPUTOPT_LASTFUNCS 0 +#define SCINPUTOPT_AUTOINPUT 1 +#define SCINPUTOPT_DET_AUTO 2 +#define SCINPUTOPT_COUNT 3 -#define CFGPATH_REVISION "Office.Calc/Revision/Color" +#define CFGPATH_REVISION "Office.Calc/Revision/Color" -#define SCREVISOPT_CHANGE 0 -#define SCREVISOPT_INSERTION 1 -#define SCREVISOPT_DELETION 2 -#define SCREVISOPT_MOVEDENTRY 3 -#define SCREVISOPT_COUNT 4 +#define SCREVISOPT_CHANGE 0 +#define SCREVISOPT_INSERTION 1 +#define SCREVISOPT_DELETION 2 +#define SCREVISOPT_MOVEDENTRY 3 +#define SCREVISOPT_COUNT 4 -#define CFGPATH_CONTENT "Office.Calc/Content/Update" +#define CFGPATH_CONTENT "Office.Calc/Content/Update" -#define SCCONTENTOPT_LINK 0 -#define SCCONTENTOPT_COUNT 1 +#define SCCONTENTOPT_LINK 0 +#define SCCONTENTOPT_COUNT 1 -#define CFGPATH_SORTLIST "Office.Calc/SortList" +#define CFGPATH_SORTLIST "Office.Calc/SortList" -#define SCSORTLISTOPT_LIST 0 -#define SCSORTLISTOPT_COUNT 1 +#define SCSORTLISTOPT_LIST 0 +#define SCSORTLISTOPT_COUNT 1 -#define CFGPATH_MISC "Office.Calc/Misc" +#define CFGPATH_MISC "Office.Calc/Misc" -#define SCMISCOPT_DEFOBJWIDTH 0 -#define SCMISCOPT_DEFOBJHEIGHT 1 +#define SCMISCOPT_DEFOBJWIDTH 0 +#define SCMISCOPT_DEFOBJHEIGHT 1 #define SCMISCOPT_SHOWSHAREDDOCWARN 2 -#define SCMISCOPT_COUNT 3 +#define SCMISCOPT_COUNT 3 Sequence<OUString> ScAppCfg::GetLayoutPropertyNames() { static const char* aPropNames[] = { - "Other/MeasureUnit/NonMetric", // SCLAYOUTOPT_MEASURE - "Other/StatusbarFunction", // SCLAYOUTOPT_STATUSBAR - "Zoom/Value", // SCLAYOUTOPT_ZOOMVAL + "Other/MeasureUnit/NonMetric", // SCLAYOUTOPT_MEASURE + "Other/StatusbarFunction", // SCLAYOUTOPT_STATUSBAR + "Zoom/Value", // SCLAYOUTOPT_ZOOMVAL "Zoom/Type", // SCLAYOUTOPT_ZOOMTYPE "Zoom/Synchronize" // SCLAYOUTOPT_SYNCZOOM }; @@ -307,7 +307,7 @@ Sequence<OUString> ScAppCfg::GetLayoutPropertyNames() for(int i = 0; i < SCLAYOUTOPT_COUNT; i++) pNames[i] = OUString::createFromAscii(aPropNames[i]); - // adjust for metric system + // adjust for metric system if (ScOptionsUtil::IsMetricSystem()) pNames[SCLAYOUTOPT_MEASURE] = OUString::createFromAscii( "Other/MeasureUnit/Metric" ); @@ -318,9 +318,9 @@ Sequence<OUString> ScAppCfg::GetInputPropertyNames() { static const char* aPropNames[] = { - "LastFunctions", // SCINPUTOPT_LASTFUNCS - "AutoInput", // SCINPUTOPT_AUTOINPUT - "DetectiveAuto" // SCINPUTOPT_DET_AUTO + "LastFunctions", // SCINPUTOPT_LASTFUNCS + "AutoInput", // SCINPUTOPT_AUTOINPUT + "DetectiveAuto" // SCINPUTOPT_DET_AUTO }; Sequence<OUString> aNames(SCINPUTOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -334,10 +334,10 @@ Sequence<OUString> ScAppCfg::GetRevisionPropertyNames() { static const char* aPropNames[] = { - "Change", // SCREVISOPT_CHANGE - "Insertion", // SCREVISOPT_INSERTION - "Deletion", // SCREVISOPT_DELETION - "MovedEntry" // SCREVISOPT_MOVEDENTRY + "Change", // SCREVISOPT_CHANGE + "Insertion", // SCREVISOPT_INSERTION + "Deletion", // SCREVISOPT_DELETION + "MovedEntry" // SCREVISOPT_MOVEDENTRY }; Sequence<OUString> aNames(SCREVISOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -351,7 +351,7 @@ Sequence<OUString> ScAppCfg::GetContentPropertyNames() { static const char* aPropNames[] = { - "Link" // SCCONTENTOPT_LINK + "Link" // SCCONTENTOPT_LINK }; Sequence<OUString> aNames(SCCONTENTOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -365,7 +365,7 @@ Sequence<OUString> ScAppCfg::GetSortListPropertyNames() { static const char* aPropNames[] = { - "List" // SCSORTLISTOPT_LIST + "List" // SCSORTLISTOPT_LIST }; Sequence<OUString> aNames(SCSORTLISTOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -379,7 +379,7 @@ Sequence<OUString> ScAppCfg::GetMiscPropertyNames() { static const char* aPropNames[] = { - "DefaultObjectSize/Width", // SCMISCOPT_DEFOBJWIDTH + "DefaultObjectSize/Width", // SCMISCOPT_DEFOBJWIDTH "DefaultObjectSize/Height", // SCMISCOPT_DEFOBJHEIGHT "SharedDocument/ShowWarning" // SCMISCOPT_SHOWSHAREDDOCWARN }; diff --git a/sc/source/core/tool/autoform.cxx b/sc/source/core/tool/autoform.cxx index bf89efebeaa5..dc3072b6c8c3 100644 --- a/sc/source/core/tool/autoform.cxx +++ b/sc/source/core/tool/autoform.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,23 +56,23 @@ const sal_Char *linker_dummy = ""; -// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen) +// Standard-Name ist jetzt STR_STYLENAME_STANDARD (wie Vorlagen) //static const sal_Char __FAR_DATA cStandardName[] = "Standard"; static const sal_Char __FAR_DATA sAutoTblFmtName[] = "autotbl.fmt"; // bis SO5PF -const USHORT AUTOFORMAT_ID_X = 9501; -const USHORT AUTOFORMAT_ID_358 = 9601; -const USHORT AUTOFORMAT_DATA_ID_X = 9502; +const USHORT AUTOFORMAT_ID_X = 9501; +const USHORT AUTOFORMAT_ID_358 = 9601; +const USHORT AUTOFORMAT_DATA_ID_X = 9502; // ab SO5 //! in nachfolgenden Versionen muss der Betrag dieser IDs groesser sein -const USHORT AUTOFORMAT_ID_504 = 9801; -const USHORT AUTOFORMAT_DATA_ID_504 = 9802; +const USHORT AUTOFORMAT_ID_504 = 9801; +const USHORT AUTOFORMAT_DATA_ID_504 = 9802; -const USHORT AUTOFORMAT_ID_552 = 9901; -const USHORT AUTOFORMAT_DATA_ID_552 = 9902; +const USHORT AUTOFORMAT_ID_552 = 9901; +const USHORT AUTOFORMAT_DATA_ID_552 = 9902; // --- from 641 on: CJK and CTL font settings const USHORT AUTOFORMAT_ID_641 = 10001; @@ -96,13 +96,13 @@ const USHORT AUTOFORMAT_DATA_ID = AUTOFORMAT_DATA_ID_300OVRLN; #ifdef READ_OLDVERS -const USHORT AUTOFORMAT_OLD_ID_OLD = 4201; -const USHORT AUTOFORMAT_OLD_DATA_ID = 4202; -const USHORT AUTOFORMAT_OLD_ID_NEW = 4203; +const USHORT AUTOFORMAT_OLD_ID_OLD = 4201; +const USHORT AUTOFORMAT_OLD_DATA_ID = 4202; +const USHORT AUTOFORMAT_OLD_ID_NEW = 4203; #endif -// Struct mit Versionsnummern der Items +// Struct mit Versionsnummern der Items struct ScAfVersions { @@ -221,10 +221,10 @@ void ScAfVersions::Write(SvStream& rStream) rStream << SfxInt32Item(ATTR_ROTATE_VALUE).GetVersion(SOFFICE_FILEFORMAT_40); rStream << SvxRotateModeItem(SVX_ROTATE_MODE_STANDARD,0).GetVersion(SOFFICE_FILEFORMAT_40); - rStream << (USHORT)0; // Num-Format + rStream << (USHORT)0; // Num-Format } -// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- ScAutoFormatDataField::ScAutoFormatDataField() : aFont( ATTR_FONT ), @@ -481,7 +481,7 @@ BOOL ScAutoFormatDataField::Save( SvStream& rStream ) } -// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- ScAutoFormatData::ScAutoFormatData() { @@ -890,7 +890,7 @@ BOOL ScAutoFormatData::Save(SvStream& rStream) ScAutoFormat::ScAutoFormat(USHORT nLim, USHORT nDel, BOOL bDup): ScSortedCollection (nLim, nDel, bDup), - bSaveLater (FALSE) + bSaveLater (FALSE) { // create default autoformat ScAutoFormatData* pData = new ScAutoFormatData; @@ -975,13 +975,13 @@ ScAutoFormat::ScAutoFormat(USHORT nLim, USHORT nDel, BOOL bDup): ScAutoFormat::ScAutoFormat(const ScAutoFormat& rAutoFormat) : ScSortedCollection (rAutoFormat), - bSaveLater (FALSE) + bSaveLater (FALSE) {} ScAutoFormat::~ScAutoFormat() { - // Bei Aenderungen per StarOne wird nicht sofort gespeichert, sondern zuerst nur - // das SaveLater Flag gesetzt. Wenn das Flag noch gesetzt ist, jetzt speichern. + // Bei Aenderungen per StarOne wird nicht sofort gespeichert, sondern zuerst nur + // das SaveLater Flag gesetzt. Wenn das Flag noch gesetzt ist, jetzt speichern. if (bSaveLater) Save(); @@ -1038,8 +1038,8 @@ BOOL ScAutoFormat::Load() BYTE nChrSet, nCnt; long nPos = rStream.Tell(); rStream >> nCnt >> nChrSet; -// if( 4 <= nCnt ) -// rStream >> nFileVers; +// if( 4 <= nCnt ) +// rStream >> nFileVers; if( rStream.Tell() != ULONG(nPos + nCnt) ) { DBG_ERRORFILE( "Der Header enthaelt mehr/neuere Daten" ); @@ -1052,7 +1052,7 @@ BOOL ScAutoFormat::Load() if( nVal == AUTOFORMAT_ID_358 || nVal == AUTOFORMAT_ID_X || (AUTOFORMAT_ID_504 <= nVal && nVal <= AUTOFORMAT_ID) ) { - aVersions.Load( rStream, nVal ); // Item-Versionen + aVersions.Load( rStream, nVal ); // Item-Versionen ScAutoFormatData* pData; USHORT nAnz = 0; @@ -1133,13 +1133,13 @@ BOOL ScAutoFormat::Save() // Achtung hier muss ein allgemeiner Header gespeichert werden USHORT nVal = AUTOFORMAT_ID; rStream << nVal - << (BYTE)2 // Anzahl von Zeichen des Headers incl. diesem + << (BYTE)2 // Anzahl von Zeichen des Headers incl. diesem << (BYTE)::GetSOStoreTextEncoding( gsl_getSystemTextEncoding(), sal::static_int_cast<USHORT>(rStream.GetVersion()) ); -// << (BYTE)4 // Anzahl von Zeichen des Headers incl. diesem -// << (BYTE)::GetStoreCharSet(::GetSystemCharSet()) -// << (UNIT16)SOFFICE_FILEFORMAT_NOW; - ScAfVersions::Write(rStream); // Item-Versionen +// << (BYTE)4 // Anzahl von Zeichen des Headers incl. diesem +// << (BYTE)::GetStoreCharSet(::GetSystemCharSet()) +// << (UNIT16)SOFFICE_FILEFORMAT_NOW; + ScAfVersions::Write(rStream); // Item-Versionen bRet = (rStream.GetError() == 0); //----------------------------------------------------------- @@ -1157,7 +1157,7 @@ BOOL ScAutoFormat::Save() USHORT ScAutoFormat::FindIndexPerName( const String& rName ) const { - String aName; + String aName; for( USHORT i=0; i<nCount ; i++ ) { diff --git a/sc/source/core/tool/callform.cxx b/sc/source/core/tool/callform.cxx index 0c3c7e8b20b3..808776ff7cd5 100644 --- a/sc/source/core/tool/callform.cxx +++ b/sc/source/core/tool/callform.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 @@ -70,32 +70,32 @@ typedef void (CALLTYPE* SetLanguagePtr)( USHORT& nLanguage ); typedef void (CALLTYPE* GetParamDesc) (USHORT& nNo, USHORT& nParam, sal_Char* pName, sal_Char* pDesc ); -typedef void (CALLTYPE* IsAsync) ( USHORT& nNo, - ParamType* peType ); -typedef void (CALLTYPE* Advice) ( USHORT& nNo, - AdvData& pfCallback ); -typedef void (CALLTYPE* Unadvice)( double& nHandle ); +typedef void (CALLTYPE* IsAsync) ( USHORT& nNo, + ParamType* peType ); +typedef void (CALLTYPE* Advice) ( USHORT& nNo, + AdvData& pfCallback ); +typedef void (CALLTYPE* Unadvice)( double& nHandle ); typedef void (CALLTYPE* FARPROC) ( void ); } #if defined(OS2) && defined(BLC) -#define GETFUNCTIONCOUNT "_GetFunctionCount" -#define GETFUNCTIONDATA "_GetFunctionData" -#define SETLANGUAGE "_SetLanguage" -#define GETPARAMDESC "_GetParameterDescription" -#define ISASYNC "_IsAsync" -#define ADVICE "_Advice" -#define UNADVICE "_Unadvice" +#define GETFUNCTIONCOUNT "_GetFunctionCount" +#define GETFUNCTIONDATA "_GetFunctionData" +#define SETLANGUAGE "_SetLanguage" +#define GETPARAMDESC "_GetParameterDescription" +#define ISASYNC "_IsAsync" +#define ADVICE "_Advice" +#define UNADVICE "_Unadvice" #else // Pascal oder extern "C" -#define GETFUNCTIONCOUNT "GetFunctionCount" -#define GETFUNCTIONDATA "GetFunctionData" -#define SETLANGUAGE "SetLanguage" -#define GETPARAMDESC "GetParameterDescription" -#define ISASYNC "IsAsync" -#define ADVICE "Advice" -#define UNADVICE "Unadvice" +#define GETFUNCTIONCOUNT "GetFunctionCount" +#define GETFUNCTIONDATA "GetFunctionData" +#define SETLANGUAGE "SetLanguage" +#define GETPARAMDESC "GetParameterDescription" +#define ISASYNC "IsAsync" +#define ADVICE "Advice" +#define UNADVICE "Unadvice" #endif #define LIBFUNCNAME( name ) \ @@ -104,12 +104,12 @@ typedef void (CALLTYPE* FARPROC) ( void ); //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= FuncData::FuncData(const String& rIName) : - pModuleData (NULL), + pModuleData (NULL), aInternalName (rIName), -// aFuncName (""), - nNumber (0), - nParamCount (0), - eAsyncType (NONE) +// aFuncName (""), + nNumber (0), + nParamCount (0), + eAsyncType (NONE) { for (USHORT i = 0; i < MAXFUNCPARAM; i++) eParamType[i] = PTR_DOUBLE; @@ -118,18 +118,18 @@ FuncData::FuncData(const String& rIName) : //------------------------------------------------------------------------ FuncData::FuncData(const ModuleData*pModule, - const String& rIName, - const String& rFName, - USHORT nNo, - USHORT nCount, + const String& rIName, + const String& rFName, + USHORT nNo, + USHORT nCount, const ParamType* peType, ParamType eType) : - pModuleData (pModule), + pModuleData (pModule), aInternalName (rIName), - aFuncName (rFName), - nNumber (nNo), - nParamCount (nCount), - eAsyncType (eType) + aFuncName (rFName), + nNumber (nNo), + nParamCount (nCount), + eAsyncType (eType) { for (USHORT i = 0; i < MAXFUNCPARAM; i++) eParamType[i] = peType[i]; @@ -139,12 +139,12 @@ FuncData::FuncData(const ModuleData*pModule, FuncData::FuncData(const FuncData& rData) : ScDataObject(), - pModuleData (rData.pModuleData), + pModuleData (rData.pModuleData), aInternalName (rData.aInternalName), - aFuncName (rData.aFuncName), - nNumber (rData.nNumber), - nParamCount (rData.nParamCount), - eAsyncType (rData.eAsyncType) + aFuncName (rData.aFuncName), + nNumber (rData.nNumber), + nParamCount (rData.nParamCount), + eAsyncType (rData.eAsyncType) { for (USHORT i = 0; i < MAXFUNCPARAM; i++) eParamType[i] = rData.eParamType[i]; @@ -170,17 +170,17 @@ BOOL FuncCollection::SearchFunc( const String& rName, USHORT& rIndex ) const class ModuleData : public ScDataObject { friend class ModuleCollection; - String aName; + String aName; osl::Module* pInstance; public: ModuleData(const String& rStr, osl::Module* pInst) : aName (rStr), pInstance (pInst) {} ModuleData(const ModuleData& rData) : ScDataObject(), aName (rData.aName) {pInstance = new osl::Module(aName);} ~ModuleData() { delete pInstance; } - virtual ScDataObject* Clone() const { return new ModuleData(*this); } + virtual ScDataObject* Clone() const { return new ModuleData(*this); } - const String& GetName() const { return aName; } + const String& GetName() const { return aName; } osl::Module* GetInstance() const { return pInstance; } - void FreeInstance() { delete pInstance; pInstance = 0; } + void FreeInstance() { delete pInstance; pInstance = 0; } }; //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -190,10 +190,10 @@ public: ModuleCollection(USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE) : ScSortedCollection ( nLim, nDel, bDup ) {} ModuleCollection(const ModuleCollection& rModuleCollection) : ScSortedCollection ( rModuleCollection ) {} - virtual ScDataObject* Clone() const { return new ModuleCollection(*this); } - ModuleData* operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);} - virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; - BOOL SearchModule( const String& rName, + virtual ScDataObject* Clone() const { return new ModuleCollection(*this); } + ModuleData* operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);} + virtual short Compare(ScDataObject* pKey1, ScDataObject* pKey2) const; + BOOL SearchModule( const String& rName, const ModuleData*& rpModule ) const; }; @@ -452,7 +452,7 @@ BOOL FuncData::GetParamDesc( String& aName, String& aDesc, USHORT nParam ) sal_Char pcName[256]; sal_Char pcDesc[256]; *pcName = *pcDesc = 0; - USHORT nFuncNo = nNumber; // nicht per Reference versauen lassen.. + USHORT nFuncNo = nNumber; // nicht per Reference versauen lassen.. ((::GetParamDesc)fProc)( nFuncNo, nParam, pcName, pcDesc ); aName = String( pcName, osl_getThreadTextEncoding() ); aDesc = String( pcDesc, osl_getThreadTextEncoding() ); diff --git a/sc/source/core/tool/cellform.cxx b/sc/source/core/tool/cellform.cxx index 62e00a15d9d6..113b4fd1f16a 100644 --- a/sc/source/core/tool/cellform.cxx +++ b/sc/source/core/tool/cellform.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 @@ -102,7 +102,7 @@ void ScCellFormat::GetString( ScBaseCell* pCell, ULONG nFormat, String& rString, break; case CELLTYPE_FORMULA: { - ScFormulaCell* pFCell = (ScFormulaCell*)pCell; + ScFormulaCell* pFCell = (ScFormulaCell*)pCell; if ( bFormula ) pFCell->GetFormula( rString ); else diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index 466457cf5651..f201dc4aaef9 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.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 @@ -81,7 +81,7 @@ ScCellKeyword::ScCellKeyword(const sal_Char* pName, OpCode eOpCode, const Locale ::std::auto_ptr<ScCellKeywordTranslator> ScCellKeywordTranslator::spInstance(NULL); -static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, +static void lclMatchKeyword(String& rName, const ScCellKeywordHashMap& aMap, OpCode eOpCode = ocNone, const Locale* pLocale = NULL) { ScCellKeywordHashMap::const_iterator itrEnd = aMap.end(); @@ -174,7 +174,7 @@ void ScCellKeywordTranslator::transKeyword(String& rName, const Locale* pLocale, } ScCellKeywordTranslator::ScCellKeywordTranslator() : - maTransWrapper( ::comphelper::getProcessServiceFactory(), + maTransWrapper( ::comphelper::getProcessServiceFactory(), i18n::TransliterationModules_LOWERCASE_UPPERCASE ) { init(); @@ -198,11 +198,11 @@ void ScCellKeywordTranslator::init() // The file below has been autogenerated by sc/workben/celltrans/parse.py. // To add new locale keywords, edit sc/workben/celltrans/keywords_utf16.txt // and re-run the parse.py script. - // - // All keywords must be uppercase, and the mapping must be from the + // + // All keywords must be uppercase, and the mapping must be from the // localized keyword to the English keyword. - // - // Make sure that the original keyword file (keywords_utf16.txt) is + // + // Make sure that the original keyword file (keywords_utf16.txt) is // encoded in UCS-2/UTF-16! #include "cellkeywords.inl" diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index 691e05d6d0e1..027d2f09b54d 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.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 @@ -36,7 +36,7 @@ #include "scitems.hxx" #include <svl/intitem.hxx> #include <svl/zforlist.hxx> -#include <float.h> // DBL_MIN +#include <float.h> // DBL_MIN #include "chartarr.hxx" #include "document.hxx" @@ -141,7 +141,7 @@ ScMemChart* ScChartArray::CreateMemChart() return CreateMemChartSingle(); } else - return CreateMemChartMulti(); // kann 0 Range besser ab als Single + return CreateMemChartMulti(); // kann 0 Range besser ab als Single } ScMemChart* ScChartArray::CreateMemChartSingle() @@ -150,7 +150,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle() SCSIZE nRow; // - // wirkliche Groesse (ohne versteckte Zeilen/Spalten) + // wirkliche Groesse (ohne versteckte Zeilen/Spalten) // SCCOL nColAdd = HasRowHeaders() ? 1 : 0; @@ -165,7 +165,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle() ScRangeListRef aRangeListRef(GetRangeList()); aRangeListRef->First()->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 ); - SCCOL nStrCol = nCol1; // fuer Beschriftung merken + SCCOL nStrCol = nCol1; // fuer Beschriftung merken SCROW nStrRow = nRow1; // Skip hidden columns. // TODO: make use of last column value once implemented. @@ -241,15 +241,15 @@ ScMemChart* ScChartArray::CreateMemChartSingle() } // - // Daten + // Daten // ScMemChart* pMemChart = new ScMemChart( static_cast<short>(nColCount), static_cast<short>(nRowCount) ); if (pMemChart) { -// SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); -// pMemChart->SetNumberFormatter( pFormatter ); +// SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); +// pMemChart->SetNumberFormatter( pFormatter ); if ( bValidData ) { BOOL bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown(); @@ -258,7 +258,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle() { for (nRow=0; nRow<nRowCount; nRow++) { - double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen + double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen pDocument->GetCell( aCols[nCol], aRows[nRow], nTab1, pCell ); if (pCell) @@ -288,7 +288,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle() } else { - //! Flag, dass Daten ungueltig ?? + //! Flag, dass Daten ungueltig ?? for (nCol=0; nCol<nColCount; nCol++) for (nRow=0; nRow<nRowCount; nRow++) @@ -296,7 +296,7 @@ ScMemChart* ScChartArray::CreateMemChartSingle() } // - // Spalten-Header + // Spalten-Header // for (nCol=0; nCol<nColCount; nCol++) @@ -317,11 +317,11 @@ ScMemChart* ScChartArray::CreateMemChartSingle() // ULONG nNumberAttr = (nTotalRows ? pDocument->GetNumberFormat( // ScAddress( pCols[nCol], nRow1, nTab1)) : 0); -// pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr ); +// pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr ); } // - // Zeilen-Header + // Zeilen-Header // for (nRow=0; nRow<nRowCount; nRow++) @@ -342,31 +342,31 @@ ScMemChart* ScChartArray::CreateMemChartSingle() // ULONG nNumberAttr = (nTotalCols ? pDocument->GetNumberFormat( // ScAddress( nCol1, pRows[nRow], nTab1)) : 0); -// pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr ); +// pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr ); } // // Titel // -// pMemChart->SetMainTitle(ScGlobal::GetRscString(STR_CHART_MAINTITLE)); -// pMemChart->SetSubTitle(ScGlobal::GetRscString(STR_CHART_SUBTITLE)); -// pMemChart->SetXAxisTitle(ScGlobal::GetRscString(STR_CHART_XTITLE)); -// pMemChart->SetYAxisTitle(ScGlobal::GetRscString(STR_CHART_YTITLE)); -// pMemChart->SetZAxisTitle(ScGlobal::GetRscString(STR_CHART_ZTITLE)); +// pMemChart->SetMainTitle(ScGlobal::GetRscString(STR_CHART_MAINTITLE)); +// pMemChart->SetSubTitle(ScGlobal::GetRscString(STR_CHART_SUBTITLE)); +// pMemChart->SetXAxisTitle(ScGlobal::GetRscString(STR_CHART_XTITLE)); +// pMemChart->SetYAxisTitle(ScGlobal::GetRscString(STR_CHART_YTITLE)); +// pMemChart->SetZAxisTitle(ScGlobal::GetRscString(STR_CHART_ZTITLE)); // - // Zahlen-Typ + // Zahlen-Typ // // ULONG nNumberAttr = (nTotalCols && nTotalRows ? // pDocument->GetNumberFormat( ScAddress( nCol1, nRow1, nTab1)) : // 0); -// if (pFormatter) -// pMemChart->SetDataType(pFormatter->GetType( nNumberAttr )); +// if (pFormatter) +// pMemChart->SetDataType(pFormatter->GetType( nNumberAttr )); // - // Parameter-Strings + // Parameter-Strings // // SetExtraStrings( *pMemChart ); @@ -403,14 +403,14 @@ ScMemChart* ScChartArray::CreateMemChartMulti() } // - // Daten + // Daten // ScMemChart* pMemChart = new ScMemChart( static_cast<short>(nColCount), static_cast<short>(nRowCount) ); if (pMemChart) { -// pMemChart->SetNumberFormatter( pDocument->GetFormatTable() ); +// pMemChart->SetNumberFormatter( pDocument->GetFormatTable() ); BOOL bCalcAsShown = pDocument->GetDocOptions().IsCalcAsShown(); ULONG nIndex = 0; if (bValidData) @@ -419,10 +419,10 @@ ScMemChart* ScChartArray::CreateMemChartMulti() { for ( nRow = 0; nRow < nRowCount; nRow++, nIndex++ ) { - double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen + double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen const ScAddress* pPos = GetPositionMap()->GetPosition( nIndex ); if ( pPos ) - { // sonst: Luecke + { // sonst: Luecke ScBaseCell* pCell = pDocument->GetCell( *pPos ); if (pCell) { @@ -452,10 +452,10 @@ ScMemChart* ScChartArray::CreateMemChartMulti() { for ( nRow = 0; nRow < nRowCount; nRow++, nIndex++ ) { - double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen + double nVal = DBL_MIN; // Hack fuer Chart, um leere Zellen zu erkennen const ScAddress* pPos = GetPositionMap()->GetPosition( nIndex ); if ( pPos ) - { // sonst: Luecke + { // sonst: Luecke ScBaseCell* pCell = pDocument->GetCell( *pPos ); if (pCell) { @@ -484,7 +484,7 @@ ScMemChart* ScChartArray::CreateMemChartMulti() //2do: Beschriftung bei Luecken // - // Spalten-Header + // Spalten-Header // SCCOL nPosCol = 0; @@ -510,15 +510,15 @@ ScMemChart* ScChartArray::CreateMemChartMulti() } pMemChart->SetColText( static_cast<short>(nCol), aString); -// ULONG nNumberAttr = 0; -// pPos = GetPositionMap()->GetPosition( nCol, 0 ); -// if ( pPos ) -// nNumberAttr = pDocument->GetNumberFormat( *pPos ); -// pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr ); +// ULONG nNumberAttr = 0; +// pPos = GetPositionMap()->GetPosition( nCol, 0 ); +// if ( pPos ) +// nNumberAttr = pDocument->GetNumberFormat( *pPos ); +// pMemChart->SetNumFormatIdCol( static_cast<long>(nCol), nNumberAttr ); } // - // Zeilen-Header + // Zeilen-Header // SCROW nPosRow = 0; @@ -543,43 +543,43 @@ ScMemChart* ScChartArray::CreateMemChartMulti() } pMemChart->SetRowText( static_cast<short>(nRow), aString); -// ULONG nNumberAttr = 0; -// pPos = GetPositionMap()->GetPosition( 0, nRow ); -// if ( pPos ) -// nNumberAttr = pDocument->GetNumberFormat( *pPos ); -// pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr ); +// ULONG nNumberAttr = 0; +// pPos = GetPositionMap()->GetPosition( 0, nRow ); +// if ( pPos ) +// nNumberAttr = pDocument->GetNumberFormat( *pPos ); +// pMemChart->SetNumFormatIdRow( static_cast<long>(nRow), nNumberAttr ); } // // Titel // -// pMemChart->SetMainTitle(ScGlobal::GetRscString(STR_CHART_MAINTITLE)); -// pMemChart->SetSubTitle(ScGlobal::GetRscString(STR_CHART_SUBTITLE)); -// pMemChart->SetXAxisTitle(ScGlobal::GetRscString(STR_CHART_XTITLE)); -// pMemChart->SetYAxisTitle(ScGlobal::GetRscString(STR_CHART_YTITLE)); -// pMemChart->SetZAxisTitle(ScGlobal::GetRscString(STR_CHART_ZTITLE)); +// pMemChart->SetMainTitle(ScGlobal::GetRscString(STR_CHART_MAINTITLE)); +// pMemChart->SetSubTitle(ScGlobal::GetRscString(STR_CHART_SUBTITLE)); +// pMemChart->SetXAxisTitle(ScGlobal::GetRscString(STR_CHART_XTITLE)); +// pMemChart->SetYAxisTitle(ScGlobal::GetRscString(STR_CHART_YTITLE)); +// pMemChart->SetZAxisTitle(ScGlobal::GetRscString(STR_CHART_ZTITLE)); // - // Zahlen-Typ + // Zahlen-Typ // -// SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); -// if (pFormatter) -// { -// ULONG nIndex = 0; -// ULONG nCount = GetPositionMap()->GetCount(); -// const ScAddress* pPos; -// do -// { -// pPos = GetPositionMap()->GetPosition( nIndex ); -// } while ( !pPos && ++nIndex < nCount ); -// ULONG nFormat = ( pPos ? pDocument->GetNumberFormat( *pPos ) : 0 ); -// pMemChart->SetDataType( pFormatter->GetType( nFormat ) ); -// } +// SvNumberFormatter* pFormatter = pDocument->GetFormatTable(); +// if (pFormatter) +// { +// ULONG nIndex = 0; +// ULONG nCount = GetPositionMap()->GetCount(); +// const ScAddress* pPos; +// do +// { +// pPos = GetPositionMap()->GetPosition( nIndex ); +// } while ( !pPos && ++nIndex < nCount ); +// ULONG nFormat = ( pPos ? pDocument->GetNumberFormat( *pPos ) : 0 ); +// pMemChart->SetDataType( pFormatter->GetType( nFormat ) ); +// } // - // Parameter-Strings + // Parameter-Strings // // SetExtraStrings( *pMemChart ); @@ -594,10 +594,10 @@ ScMemChart* ScChartArray::CreateMemChartMulti() // -// Collection +// Collection // -ScDataObject* ScChartCollection::Clone() const +ScDataObject* ScChartCollection::Clone() const { return new ScChartCollection(*this); } diff --git a/sc/source/core/tool/charthelper.cxx b/sc/source/core/tool/charthelper.cxx index 19b9e4099be3..a6b3e724a3aa 100644 --- a/sc/source/core/tool/charthelper.cxx +++ b/sc/source/core/tool/charthelper.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,7 +95,7 @@ USHORT lcl_DoUpdateCharts( const ScAddress& rPos, ScDocument* pDoc, BOOL bAllCha BOOL lcl_AdjustRanges( ScRangeList& rRanges, SCTAB nSourceTab, SCTAB nDestTab, SCTAB nTabCount ) { - //! if multiple sheets are copied, update references into the other copied sheets? + //! if multiple sheets are copied, update references into the other copied sheets? BOOL bChanged = FALSE; @@ -261,7 +261,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument // the range string must be in Calc A1 format. uno::Reference< chart2::data::XDataSequence > xNewSeq( xDataProvider->createDataSequenceByRangeRepresentation( rRanges[nRange++] )); - + uno::Reference< beans::XPropertySet > xNewProps( xNewSeq, uno::UNO_QUERY ); if( xNewProps.is() ) xNewProps->setPropertyValue( aPropertyNameRole, xLabel->getPropertyValue( aPropertyNameRole ) ); @@ -277,7 +277,7 @@ void ScChartHelper::SetChartRanges( const uno::Reference< chart2::XChartDocument // the range string must be in Calc A1 format. uno::Reference< chart2::data::XDataSequence > xNewSeq( xDataProvider->createDataSequenceByRangeRepresentation( rRanges[nRange++] )); - + uno::Reference< beans::XPropertySet > xNewProps( xNewSeq, uno::UNO_QUERY ); if( xNewProps.is() ) xNewProps->setPropertyValue( aPropertyNameRole, xValues->getPropertyValue( aPropertyNameRole ) ); diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index 15489babda4f..f3aa255b5b58 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.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,7 +47,7 @@ using ::std::unary_function; using ::std::for_each; //2do: DocOption TimeOut? -//#define SC_CHARTTIMEOUT 1000 // eine Sekunde keine Aenderung/KeyEvent +//#define SC_CHARTTIMEOUT 1000 // eine Sekunde keine Aenderung/KeyEvent // Update chart listeners quickly, to get a similar behavior to loaded charts // which register UNO listeners. @@ -58,8 +58,8 @@ using ::std::for_each; class ScChartUnoData { - uno::Reference< chart::XChartDataChangeEventListener > xListener; - uno::Reference< chart::XChartData > xSource; + uno::Reference< chart::XChartDataChangeEventListener > xListener; + uno::Reference< chart::XChartData > xSource; public: ScChartUnoData( const uno::Reference< chart::XChartDataChangeEventListener >& rL, @@ -67,8 +67,8 @@ public: xListener( rL ), xSource( rS ) {} ~ScChartUnoData() {} - const uno::Reference< chart::XChartDataChangeEventListener >& GetListener() const { return xListener; } - const uno::Reference< chart::XChartData >& GetSource() const { return xSource; } + const uno::Reference< chart::XChartDataChangeEventListener >& GetListener() const { return xListener; } + const uno::Reference< chart::XChartData >& GetSource() const { return xSource; } }; @@ -96,7 +96,7 @@ void ScChartListener::ExternalRefListener::notify(sal_uInt16 nFileId, ScExternal case ScExternalRefManager::LINK_MODIFIED: { if (maFileIds.count(nFileId)) - // We are listening to this external document. Send an update + // We are listening to this external document. Send an update // requst to the chart. mrParent.SetUpdateQueue(); } @@ -128,8 +128,8 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP, const ScRange& rRange ) : StrData( rName ), SvtListener(), - mpExtRefListener(NULL), - mpTokens(new vector<ScSharedTokenRef>), + mpExtRefListener(NULL), + mpTokens(new vector<ScSharedTokenRef>), pUnoData( NULL ), pDoc( pDocP ), bUsed( FALSE ), @@ -143,8 +143,8 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : StrData( rName ), SvtListener(), - mpExtRefListener(NULL), - mpTokens(new vector<ScSharedTokenRef>), + mpExtRefListener(NULL), + mpTokens(new vector<ScSharedTokenRef>), pUnoData( NULL ), pDoc( pDocP ), bUsed( FALSE ), @@ -157,7 +157,7 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP, ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP, vector<ScSharedTokenRef>* pTokens ) : StrData( rName ), SvtListener(), - mpExtRefListener(NULL), + mpExtRefListener(NULL), mpTokens(pTokens), pUnoData( NULL ), pDoc( pDocP ), @@ -170,7 +170,7 @@ ScChartListener::ScChartListener( const String& rName, ScDocument* pDocP, vector ScChartListener::ScChartListener( const ScChartListener& r ) : StrData( r ), SvtListener(), - mpExtRefListener(NULL), + mpExtRefListener(NULL), mpTokens(new vector<ScSharedTokenRef>(*r.mpTokens)), pUnoData( NULL ), pDoc( r.pDoc ), @@ -183,7 +183,7 @@ ScChartListener::ScChartListener( const ScChartListener& r ) : if (r.mpExtRefListener.get()) { - // Re-register this new listener for the files that the old listener + // Re-register this new listener for the files that the old listener // was listening to. ScExternalRefManager* pRefMgr = pDoc->GetExternalRefManager(); @@ -224,7 +224,7 @@ void ScChartListener::SetUno( const uno::Reference< chart::XChartDataChangeEventListener >& rListener, const uno::Reference< chart::XChartData >& rSource ) { -// DBG_ASSERT( rListener.is() && rSource.is(), "Nullpointer bei SetUno" ); +// DBG_ASSERT( rListener.is() && rSource.is(), "Nullpointer bei SetUno" ); delete pUnoData; pUnoData = new ScChartUnoData( rListener, rSource ); } @@ -253,7 +253,7 @@ void ScChartListener::Notify( SvtBroadcaster&, const SfxHint& rHint ) void ScChartListener::Update() { if ( pDoc->IsInInterpreter() ) - { // #73482# If interpreting do nothing and restart timer so we don't + { // #73482# If interpreting do nothing and restart timer so we don't // interfere with interpreter and don't produce an Err522 or similar. // This may happen if we are rescheduled via Basic function. pDoc->GetChartListenerCollection()->StartTimer(); @@ -262,7 +262,7 @@ void ScChartListener::Update() if ( pUnoData ) { bDirty = FALSE; - //! irgendwann mal erkennen, was sich innerhalb des Charts geaendert hat + //! irgendwann mal erkennen, was sich innerhalb des Charts geaendert hat chart::ChartDataChangeEvent aEvent( pUnoData->GetSource(), chart::ChartDataChangeType_ALL, 0, 0, 0, 0 ); @@ -441,7 +441,7 @@ BOOL ScChartListener::operator==( const ScChartListener& r ) bool b1 = (mpTokens.get() && !mpTokens->empty()); bool b2 = (r.mpTokens.get() && !r.mpTokens->empty()); - if (pDoc != r.pDoc || bUsed != r.bUsed || bDirty != r.bDirty || + if (pDoc != r.pDoc || bUsed != r.bUsed || bDirty != r.bDirty || bSeriesRangesScheduled != r.bSeriesRangesScheduled || GetString() != r.GetString() || b1 != b2) return false; @@ -488,15 +488,15 @@ ScChartListenerCollection::ScChartListenerCollection( ScChartListenerCollection::~ScChartListenerCollection() { - // #96783# remove ChartListener objects before aTimer dtor is called, because - // ScChartListener::EndListeningTo may cause ScChartListenerCollection::StartTimer - // to be called if an empty ScNoteCell is deleted + // #96783# remove ChartListener objects before aTimer dtor is called, because + // ScChartListener::EndListeningTo may cause ScChartListenerCollection::StartTimer + // to be called if an empty ScNoteCell is deleted if (GetCount()) FreeAll(); } -ScDataObject* ScChartListenerCollection::Clone() const +ScDataObject* ScChartListenerCollection::Clone() const { return new ScChartListenerCollection( *this ); } @@ -537,8 +537,8 @@ void ScChartListenerCollection::FreeUnused() for ( USHORT nIndex = nCount; nIndex-- >0; ) { ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ]; - // Uno-Charts nicht rauskicken - // (werden per FreeUno von aussen geloescht) + // Uno-Charts nicht rauskicken + // (werden per FreeUno von aussen geloescht) if ( !pCL->IsUno() ) { if ( pCL->IsUsed() ) @@ -562,7 +562,7 @@ void ScChartListenerCollection::FreeUno( const uno::Reference< chart::XChartData { Free( pCL ); } - //! sollte nur einmal vorkommen? + //! sollte nur einmal vorkommen? } } @@ -591,7 +591,7 @@ void ScChartListenerCollection::UpdateDirtyCharts() if ( pCL->IsDirty() ) pCL->Update(); if ( aTimer.IsActive() && !pDoc->IsImportingXML()) - break; // da kam einer dazwischen + break; // da kam einer dazwischen } } @@ -616,7 +616,7 @@ void ScChartListenerCollection::SetDiffDirty( ScChartListener* pCL = (ScChartListener*) pItems[ nIndex ]; USHORT nFound; BOOL bFound = rCmp.Search( pCL, nFound ); - if ( !bFound || (*pCL != *((const ScChartListener*) rCmp.pItems[ nFound ])) ) + if ( !bFound || (*pCL != *((const ScChartListener*) rCmp.pItems[ nFound ])) ) { if ( bSetChartRangeLists ) { diff --git a/sc/source/core/tool/chartlock.cxx b/sc/source/core/tool/chartlock.cxx index f73b74ff778c..78230d0373b2 100644 --- a/sc/source/core/tool/chartlock.cxx +++ b/sc/source/core/tool/chartlock.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/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index f8630df4a836..bdf2e1955121 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.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 @@ -113,7 +113,7 @@ void ScChartPositioner::GlueState() if ( pR->aStart.Tab() == pR->aEnd.Tab() ) eGlue = SC_CHARTGLUE_NONE; else - eGlue = SC_CHARTGLUE_COLS; // mehrere Tabellen spaltenweise + eGlue = SC_CHARTGLUE_COLS; // mehrere Tabellen spaltenweise nStartCol = pR->aStart.Col(); nStartRow = pR->aStart.Row(); } @@ -125,7 +125,7 @@ void ScChartPositioner::GlueState() } return; } -// ULONG nOldPos = aRangeListRef->GetCurPos(); +// ULONG nOldPos = aRangeListRef->GetCurPos(); pR = aRangeListRef->First(); nStartCol = pR->aStart.Col(); @@ -135,7 +135,7 @@ void ScChartPositioner::GlueState() nMaxCols = nEndCol = 0; nMaxRows = nEndRow = 0; do - { // umspannenden Bereich etc. feststellen + { // umspannenden Bereich etc. feststellen SCCOLROW nTmp, n1, n2; if ( (n1 = pR->aStart.Col()) < nStartCol ) nStartCol = static_cast<SCCOL>(n1); @@ -181,7 +181,7 @@ void ScChartPositioner::GlueState() BYTE huge* p; BYTE huge* pA = (BYTE huge*) SvMemAlloc( nCR ); if ( nCR > (ULONG)((USHORT)~0) ) - { // in 32k Bloecken initialisieren + { // in 32k Bloecken initialisieren ULONG j; for ( j=0; j<nCR; j+=0x8000 ) { @@ -199,7 +199,7 @@ void ScChartPositioner::GlueState() SCCOL nCol, nCol1, nCol2; SCROW nRow, nRow1, nRow2; for ( pR = aRangeListRef->First(); pR; pR = aRangeListRef->Next() ) - { // Selektionen 2D als belegt markieren + { // Selektionen 2D als belegt markieren nCol1 = pR->aStart.Col() - nStartCol; nCol2 = pR->aEnd.Col() - nStartCol; nRow1 = pR->aStart.Row() - nStartRow; @@ -215,16 +215,16 @@ void ScChartPositioner::GlueState() BOOL bGlueCols = FALSE; for ( nCol = 0; bGlue && nCol < nC; nCol++ ) - { // Spalten probieren durchzugehen und als frei markieren + { // Spalten probieren durchzugehen und als frei markieren p = pA + (ULONG)nCol * nR; for ( nRow = 0; bGlue && nRow < nR; nRow++, p++ ) { if ( *p == nOccu ) - { // Wenn einer mittendrin liegt ist keine Zusammenfassung + { // Wenn einer mittendrin liegt ist keine Zusammenfassung // moeglich. Am Rand koennte ok sein, wenn in dieser Spalte // in jeder belegten Zeile einer belegt ist. if ( nRow > 0 && nCol > 0 ) - bGlue = FALSE; // nCol==0 kann DummyUpperLeft sein + bGlue = FALSE; // nCol==0 kann DummyUpperLeft sein else nRow = nR; } @@ -232,22 +232,22 @@ void ScChartPositioner::GlueState() *p = nFree; } if ( bGlue && *(p = (pA + ((((ULONG)nCol+1) * nR) - 1))) == nFree ) - { // Spalte als komplett frei markieren + { // Spalte als komplett frei markieren *p = nGlue; - bGlueCols = TRUE; // mindestens eine freie Spalte + bGlueCols = TRUE; // mindestens eine freie Spalte } } BOOL bGlueRows = FALSE; for ( nRow = 0; bGlue && nRow < nR; nRow++ ) - { // Zeilen probieren durchzugehen und als frei markieren + { // Zeilen probieren durchzugehen und als frei markieren p = pA + nRow; for ( nCol = 0; bGlue && nCol < nC; nCol++, p+=nR ) { if ( *p == nOccu ) { if ( nCol > 0 && nRow > 0 ) - bGlue = FALSE; // nRow==0 kann DummyUpperLeft sein + bGlue = FALSE; // nRow==0 kann DummyUpperLeft sein else nCol = nC; } @@ -255,9 +255,9 @@ void ScChartPositioner::GlueState() *p = nFree; } if ( bGlue && *(p = (pA + ((((ULONG)nC-1) * nR) + nRow))) == nFree ) - { // Zeile als komplett frei markieren + { // Zeile als komplett frei markieren *p = nGlue; - bGlueRows = TRUE; // mindestens eine freie Zeile + bGlueRows = TRUE; // mindestens eine freie Zeile } } @@ -265,7 +265,7 @@ void ScChartPositioner::GlueState() // hinzugezogen werden p = pA + 1; for ( ULONG n = 1; bGlue && n < nCR; n++, p++ ) - { // ein unberuehrtes Feld heisst, dass es weder spaltenweise noch + { // ein unberuehrtes Feld heisst, dass es weder spaltenweise noch // zeilenweise zu erreichen war, also nichts zusamenzufassen if ( *p == nHole ) bGlue = FALSE; @@ -331,7 +331,7 @@ void ScChartPositioner::CheckColRowHeaders() pR->GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 ); BOOL bTopRow = (nRow1 == nStartRow); if ( bRowStrings && (bVert || nCol1 == nStartCol) ) - { // NONE oder ROWS: RowStrings in jeder Selektion moeglich + { // NONE oder ROWS: RowStrings in jeder Selektion moeglich // COLS oder BOTH: nur aus der ersten Spalte if ( nCol1 <= nCol2 ) for (iRow=nRow1; iRow<=nRow2 && bRowStrings; iRow++) @@ -341,7 +341,7 @@ void ScChartPositioner::CheckColRowHeaders() } } if ( bColStrings && bTopRow ) - { // ColStrings nur aus der ersten Zeile + { // ColStrings nur aus der ersten Zeile if ( nRow1 <= nRow2 ) for (iCol=nCol1; iCol<=nCol2 && bColStrings; iCol++) { @@ -381,7 +381,7 @@ void ScChartPositioner::CreatePositionMap() SCTAB nTab, nTab1, nTab2; // - // wirkliche Groesse (ohne versteckte Zeilen/Spalten) + // wirkliche Groesse (ohne versteckte Zeilen/Spalten) // SCSIZE nColCount = 0; @@ -408,7 +408,7 @@ void ScChartPositioner::CreatePositionMap() for ( nCol = nCol1; nCol <= nCol2; ++nCol, ++nInsCol ) { if ( bNoGlue || eGlue == SC_CHARTGLUE_ROWS ) - { // meistens gleiche Cols + { // meistens gleiche Cols if ( (pCol = (Table*) pCols->Get( nInsCol ))==NULL ) { pCols->Insert( nInsCol, pNewRowTable ); @@ -417,7 +417,7 @@ void ScChartPositioner::CreatePositionMap() } } else - { // meistens neue Cols + { // meistens neue Cols if ( pCols->Insert( nInsCol, pNewRowTable ) ) { pCol = pNewRowTable; @@ -450,7 +450,7 @@ void ScChartPositioner::CreatePositionMap() if ( (pCol = (Table*) pCols->First())!=NULL ) { if ( bDummyUpperLeft ) - pCol->Insert( 0, (void*)0 ); // Dummy fuer Beschriftung + pCol->Insert( 0, (void*)0 ); // Dummy fuer Beschriftung nRowCount = static_cast< SCSIZE >( pCol->Count()); } else @@ -461,7 +461,7 @@ void ScChartPositioner::CreatePositionMap() nRowCount -= nRowAdd; if ( nColCount==0 || nRowCount==0 ) - { // einen Eintrag ohne Daten erzeugen + { // einen Eintrag ohne Daten erzeugen pR = aRangeListRef->First(); if ( pCols->Count() > 0 ) pCol = (Table*) pCols->First(); @@ -472,7 +472,7 @@ void ScChartPositioner::CreatePositionMap() } nColCount = 1; if ( pCol->Count() > 0 ) - { // kann ja eigentlich nicht sein, wenn nColCount==0 || nRowCount==0 + { // kann ja eigentlich nicht sein, wenn nColCount==0 || nRowCount==0 pPos = (ScAddress*) pCol->First(); if ( pPos ) { @@ -489,7 +489,7 @@ void ScChartPositioner::CreatePositionMap() else { if ( bNoGlue ) - { // Luecken mit Dummies fuellen, erste Spalte ist Master + { // Luecken mit Dummies fuellen, erste Spalte ist Master Table* pFirstCol = (Table*) pCols->First(); ULONG nCount = pFirstCol->Count(); pFirstCol->First(); @@ -498,7 +498,7 @@ void ScChartPositioner::CreatePositionMap() ULONG nKey = pFirstCol->GetCurKey(); pCols->First(); while ( (pCol = (Table*) pCols->Next())!=NULL ) - pCol->Insert( nKey, (void*)0 ); // keine Daten + pCol->Insert( nKey, (void*)0 ); // keine Daten } } } @@ -506,9 +506,9 @@ void ScChartPositioner::CreatePositionMap() pPositionMap = new ScChartPositionMap( static_cast<SCCOL>(nColCount), static_cast<SCROW>(nRowCount), static_cast<SCCOL>(nColAdd), static_cast<SCROW>(nRowAdd), *pCols ); - // Aufraeumen + // Aufraeumen for ( pCol = (Table*) pCols->First(); pCol; pCol = (Table*) pCols->Next() ) - { //! nur Tables loeschen, nicht die ScAddress* + { //! nur Tables loeschen, nicht die ScAddress* delete pCol; } delete pCols; @@ -540,7 +540,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, if ( nRowAdd ) pPos = (ScAddress*) pCol->Next(); if ( nColAdd ) - { // eigenstaendig + { // eigenstaendig for ( nRow = 0; nRow < nRowCount; nRow++ ) { ppRowHeader[ nRow ] = pPos; @@ -548,7 +548,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, } } else - { // Kopie + { // Kopie for ( nRow = 0; nRow < nRowCount; nRow++ ) { ppRowHeader[ nRow ] = ( pPos ? new ScAddress( *pPos ) : NULL ); @@ -567,7 +567,7 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, pPos = (ScAddress*) pCol->First(); if ( nRowAdd ) { - ppColHeader[ nCol ] = pPos; // eigenstaendig + ppColHeader[ nCol ] = pPos; // eigenstaendig pPos = (ScAddress*) pCol->Next(); } else diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 7ff7e4c17b49..baef1ae3529e 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.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 @@ -31,7 +31,7 @@ #include <tools/debug.hxx> -#include <tools/shl.hxx> // SHL_CALC +#include <tools/shl.hxx> // SHL_CALC #include <tools/stack.hxx> #include <tools/rtti.hxx> #include <svl/zforlist.hxx> @@ -48,8 +48,8 @@ #include "global.hxx" #include "rechead.hxx" #include "scerrors.hxx" -#include "scmod.hxx" // SC_MOD -#include "inputopt.hxx" // GetExpandRefs +#include "scmod.hxx" // SC_MOD +#include "inputopt.hxx" // GetExpandRefs #include "patattr.hxx" #include "hints.hxx" @@ -69,8 +69,8 @@ const USHORT nMemPoolChangeActionLinkEntry = (0x8000 - 64) / sizeof(ScChangeActi IMPL_FIXEDMEMPOOL_NEWDEL( ScChangeActionLinkEntry, nMemPoolChangeActionLinkEntry, nMemPoolChangeActionLinkEntry ) // loaded MSB > eigenes => inkompatibel -#define SC_CHGTRACK_FILEFORMAT_FIRST 0x0001 -#define SC_CHGTRACK_FILEFORMAT 0x0001 +#define SC_CHGTRACK_FILEFORMAT_FIRST 0x0001 +#define SC_CHGTRACK_FILEFORMAT 0x0001 // --- ScChangeActionLinkEntry --------------------------------------------- @@ -202,7 +202,7 @@ BOOL ScChangeAction::IsClickable() const if ( eCCT == SC_CACCT_MATREF ) return FALSE; if ( eCCT == SC_CACCT_MATORG ) - { // no Accept-Select if one of the references is in a deleted col/row + { // no Accept-Select if one of the references is in a deleted col/row const ScChangeActionLinkEntry* pL = ((ScChangeActionContent*)this)->GetFirstDependentEntry(); while ( pL ) @@ -213,9 +213,9 @@ BOOL ScChangeAction::IsClickable() const pL = pL->GetNext(); } } - return TRUE; // for Select() a content doesn't have to be touchable + return TRUE; // for Select() a content doesn't have to be touchable } - return IsTouchable(); // Accept()/Reject() only on touchables + return IsTouchable(); // Accept()/Reject() only on touchables } @@ -231,8 +231,8 @@ BOOL ScChangeAction::IsRejectable() const ScChangeActionContent* pNextContent = ((ScChangeActionContent*)this)->GetNextContent(); if ( pNextContent == NULL ) - return TRUE; // *this is TopContent - return pNextContent->IsRejected(); // *this is next rejectable + return TRUE; // *this is TopContent + return pNextContent->IsRejected(); // *this is next rejectable } return IsTouchable(); } @@ -250,8 +250,8 @@ BOOL ScChangeAction::IsInternalRejectable() const ScChangeActionContent* pNextContent = ((ScChangeActionContent*)this)->GetNextContent(); if ( pNextContent == NULL ) - return TRUE; // *this is TopContent - return pNextContent->IsRejected(); // *this is next rejectable + return TRUE; // *this is TopContent + return pNextContent->IsRejected(); // *this is next rejectable } return IsTouchable(); } @@ -259,7 +259,7 @@ BOOL ScChangeAction::IsInternalRejectable() const BOOL ScChangeAction::IsDialogRoot() const { - return IsInternalRejectable(); // only rejectables in root + return IsInternalRejectable(); // only rejectables in root } @@ -321,7 +321,7 @@ void ScChangeAction::RemoveAllLinks() void ScChangeAction::RemoveAllAnyLinks() { while ( pLinkAny ) - delete pLinkAny; // rueckt sich selbst hoch + delete pLinkAny; // rueckt sich selbst hoch } @@ -360,7 +360,7 @@ void ScChangeAction::RemoveAllDeletedIn() { //! nicht vom evtl. TopContent sondern wirklich dieser while ( pLinkDeletedIn ) - delete pLinkDeletedIn; // rueckt sich selbst hoch + delete pLinkDeletedIn; // rueckt sich selbst hoch } @@ -413,14 +413,14 @@ void ScChangeAction::SetDeletedIn( ScChangeAction* p ) void ScChangeAction::RemoveAllDeleted() { while ( pLinkDeleted ) - delete pLinkDeleted; // rueckt sich selbst hoch + delete pLinkDeleted; // rueckt sich selbst hoch } void ScChangeAction::RemoveAllDependent() { while ( pLinkDependent ) - delete pLinkDependent; // rueckt sich selbst hoch + delete pLinkDependent; // rueckt sich selbst hoch } @@ -603,8 +603,8 @@ void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack, pListContents = pE; } } - SetState( SC_CAS_REJECTED ); // vor UpdateReference fuer Move - pTrack->UpdateReference( this, TRUE ); // LinkDeleted freigeben + SetState( SC_CAS_REJECTED ); // vor UpdateReference fuer Move + pTrack->UpdateReference( this, TRUE ); // LinkDeleted freigeben DBG_ASSERT( !pLinkDeleted, "ScChangeAction::RejectRestoreContents: pLinkDeleted != NULL" ); // Liste der Contents abarbeiten und loeschen ScDocument* pDoc = pTrack->GetDocument(); @@ -619,7 +619,7 @@ void ScChangeAction::RejectRestoreContents( ScChangeTrack* pTrack, delete pE; pE = pNextEntry; } - DeleteCellEntries(); // weg mit den generierten + DeleteCellEntries(); // weg mit den generierten } @@ -1114,12 +1114,12 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc ) BOOL bOk = TRUE; if ( IsTopDelete() ) - { // den kompletten Bereich in einem Rutsch restaurieren + { // den kompletten Bereich in einem Rutsch restaurieren ScBigRange aTmpRange( GetOverAllRange() ); if ( !aTmpRange.IsValid( pDoc ) ) { if ( GetType() == SC_CAT_DELETE_TABS ) - { // wird Tab angehaengt? + { // wird Tab angehaengt? if ( aTmpRange.aStart.Tab() > pDoc->GetMaxTableNumber() ) bOk = FALSE; } @@ -1138,7 +1138,7 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc ) { case SC_CAT_DELETE_COLS : if ( !(aRange.aStart.Col() == 0 && aRange.aEnd.Col() == MAXCOL) ) - { // nur wenn nicht TabDelete + { // nur wenn nicht TabDelete if ( ( bOk = pDoc->CanInsertCol( aRange ) ) != FALSE ) bOk = pDoc->InsertCol( aRange ); } @@ -1182,7 +1182,7 @@ BOOL ScChangeActionDel::Reject( ScDocument* pDoc ) void ScChangeActionDel::UndoCutOffMoves() -{ // abgeschnittene Moves wiederherstellen, Entries/Links deleten +{ // abgeschnittene Moves wiederherstellen, Entries/Links deleten while ( pLinkMove ) { ScChangeActionMove* pMove = pLinkMove->GetMove(); @@ -1225,12 +1225,12 @@ void ScChangeActionDel::UndoCutOffMoves() // added to avoid warnings } } - delete pLinkMove; // rueckt sich selbst hoch + delete pLinkMove; // rueckt sich selbst hoch } } void ScChangeActionDel::UndoCutOffInsert() -{ // abgeschnittenes Insert wiederherstellen +{ // abgeschnittenes Insert wiederherstellen if ( pCutOff ) { switch ( pCutOff->GetType() ) @@ -1373,7 +1373,7 @@ BOOL ScChangeActionMove::Reject( ScDocument* pDoc ) if ( !bOk ) return FALSE; - pTrack->LookUpContents( aToRange, pDoc, 0, 0, 0 ); // zu movende Contents + pTrack->LookUpContents( aToRange, pDoc, 0, 0, 0 ); // zu movende Contents pDoc->DeleteAreaTab( aToRange, IDF_ALL ); pDoc->DeleteAreaTab( aFrmRange, IDF_ALL ); @@ -1405,7 +1405,7 @@ BOOL ScChangeActionMove::Reject( ScDocument* pDoc ) if ( pTrack->IsGenerated( pContent->GetActionNumber() ) && !pContent->IsDeletedIn() ) { - pLinkDependent->UnLink(); //! sonst wird der mitgeloescht + pLinkDependent->UnLink(); //! sonst wird der mitgeloescht pTrack->DeleteGeneratedDelContent( pContent ); } } @@ -1712,7 +1712,7 @@ BOOL ScChangeActionContent::Select( ScDocument* pDoc, ScChangeTrack* pTrack, } if ( bOldest || pEnd != this ) - { // wenn nicht aeltester: ist es ueberhaupt ein anderer als der letzte? + { // wenn nicht aeltester: ist es ueberhaupt ein anderer als der letzte? ScRange aRange( aBigRange.aStart.MakeAddress() ); const ScAddress& rPos = aRange.aStart; @@ -1771,7 +1771,7 @@ void ScChangeActionContent::GetStringOfCell( String& rStr, case CELLTYPE_VALUE : { double nValue = ((ScValueCell*)pCell)->GetValue(); - pDoc->GetFormatTable()->GetInputLineString( nValue, nFormat, + pDoc->GetFormatTable()->GetInputLineString( nValue, nFormat, rStr ); } break; @@ -1860,7 +1860,7 @@ void ScChangeActionContent::SetValue( String& rStr, ScBaseCell*& pCell, switch ( pOrgCell->GetCellType() ) { case CELLTYPE_VALUE : - { // z.B. Datum auch als solches merken + { // z.B. Datum auch als solches merken double nValue = ((ScValueCell*)pOrgCell)->GetValue(); pFromDoc->GetFormatTable()->GetInputLineString( nValue, nFormat, rStr ); @@ -1890,7 +1890,7 @@ void ScChangeActionContent::SetCell( String& rStr, ScBaseCell* pCell, switch ( pCell->GetCellType() ) { case CELLTYPE_VALUE : - { // e.g. remember date as date string + { // e.g. remember date as date string double nValue = ((ScValueCell*)pCell)->GetValue(); pDoc->GetFormatTable()->GetInputLineString( nValue, nFormat, rStr ); @@ -1923,7 +1923,7 @@ void ScChangeActionContent::GetValueString( String& rStr, case CELLTYPE_EDIT : ((ScEditCell*)pCell)->GetString( rStr ); break; - case CELLTYPE_VALUE : // ist immer in rValue + case CELLTYPE_VALUE : // ist immer in rValue rStr = rValue; break; case CELLTYPE_FORMULA : @@ -1987,7 +1987,7 @@ void ScChangeActionContent::PutValueToDoc( ScBaseCell* pCell, { switch ( pCell->GetCellType() ) { - case CELLTYPE_VALUE : // ist immer in rValue + case CELLTYPE_VALUE : // ist immer in rValue pDoc->SetString( aPos.Col(), aPos.Row(), aPos.Tab(), rValue ); break; default: @@ -2089,12 +2089,12 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack, } if ( pTrack->IsInDelete() && !pTrack->IsInDeleteTop() ) - return ; // Formeln nur kompletten Bereich updaten + return ; // Formeln nur kompletten Bereich updaten BOOL bOldFormula = ( pOldCell && pOldCell->GetCellType() == CELLTYPE_FORMULA ); BOOL bNewFormula = ( pNewCell && pNewCell->GetCellType() == CELLTYPE_FORMULA ); if ( bOldFormula || bNewFormula ) - { // via ScFormulaCell UpdateReference anpassen (dort) + { // via ScFormulaCell UpdateReference anpassen (dort) if ( pTrack->IsInDelete() ) { const ScRange& rDelRange = pTrack->GetInDeleteRange(); @@ -2116,7 +2116,7 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack, { case URM_INSDEL : if ( nDx < 0 || nDy < 0 || nDz < 0 ) - { // Delete startet dort hinter geloeschtem Bereich, + { // Delete startet dort hinter geloeschtem Bereich, // Position wird dort angepasst. if ( nDx ) aTmpRange.aStart.IncCol( -nDx ); @@ -2162,7 +2162,7 @@ void ScChangeActionContent::UpdateReference( const ScChangeTrack* pTrack, ((ScFormulaCell*)pNewCell)->UpdateReference( eMode, aRange, (SCsCOL) nDx, (SCsROW) nDy, (SCsTAB) nDz, NULL ); if ( !aBigRange.aStart.IsValid( pTrack->GetDocument() ) ) - { //! HACK! + { //! HACK! //! UpdateReference kann nicht mit Positionen ausserhalb des //! Dokuments umgehen, deswegen alles auf #REF! setzen //2do: make it possible! das bedeutet grossen Umbau von ScAddress etc.! @@ -2368,7 +2368,7 @@ void __EXPORT ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster void ScChangeTrack::SetUser( const String& rUser ) { if ( IsLoadSave() ) - return ; // nicht die Collection zerschiessen + return ; // nicht die Collection zerschiessen aUser = rUser; StrData* pStrData = new StrData( aUser ); @@ -2383,7 +2383,7 @@ void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType, if ( aModifiedLink.IsSet() ) { if ( pBlockModifyMsg ) - aMsgStackTmp.Push( pBlockModifyMsg ); // Block im Block + aMsgStackTmp.Push( pBlockModifyMsg ); // Block im Block pBlockModifyMsg = new ScChangeTrackMsgInfo; pBlockModifyMsg->eMsgType = eMsgType; pBlockModifyMsg->nStartAction = nStartAction; @@ -2405,7 +2405,7 @@ void ScChangeTrack::EndBlockModify( ULONG nEndAction ) } else delete pBlockModifyMsg; - pBlockModifyMsg = aMsgStackTmp.Pop(); // evtl. Block im Block + pBlockModifyMsg = aMsgStackTmp.Pop(); // evtl. Block im Block } if ( !pBlockModifyMsg ) { @@ -2431,7 +2431,7 @@ void ScChangeTrack::NotifyModified( ScChangeTrackMsgType eMsgType, if ( !pBlockModifyMsg || pBlockModifyMsg->eMsgType != eMsgType || (IsGenerated( nStartAction ) && (eMsgType == SC_CTM_APPEND || eMsgType == SC_CTM_REMOVE)) ) - { // Append innerhalb von Append z.B. nicht + { // Append innerhalb von Append z.B. nicht StartBlockModify( eMsgType, nStartAction ); EndBlockModify( nEndAction ); } @@ -2456,7 +2456,7 @@ void ScChangeTrack::MasterLinks( ScChangeAction* pAppend ) } if ( pAppend->IsRejecting() ) - return ; // Rejects haben keine Abhaengigkeiten + return ; // Rejects haben keine Abhaengigkeiten switch ( eType ) { @@ -2594,13 +2594,13 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange, if ( !pRefDoc || nTab < pRefDoc->GetTableCount() ) { if ( nCol1 == 0 && nCol2 == MAXCOL ) - { // ganze Zeilen und/oder Tabellen + { // ganze Zeilen und/oder Tabellen if ( nRow1 == 0 && nRow2 == MAXROW ) - { // ganze Tabellen + { // ganze Tabellen //2do: geht nicht auch komplette Tabelle als ganzes? ScRange aRange( 0, 0, nTab, 0, MAXROW, nTab ); for ( SCCOL nCol = nCol1; nCol <= nCol2; nCol++ ) - { // spaltenweise ist weniger als zeilenweise + { // spaltenweise ist weniger als zeilenweise aRange.aStart.SetCol( nCol ); aRange.aEnd.SetCol( nCol ); if ( nCol == nCol2 ) @@ -2613,7 +2613,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange, nTab-nTab1 + nDz, nRejectingInsert ); } else - { // ganze Zeilen + { // ganze Zeilen ScRange aRange( 0, 0, nTab, MAXCOL, 0, nTab ); for ( SCROW nRow = nRow1; nRow <= nRow2; nRow++ ) { @@ -2627,7 +2627,7 @@ void ScChangeTrack::AppendDeleteRange( const ScRange& rRange, } } else if ( nRow1 == 0 && nRow2 == MAXROW ) - { // ganze Spalten + { // ganze Spalten ScRange aRange( 0, 0, nTab, 0, MAXROW, nTab ); for ( SCCOL nCol = nCol1; nCol <= nCol2; nCol++ ) { @@ -2702,7 +2702,7 @@ void ScChangeTrack::LookUpContents( const ScRange& rOrgRange, aIter.GetTab() + nDz ); ScChangeActionContent* pContent = SearchContentAt( aBigPos, NULL ); if ( !pContent ) - { // nicht getrackte Contents + { // nicht getrackte Contents aPos.Set( aIter.GetCol() + nDx, aIter.GetRow() + nDy, aIter.GetTab() + nDz ); GenerateDelContent( aPos, pCell, pRefDoc ); @@ -2721,7 +2721,7 @@ void ScChangeTrack::AppendMove( const ScRange& rFromRange, const ScRange& rToRange, ScDocument* pRefDoc ) { ScChangeActionMove* pAct = new ScChangeActionMove( rFromRange, rToRange, this ); - LookUpContents( rToRange, pRefDoc, 0, 0, 0 ); // ueberschriebene Contents + LookUpContents( rToRange, pRefDoc, 0, 0, 0 ); // ueberschriebene Contents Append( pAct ); } @@ -2751,7 +2751,7 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos, ScChangeActionContent::GetStringOfCell( aOldValue, pOldCell, pDoc, rPos ); if ( aOldValue != rNewValue || IsMatrixFormulaRangeDifferent( pOldCell, NULL ) ) - { // nur wirkliche Aenderung tracken + { // nur wirkliche Aenderung tracken ScRange aRange( rPos ); ScChangeActionContent* pAct = new ScChangeActionContent( aRange ); pAct->SetOldValue( pOldCell, pDoc, pDoc ); @@ -2773,7 +2773,7 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos, ScChangeActionContent::GetStringOfCell( aNewValue, pNewCell, pDoc, rPos ); if ( aOldValue != aNewValue || IsMatrixFormulaRangeDifferent( pOldCell, pNewCell ) ) - { // nur wirkliche Aenderung tracken + { // nur wirkliche Aenderung tracken ScRange aRange( rPos ); ScChangeActionContent* pAct = new ScChangeActionContent( aRange ); pAct->SetOldValue( pOldCell, pRefDoc, pDoc, nOldFormat ); @@ -2794,7 +2794,7 @@ void ScChangeTrack::AppendContent( const ScAddress& rPos, ScChangeActionContent::GetStringOfCell( aNewValue, pNewCell, pDoc, rPos ); if ( aOldValue != aNewValue || IsMatrixFormulaRangeDifferent( pOldCell, pNewCell ) ) - { // nur wirkliche Aenderung tracken + { // nur wirkliche Aenderung tracken ScRange aRange( rPos ); ScChangeActionContent* pAct = new ScChangeActionContent( aRange ); pAct->SetOldValue( pOldCell, pRefDoc, pDoc ); @@ -2882,7 +2882,7 @@ void ScChangeTrack::AppendContentRange( const ScRange& rRange, bDoContents = TRUE; } r = aRange; - Undo( nStartLastCut, nEndLastCut ); // hier werden sich die Cuts gemerkt + Undo( nStartLastCut, nEndLastCut ); // hier werden sich die Cuts gemerkt //! StartAction erst nach Undo nStartAction = GetActionMax() + 1; StartBlockModify( SC_CTM_APPEND, nStartAction ); @@ -3004,7 +3004,7 @@ ScChangeActionContent* ScChangeTrack::GenerateDelContent( rPos, pCell, pFromDoc, pDoc ); // pNextContent und pPrevContent werden nicht gesetzt if ( pFirstGeneratedDelContent ) - { // vorne reinhaengen + { // vorne reinhaengen pFirstGeneratedDelContent->pPrev = pContent; pContent->pNext = pFirstGeneratedDelContent; } @@ -3028,7 +3028,7 @@ void ScChangeTrack::DeleteGeneratedDelContent( ScChangeActionContent* pContent ) delete pContent; NotifyModified( SC_CTM_REMOVE, nAct, nAct ); if ( nAct == nGeneratedMin ) - ++nGeneratedMin; //! erst nach NotifyModified wg. IsGenerated + ++nGeneratedMin; //! erst nach NotifyModified wg. IsGenerated } @@ -3072,13 +3072,13 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) ScChangeActionType eActType = pAct->GetType(); if ( eActType == SC_CAT_REJECT || (eActType == SC_CAT_MOVE && pAct->IsRejecting()) ) - return ; // diese Rejects sind nicht abhaengig + return ; // diese Rejects sind nicht abhaengig if ( eActType == SC_CAT_CONTENT ) { if ( !(((ScChangeActionContent*)pAct)->GetNextContent() || ((ScChangeActionContent*)pAct)->GetPrevContent()) ) - { // Contents an gleicher Position verketten + { // Contents an gleicher Position verketten ScChangeActionContent* pContent = SearchContentAt( pAct->GetBigRange().aStart, pAct ); if ( pContent ) @@ -3105,9 +3105,9 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) } if ( !(pLinkInsertCol || pLinkInsertRow || pLinkInsertTab || pLinkMove) ) - return ; // keine Dependencies + return ; // keine Dependencies if ( pAct->IsRejecting() ) - return ; // ausser Content keine Dependencies + return ; // ausser Content keine Dependencies // Insert in einem entsprechenden Insert haengt davon ab, sonst muesste // der vorherige Insert gesplittet werden. @@ -3133,7 +3133,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) pTest->GetBigRange().Intersects( rRange ) ) { AddDependentWithNotify( pTest, pAct ); - break; // for + break; // for } } } @@ -3147,7 +3147,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) pTest->GetBigRange().Intersects( rRange ) ) { AddDependentWithNotify( pTest, pAct ); - break; // for + break; // for } } } @@ -3161,7 +3161,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) pTest->GetBigRange().Intersects( rRange ) ) { AddDependentWithNotify( pTest, pAct ); - break; // for + break; // for } } } @@ -3169,7 +3169,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) if ( pLinkMove ) { if ( eActType == SC_CAT_CONTENT ) - { // Content ist von FromRange abhaengig + { // Content ist von FromRange abhaengig const ScBigAddress& rPos = rRange.aStart; for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() ) { @@ -3182,7 +3182,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) } } else if ( eActType == SC_CAT_MOVE ) - { // Move FromRange ist von ToRange abhaengig + { // Move FromRange ist von ToRange abhaengig const ScBigRange& rFromRange = ((ScChangeActionMove*)pAct)->GetFromRange(); for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() ) { @@ -3195,7 +3195,7 @@ void ScChangeTrack::Dependencies( ScChangeAction* pAct ) } } else - { // Inserts und Deletes sind abhaengig, sobald sie FromRange oder + { // Inserts und Deletes sind abhaengig, sobald sie FromRange oder // ToRange kreuzen for ( ScChangeActionLinkEntry* pL = pLinkMove; pL; pL = pL->GetNext() ) { @@ -3254,7 +3254,7 @@ void ScChangeTrack::Remove( ScChangeAction* pRemove ) } if ( IsInPasteCut() && pRemove->GetType() == SC_CAT_CONTENT ) - { //! Content wird wiederverwertet + { //! Content wird wiederverwertet ScChangeActionContent* pContent = (ScChangeActionContent*) pRemove; pContent->RemoveAllLinks(); pContent->ClearTrack(); @@ -3283,7 +3283,7 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge ) ResetLastCut(); StartBlockModify( SC_CTM_REMOVE, nStartAction ); for ( ULONG j = nEndAction; j >= nStartAction; --j ) - { // rueckwaerts um evtl. nActionMax zu recyclen und schnelleren + { // rueckwaerts um evtl. nActionMax zu recyclen und schnelleren // Zugriff via pLast, Deletes in richtiger Reihenfolge ScChangeAction* pAct = ( (j == nActionMax && pLast && pLast->GetActionNumber() == j) ? pLast : GetAction( j ) ); @@ -3312,7 +3312,7 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge ) ULONG nStart = pMove->GetStartLastCut(); ULONG nEnd = pMove->GetEndLastCut(); if ( nStart && nStart <= nEnd ) - { // LastCut wiederherstellen + { // LastCut wiederherstellen //! Links vor Cut-Append aufloesen pMove->RemoveAllLinks(); StartBlockModify( SC_CTM_APPEND, nStart ); @@ -3360,12 +3360,12 @@ void ScChangeTrack::Undo( ULONG nStartAction, ULONG nEndAction, bool bMerge ) BOOL ScChangeTrack::MergeIgnore( const ScChangeAction& rAction, ULONG nFirstMerge ) { if ( rAction.IsRejected() ) - return TRUE; // da kommt noch eine passende Reject-Action + return TRUE; // da kommt noch eine passende Reject-Action if ( rAction.IsRejecting() && rAction.GetRejectAction() >= nFirstMerge ) - return TRUE; // da ist sie + return TRUE; // da ist sie - return FALSE; // alles andere + return FALSE; // alles andere } @@ -3378,7 +3378,7 @@ void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared ) { SetLastMerge( pAct->GetActionNumber() ); while ( pAct ) - { // rueckwaerts, Deletes in richtiger Reihenfolge + { // rueckwaerts, Deletes in richtiger Reihenfolge // #i94841# [Collaboration] When deleting rows is rejected, the content is sometimes wrong if ( bShared || !ScChangeTrack::MergeIgnore( *pAct, nFirstMerge ) ) { @@ -3393,12 +3393,12 @@ void ScChangeTrack::MergePrepare( ScChangeAction* pFirstMerge, bool bShared ) } UpdateReference( pAct, TRUE ); SetInDeleteTop( FALSE ); - pAct->DeleteCellEntries(); // sonst GPF bei Track Clear() + pAct->DeleteCellEntries(); // sonst GPF bei Track Clear() } pAct = ( pAct == pFirstMerge ? NULL : pAct->GetPrev() ); } } - SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther + SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther } @@ -3419,7 +3419,7 @@ void ScChangeTrack::MergeOwn( ScChangeAction* pAct, ULONG nFirstMerge, bool bSha } UpdateReference( pAct, FALSE ); SetInDeleteTop( FALSE ); - SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther + SetMergeState( SC_CTMS_OTHER ); //! nachfolgende per default MergeOther } } @@ -3527,11 +3527,11 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, nDz = -nDz; } if ( bDel ) - { //! fuer diesen Mechanismus gilt: + { //! fuer diesen Mechanismus gilt: //! es gibt nur ganze, einfache geloeschte Spalten/Zeilen ScChangeActionDel* pActDel = (ScChangeActionDel*) pAct; if ( !bUndo ) - { // Delete + { // Delete ScChangeActionType eInsType = SC_CAT_NONE; // for Insert-Undo-"Deletes" switch ( eActType ) { @@ -3552,11 +3552,11 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) { if ( p == pAct ) - continue; // for + continue; // for BOOL bUpdate = TRUE; if ( GetMergeState() == SC_CTMS_OTHER && p->GetActionNumber() <= GetLastMerge() ) - { // Delete in mergendem Dokument, Action im zu mergenden + { // Delete in mergendem Dokument, Action im zu mergenden if ( p->IsInsertType() ) { // Bei Insert Referenzen nur anpassen, wenn das Delete @@ -3567,7 +3567,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, } else if ( p->GetType() == SC_CAT_CONTENT && p->IsDeletedInDelType( eInsType ) ) - { // Content in Insert-Undo-"Delete" + { // Content in Insert-Undo-"Delete" // Nicht anpassen, wenn dieses Delete in dem // Insert-"Delete" sein wuerde (ist nur verschoben). if ( aDelRange.In( p->GetBigRange().aStart ) ) @@ -3586,7 +3586,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, } } if ( !bUpdate ) - continue; // for + continue; // for } if ( aDelRange.In( p->GetBigRange() ) ) { @@ -3756,16 +3756,16 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, if ( p->GetType() == eActType && !p->IsRejected() && !pActDel->IsDeletedIn() && p->GetBigRange().In( aDelRange ) ) - pActDel->SetDeletedIn( p ); // "druntergerutscht" + pActDel->SetDeletedIn( p ); // "druntergerutscht" } } } else - { // Undo Delete + { // Undo Delete for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) { if ( p == pAct ) - continue; // for + continue; // for BOOL bUpdate = TRUE; if ( aDelRange.In( p->GetBigRange() ) ) { @@ -3784,7 +3784,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, { if ( p->GetType() != SC_CAT_CONTENT || ((ScChangeActionContent*)p)->IsTopContent() ) - { // erst der TopContent wird wirklich entfernt + { // erst der TopContent wird wirklich entfernt p->RemoveDeletedIn( pActDel ); // GeneratedDelContent _nicht_ aus Liste loeschen, // wir brauchen ihn evtl. noch fuer Reject, @@ -3795,13 +3795,13 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, } else if ( eActType != SC_CAT_DELETE_TABS && p->IsDeletedInDelType( SC_CAT_DELETE_TABS ) ) - { // in geloeschten Tabellen nicht updaten, + { // in geloeschten Tabellen nicht updaten, // ausser wenn Tabelle verschoben wird bUpdate = FALSE; } if ( p->GetType() == eActType && pActDel->IsDeletedIn( p ) ) { - pActDel->RemoveDeletedIn( p ); // "druntergerutscht" + pActDel->RemoveDeletedIn( p ); // "druntergerutscht" bUpdate = TRUE; } } @@ -3809,7 +3809,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, p->UpdateReference( this, eMode, aRange, nDx, nDy, nDz ); } if ( !bGeneratedDelContents ) - { // die werden sonst noch fuer das echte Undo gebraucht + { // die werden sonst noch fuer das echte Undo gebraucht pActDel->UndoCutOffInsert(); pActDel->UndoCutOffMoves(); } @@ -3822,11 +3822,11 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, const ScBigRange& rTo = pActMove->GetBigRange(); const ScBigRange& rFrom = pActMove->GetFromRange(); if ( !bUndo ) - { // Move + { // Move for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) { if ( p == pAct ) - continue; // for + continue; // for if ( p->GetType() == SC_CAT_CONTENT ) { // Inhalt in Ziel deleten (Inhalt in Quelle moven) @@ -3843,7 +3843,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, else if ( bLastCutMove && p->GetActionNumber() > nEndLastCut && rFrom.In( p->GetBigRange() ) ) - { // Paste Cut: neuer Content nach Cut eingefuegt, bleibt. + { // Paste Cut: neuer Content nach Cut eingefuegt, bleibt. // Aufsplitten der ContentChain ScChangeActionContent *pHere, *pTmp; pHere = (ScChangeActionContent*) p; @@ -3851,12 +3851,12 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, pTmp->GetActionNumber() > nEndLastCut ) pHere = pTmp; if ( pTmp ) - { // wird TopContent des Move + { // wird TopContent des Move pTmp->SetNextContent( NULL ); pHere->SetPrevContent( NULL ); } do - { // Abhaengigkeit vom FromRange herstellen + { // Abhaengigkeit vom FromRange herstellen AddDependentWithNotify( pActMove, pHere ); } while ( ( pHere = pHere->GetNextContent() ) != NULL ); } @@ -3867,19 +3867,19 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, } } else - { // Undo Move + { // Undo Move BOOL bActRejected = pActMove->IsRejected(); for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) { if ( p == pAct ) - continue; // for + continue; // for if ( p->GetType() == SC_CAT_CONTENT ) { // Inhalt in Ziel moven, wenn nicht deleted, sonst undelete if ( p->IsDeletedIn( pActMove ) ) { if ( ((ScChangeActionContent*)p)->IsTopContent() ) - { // erst der TopContent wird wirklich entfernt + { // erst der TopContent wird wirklich entfernt p->RemoveDeletedIn( pActMove ); // GeneratedDelContent _nicht_ aus Liste loeschen, // wir brauchen ihn evtl. noch fuer Reject, @@ -3892,7 +3892,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, if ( bActRejected && ((ScChangeActionContent*)p)->IsTopContent() && rFrom.In( p->GetBigRange() ) ) - { // Abhaengigkeit herstellen, um Content zu schreiben + { // Abhaengigkeit herstellen, um Content zu schreiben ScChangeActionLinkEntry* pLink = pActMove->AddDependent( p ); p->AddLink( pActMove, pLink ); @@ -3902,7 +3902,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, } } else - { // Insert / Undo Insert + { // Insert / Undo Insert switch ( GetMergeState() ) { case SC_CTMS_NONE : @@ -3911,7 +3911,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) { if ( p == pAct ) - continue; // for + continue; // for p->UpdateReference( this, eMode, aRange, nDx, nDy, nDz ); } } @@ -3945,7 +3945,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) { if ( p == pAct ) - continue; // for + continue; // for if ( !p->IsDeletedIn( pAct ) // #i95212# [Collaboration] Bad handling of row insertion in shared spreadsheet && p->GetActionNumber() <= pAct->GetActionNumber() ) @@ -3960,7 +3960,7 @@ void ScChangeTrack::UpdateReference( ScChangeAction** ppFirstAction, for ( ScChangeAction* p = *ppFirstAction; p; p = p->GetNext() ) { if ( p == pAct ) - continue; // for + continue; // for if ( !p->IsDeletedIn( pAct ) // #i95212# [Collaboration] Bad handling of row insertion in shared spreadsheet && p->GetActionNumber() <= pAct->GetActionNumber() ) @@ -4071,7 +4071,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, else if ( pCur->IsDeleteType() ) { if ( bIsDelete ) - { // Inhalte geloeschter Bereiche interessieren nur bei Delete + { // Inhalte geloeschter Bereiche interessieren nur bei Delete ScChangeActionDel* pDel = (ScChangeActionDel*) pCur; if ( !bAllFlat && bIsMasterDelete && pCur == pAct ) { @@ -4105,7 +4105,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, else { if ( p->IsDeleteType() ) - { // weiteres TopDelete in gleiche Ebene, + { // weiteres TopDelete in gleiche Ebene, // es ist nicht rejectable if ( ((ScChangeActionDel*)p)->IsTopDelete() ) rTable.Insert( p->GetActionNumber(), p ); @@ -4165,7 +4165,7 @@ void ScChangeTrack::GetDependents( ScChangeAction* pAct, } } else if ( pCur->GetType() == SC_CAT_CONTENT ) - { // alle Aenderungen an gleicher Position + { // alle Aenderungen an gleicher Position ScChangeActionContent* pContent = (ScChangeActionContent*) pCur; // alle vorherigen while ( ( pContent = pContent->GetPrevContent() ) != NULL ) @@ -4326,7 +4326,7 @@ BOOL ScChangeTrack::RejectAll() { BOOL bOk = TRUE; for ( ScChangeAction* p = GetLast(); p && bOk; p = p->GetPrev() ) - { //! rueckwaerts, weil abhaengige hinten und RejectActions angehaengt + { //! rueckwaerts, weil abhaengige hinten und RejectActions angehaengt if ( p->IsInternalRejectable() ) bOk = Reject( p ); } @@ -4376,9 +4376,9 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable, if ( p->GetType() == SC_CAT_CONTENT ) p->SetRejected(); else if ( p->IsDeleteType() ) - p->Accept(); // geloeschtes ins Nirvana + p->Accept(); // geloeschtes ins Nirvana else - bOk = Reject( p, NULL, TRUE ); //! rekursiv + bOk = Reject( p, NULL, TRUE ); //! rekursiv } } if ( bOk && (bRejected = pAct->Reject( pDoc )) != FALSE ) @@ -4488,7 +4488,7 @@ BOOL ScChangeTrack::Reject( ScChangeAction* pAct, ScChangeActionTable* pTable, DBG_ASSERT( pTable, "ScChangeTrack::Reject: Move ohne Table" ); for ( ScChangeAction* p = pTable->Last(); p && bOk; p = pTable->Prev() ) { - bOk = Reject( p, NULL, TRUE ); //! rekursiv + bOk = Reject( p, NULL, TRUE ); //! rekursiv } } if ( bOk && (bRejected = pAct->Reject( pDoc )) != FALSE ) diff --git a/sc/source/core/tool/chgviset.cxx b/sc/source/core/tool/chgviset.cxx index 514336368797..f828d11cdf94 100644 --- a/sc/source/core/tool/chgviset.cxx +++ b/sc/source/core/tool/chgviset.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,19 +48,19 @@ ScChangeViewSettings::ScChangeViewSettings( const ScChangeViewSettings& r ) { SetTheComment(r.aComment); - aFirstDateTime =r.aFirstDateTime; - aLastDateTime =r.aLastDateTime; - aAuthorToShow =r.aAuthorToShow; - aRangeList =r.aRangeList; - eDateMode =r.eDateMode; - bShowIt =r.bShowIt; - bIsDate =r.bIsDate; - bIsAuthor =r.bIsAuthor; - bIsComment =r.bIsComment; - bIsRange =r.bIsRange; - bEveryoneButMe =r.bEveryoneButMe; - bShowAccepted =r.bShowAccepted; - bShowRejected =r.bShowRejected; + aFirstDateTime =r.aFirstDateTime; + aLastDateTime =r.aLastDateTime; + aAuthorToShow =r.aAuthorToShow; + aRangeList =r.aRangeList; + eDateMode =r.eDateMode; + bShowIt =r.bShowIt; + bIsDate =r.bIsDate; + bIsAuthor =r.bIsAuthor; + bIsComment =r.bIsComment; + bIsRange =r.bIsRange; + bEveryoneButMe =r.bEveryoneButMe; + bShowAccepted =r.bShowAccepted; + bShowRejected =r.bShowRejected; mbIsActionRange = r.mbIsActionRange; mnFirstAction = r.mnFirstAction; mnLastAction = r.mnLastAction; @@ -71,19 +71,19 @@ ScChangeViewSettings& ScChangeViewSettings::operator=( const ScChangeViewSetting { SetTheComment(r.aComment); - aFirstDateTime =r.aFirstDateTime; - aLastDateTime =r.aLastDateTime; - aAuthorToShow =r.aAuthorToShow; - aRangeList =r.aRangeList; - eDateMode =r.eDateMode; - bShowIt =r.bShowIt; - bIsDate =r.bIsDate; - bIsAuthor =r.bIsAuthor; - bIsComment =r.bIsComment; - bIsRange =r.bIsRange; - bEveryoneButMe =r.bEveryoneButMe; - bShowAccepted =r.bShowAccepted; - bShowRejected =r.bShowRejected; + aFirstDateTime =r.aFirstDateTime; + aLastDateTime =r.aLastDateTime; + aAuthorToShow =r.aAuthorToShow; + aRangeList =r.aRangeList; + eDateMode =r.eDateMode; + bShowIt =r.bShowIt; + bIsDate =r.bIsDate; + bIsAuthor =r.bIsAuthor; + bIsComment =r.bIsComment; + bIsRange =r.bIsRange; + bEveryoneButMe =r.bEveryoneButMe; + bShowAccepted =r.bShowAccepted; + bShowRejected =r.bShowRejected; mbIsActionRange = r.mbIsActionRange; mnFirstAction = r.mnFirstAction; mnLastAction = r.mnLastAction; @@ -126,7 +126,7 @@ void ScChangeViewSettings::SetTheComment(const String& rString) void ScChangeViewSettings::AdjustDateMode( const ScDocument& rDoc ) { switch ( eDateMode ) - { // corresponds with ScViewUtil::IsActionShown + { // corresponds with ScViewUtil::IsActionShown case SCDM_DATE_EQUAL : case SCDM_DATE_NOTEQUAL : aFirstDateTime.SetTime( 0 ); diff --git a/sc/source/core/tool/collect.cxx b/sc/source/core/tool/collect.cxx index 1b929892bd1e..9da54fccfd08 100644 --- a/sc/source/core/tool/collect.cxx +++ b/sc/source/core/tool/collect.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,7 +37,7 @@ #include "rechead.hxx" #include "collect.hxx" -#include "document.hxx" // fuer TypedStrData Konstruktor +#include "document.hxx" // fuer TypedStrData Konstruktor // ----------------------------------------------------------------------- @@ -100,7 +100,7 @@ void ScCollection::AtFree(USHORT nIndex) if ((pItems) && (nIndex < nCount)) { delete pItems[nIndex]; - --nCount; // before memmove + --nCount; // before memmove memmove ( &pItems[nIndex], &pItems[nIndex + 1], (nCount - nIndex) * sizeof(ScDataObject*)); pItems[nCount] = NULL; } @@ -194,7 +194,7 @@ ScCollection& ScCollection::operator=( const ScCollection& r ) //------------------------------------------------------------------------ -ScDataObject* ScCollection::Clone() const +ScDataObject* ScCollection::Clone() const { return new ScCollection(*this); } @@ -297,16 +297,16 @@ BOOL ScSortedCollection::operator==(const ScSortedCollection& rCmp) const //------------------------------------------------------------------------ -// IsEqual - komplette Inhalte vergleichen +// IsEqual - komplette Inhalte vergleichen BOOL ScSortedCollection::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const { - return ( Compare(pKey1, pKey2) == 0 ); // Default: nur Index vergleichen + return ( Compare(pKey1, pKey2) == 0 ); // Default: nur Index vergleichen } //------------------------------------------------------------------------ -ScDataObject* StrData::Clone() const +ScDataObject* StrData::Clone() const { return new StrData(*this); } @@ -326,7 +326,7 @@ short ScStrCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const //------------------------------------------------------------------------ -ScDataObject* ScStrCollection::Clone() const +ScDataObject* ScStrCollection::Clone() const { return new ScStrCollection(*this); } @@ -336,15 +336,15 @@ ScDataObject* ScStrCollection::Clone() const //------------------------------------------------------------------------ -ScDataObject* TypedStrData::Clone() const +ScDataObject* TypedStrData::Clone() const { return new TypedStrData(*this); } TypedScStrCollection::TypedScStrCollection( USHORT nLim , USHORT nDel , BOOL bDup ) - : ScSortedCollection( nLim, nDel, bDup ) + : ScSortedCollection( nLim, nDel, bDup ) { - bCaseSensitive = FALSE; + bCaseSensitive = FALSE; } TypedScStrCollection::~TypedScStrCollection() @@ -354,16 +354,16 @@ ScDataObject* TypedScStrCollection::Clone() const return new TypedScStrCollection(*this); } -TypedStrData* TypedScStrCollection::operator[]( const USHORT nIndex) const -{ - return (TypedStrData*)At(nIndex); +TypedStrData* TypedScStrCollection::operator[]( const USHORT nIndex) const +{ + return (TypedStrData*)At(nIndex); } -void TypedScStrCollection::SetCaseSensitive( BOOL bSet ) -{ - bCaseSensitive = bSet; +void TypedScStrCollection::SetCaseSensitive( BOOL bSet ) +{ + bCaseSensitive = bSet; } - + short TypedScStrCollection::Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) const { short nResult = 0; @@ -409,8 +409,8 @@ short TypedScStrCollection::Compare( ScDataObject* pKey1, ScDataObject* pKey2 ) BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult, USHORT& rPos, BOOL bBack ) const { - // Die Collection ist nach String-Vergleichen sortiert, darum muss hier - // alles durchsucht werden + // Die Collection ist nach String-Vergleichen sortiert, darum muss hier + // alles durchsucht werden BOOL bFound = FALSE; @@ -422,11 +422,11 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult, aOldResult = pData->aStrValue; } - if ( bBack ) // rueckwaerts + if ( bBack ) // rueckwaerts { USHORT nStartPos = nCount; if ( rPos != SCPOS_INVALID ) - nStartPos = rPos; // weitersuchen... + nStartPos = rPos; // weitersuchen... for ( USHORT i=nStartPos; i>0; ) { @@ -436,8 +436,8 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult, { if ( ScGlobal::GetpTransliteration()->isMatch( rStart, pData->aStrValue ) ) { - // If the collection is case sensitive, it may contain several entries - // that are equal when compared case-insensitive. They are skipped here. + // If the collection is case sensitive, it may contain several entries + // that are equal when compared case-insensitive. They are skipped here. if ( !bCaseSensitive || !aOldResult.Len() || !ScGlobal::GetpTransliteration()->isEqual( pData->aStrValue, aOldResult ) ) @@ -451,11 +451,11 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult, } } } - else // vorwaerts + else // vorwaerts { USHORT nStartPos = 0; if ( rPos != SCPOS_INVALID ) - nStartPos = rPos + 1; // weitersuchen... + nStartPos = rPos + 1; // weitersuchen... for ( USHORT i=nStartPos; i<nCount; i++ ) { @@ -464,8 +464,8 @@ BOOL TypedScStrCollection::FindText( const String& rStart, String& rResult, { if ( ScGlobal::GetpTransliteration()->isMatch( rStart, pData->aStrValue ) ) { - // If the collection is case sensitive, it may contain several entries - // that are equal when compared case-insensitive. They are skipped here. + // If the collection is case sensitive, it may contain several entries + // that are equal when compared case-insensitive. They are skipped here. if ( !bCaseSensitive || !aOldResult.Len() || !ScGlobal::GetpTransliteration()->isEqual( pData->aStrValue, aOldResult ) ) @@ -493,7 +493,7 @@ BOOL TypedScStrCollection::GetExactMatch( String& rString ) const if ( pData->nStrType && ScGlobal::GetpTransliteration()->isEqual( pData->aStrValue, rString ) ) { - rString = pData->aStrValue; // String anpassen + rString = pData->aStrValue; // String anpassen return TRUE; } } diff --git a/sc/source/core/tool/compiler.cxx b/sc/source/core/tool/compiler.cxx index 15723af8e185..efbbb9239480 100644 --- a/sc/source/core/tool/compiler.cxx +++ b/sc/source/core/tool/compiler.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 @@ -322,7 +322,7 @@ bool ScCompiler::IsEnglishSymbol( const String& rName ) { return true; } - return false; // no valid function name + return false; // no valid function name } // static @@ -2509,7 +2509,7 @@ Label_MaskStateMachine: } if (mnRangeOpPosInSymbol >= 0 && mnRangeOpPosInSymbol == (pSym-1) - &cSymbol[0]) { - // This is a trailing range operator, which is nonsense. Will be caught + // This is a trailing range operator, which is nonsense. Will be caught // in next round. mnRangeOpPosInSymbol = -1; *--pSym = 0; @@ -2546,10 +2546,10 @@ BOOL ScCompiler::IsOpCode( const String& rName, bool bInArray ) } else if (mxSymbols->isODFF()) { - // ODFF names that are not written in the current mapping but to be - // recognized. New names will be written in a future relase, then - // exchange (!) with the names in - // formula/source/core/resource/core_resource.src to be able to still + // ODFF names that are not written in the current mapping but to be + // recognized. New names will be written in a future relase, then + // exchange (!) with the names in + // formula/source/core/resource/core_resource.src to be able to still // read the old names as well. struct FunctionName { @@ -2922,7 +2922,7 @@ BOOL ScCompiler::IsReference( const String& rName ) { if (IsDoubleReference( rName)) return true; - // Now try with a symbol up to the range operator, rewind source + // Now try with a symbol up to the range operator, rewind source // position. sal_Int32 nLen = mnRangeOpPosInSymbol; while (cSymbol[++nLen]) @@ -2935,8 +2935,8 @@ BOOL ScCompiler::IsReference( const String& rName ) } else { - // Special treatment for the 'E:\[doc]Sheet1:Sheet3'!D5 Excel sickness, - // mnRangeOpPosInSymbol did not catch the range operator as it is + // Special treatment for the 'E:\[doc]Sheet1:Sheet3'!D5 Excel sickness, + // mnRangeOpPosInSymbol did not catch the range operator as it is // within a quoted name. switch (pConv->meConv) { @@ -2967,9 +2967,9 @@ BOOL ScCompiler::IsMacro( const String& rName ) else pObj = pSfxApp->GetBasic(); - // ODFF recommends to store user-defined functions prefixed with "USER.", - // use only unprefixed name if encountered. BASIC doesn't allow '.' in a - // function name so a function "USER.FOO" could not exist, and macro check + // ODFF recommends to store user-defined functions prefixed with "USER.", + // use only unprefixed name if encountered. BASIC doesn't allow '.' in a + // function name so a function "USER.FOO" could not exist, and macro check // is assigned the lowest priority in function name check. if (FormulaGrammar::isODFF( GetGrammar()) && aName.EqualsIgnoreCaseAscii( "USER.", 0, 5)) aName.Erase( 0, 5); @@ -3569,7 +3569,7 @@ inline bool lcl_UpperAsciiOrI18n( String& rUpper, const String& rOrg, FormulaGra { if (FormulaGrammar::isODFF( eGrammar )) { - // ODFF has a defined set of English function names, avoid i18n + // ODFF has a defined set of English function names, avoid i18n // overhead. rUpper = rOrg; rUpper.ToUpperAscii(); @@ -3730,8 +3730,8 @@ BOOL ScCompiler::NextNewToken( bool bInArray ) return false; } - // Provide single token information and continue. Do not set an error, that - // would prematurely end compilation. Simple unknown names are handled by + // Provide single token information and continue. Do not set an error, that + // would prematurely end compilation. Simple unknown names are handled by // the interpreter. ScGlobal::pCharClass->toLower( aUpper ); ScRawToken aToken; diff --git a/sc/source/core/tool/consoli.cxx b/sc/source/core/tool/consoli.cxx index 006d1746501b..4260acb563e1 100644 --- a/sc/source/core/tool/consoli.cxx +++ b/sc/source/core/tool/consoli.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 @@ -46,13 +46,13 @@ #include <math.h> #include <string.h> -#define SC_CONS_NOTFOUND -1 +#define SC_CONS_NOTFOUND -1 // STATIC DATA ----------------------------------------------------------- -/* Strings bei Gelegenheit ganz raus... -static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc - 0, // none +/* Strings bei Gelegenheit ganz raus... +static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTotalFunc + 0, // none STR_PIVOTFUNC_AVG, STR_PIVOTFUNC_COUNT, STR_PIVOTFUNC_COUNT2, @@ -66,8 +66,8 @@ static USHORT nFuncRes[] = { // Reihenfolge wie bei enum ScSubTo STR_PIVOTFUNC_VAR2 }; */ -static OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTotalFunc - ocBad, // none +static OpCode eOpCodeTable[] = { // Reihenfolge wie bei enum ScSubTotalFunc + ocBad, // none ocAverage, ocCount, ocCount2, @@ -150,24 +150,24 @@ ScConsData::~ScConsData() } -#define DELETEARR(ppArray,nCount) \ -{ \ - ULONG i; \ - if (ppArray) \ - for(i=0; i<nCount; i++) \ - delete[] ppArray[i]; \ - delete[] ppArray; \ - ppArray = NULL; \ +#define DELETEARR(ppArray,nCount) \ +{ \ + ULONG i; \ + if (ppArray) \ + for(i=0; i<nCount; i++) \ + delete[] ppArray[i]; \ + delete[] ppArray; \ + ppArray = NULL; \ } -#define DELETESTR(ppArray,nCount) \ -{ \ - ULONG i; \ - if (ppArray) \ - for(i=0; i<nCount; i++) \ - delete ppArray[i]; \ - delete[] ppArray; \ - ppArray = NULL; \ +#define DELETESTR(ppArray,nCount) \ +{ \ + ULONG i; \ + if (ppArray) \ + for(i=0; i<nCount; i++) \ + delete ppArray[i]; \ + delete[] ppArray; \ + ppArray = NULL; \ } void ScConsData::DeleteData() @@ -185,12 +185,12 @@ void ScConsData::DeleteData() ppRefs = NULL; } -// DELETEARR( ppData1, nColCount ); -// DELETEARR( ppData2, nColCount ); +// DELETEARR( ppData1, nColCount ); +// DELETEARR( ppData2, nColCount ); DELETEARR( ppCount, nColCount ); DELETEARR( ppSum, nColCount ); DELETEARR( ppSumSqr,nColCount ); - DELETEARR( ppUsed, nColCount ); // erst nach ppRefs !!! + DELETEARR( ppUsed, nColCount ); // erst nach ppRefs !!! DELETEARR( ppTitlePos, nRowCount ); DELETESTR( ppColHeaders, nColCount ); DELETESTR( ppRowHeaders, nRowCount ); @@ -198,7 +198,7 @@ void ScConsData::DeleteData() nTitleCount = 0; nDataCount = 0; - if (bColByName) nColCount = 0; // sonst stimmt ppColHeaders nicht + if (bColByName) nColCount = 0; // sonst stimmt ppColHeaders nicht if (bRowByName) nRowCount = 0; bCornerUsed = FALSE; @@ -248,11 +248,11 @@ void ScConsData::InitData( BOOL bDelete ) for (SCSIZE i=0; i<nRowCount; i++) { ppTitlePos[i] = new SCSIZE[nDataCount]; - memset( ppTitlePos[i], 0, nDataCount * sizeof(SCSIZE) ); //! unnoetig ? + memset( ppTitlePos[i], 0, nDataCount * sizeof(SCSIZE) ); //! unnoetig ? } } - // CornerText: einzelner String + // CornerText: einzelner String } void ScConsData::DoneFields() @@ -293,8 +293,8 @@ void ScConsData::AddFields( ScDocument* pSrcDoc, SCTAB nTab, SCCOL nStartCol = nCol1; SCROW nStartRow = nRow1; - if (bColByName) ++nStartRow; - if (bRowByName) ++nStartCol; + if (bColByName) ++nStartRow; + if (bRowByName) ++nStartCol; if (bColByName) { @@ -342,7 +342,7 @@ void ScConsData::AddName( const String& rName ) for (nArrY=0; nArrY<nRowCount; nArrY++) { - // Daten auf gleiche Laenge bringen + // Daten auf gleiche Laenge bringen SCSIZE nMax = 0; for (nArrX=0; nArrX<nColCount; nArrX++) @@ -359,7 +359,7 @@ void ScConsData::AddName( const String& rName ) ppRefs[nArrX][nArrY].SetFullSize(nMax); } - // Positionen eintragen + // Positionen eintragen if (ppTitlePos) if (nTitleCount < nDataCount) @@ -540,7 +540,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab, SCCOL nCol; SCROW nRow; - // Ecke links oben + // Ecke links oben if ( bColByName && bRowByName ) { @@ -558,15 +558,15 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab, } } - // Titel suchen + // Titel suchen SCCOL nStartCol = nCol1; SCROW nStartRow = nRow1; - if (bColByName) ++nStartRow; - if (bRowByName) ++nStartCol; + if (bColByName) ++nStartRow; + if (bRowByName) ++nStartCol; String aTitle; - SCCOL* pDestCols = NULL; - SCROW* pDestRows = NULL; + SCCOL* pDestCols = NULL; + SCROW* pDestRows = NULL; if (bColByName) { pDestCols = new SCCOL[nCol2-nStartCol+1]; @@ -612,19 +612,19 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab, nCol1 = nStartCol; nRow1 = nStartRow; - // Daten + // Daten BOOL bAnyCell = ( eFunction == SUBTOTAL_FUNC_CNT2 ); for (nCol=nCol1; nCol<=nCol2; nCol++) { SCCOL nArrX = nCol-nCol1; - if (bColByName) nArrX = pDestCols[nArrX]; + if (bColByName) nArrX = pDestCols[nArrX]; if (nArrX != SC_CONS_NOTFOUND) { for (nRow=nRow1; nRow<=nRow2; nRow++) { SCROW nArrY = nRow-nRow1; - if (bRowByName) nArrY = pDestRows[nArrY]; + if (bRowByName) nArrY = pDestRows[nArrY]; if ( nArrY != SC_CONS_NOTFOUND && ( bAnyCell ? pSrcDoc->HasData( nCol, nRow, nTab ) : pSrcDoc->HasValueData( nCol, nRow, nTab ) ) ) @@ -665,7 +665,7 @@ void ScConsData::AddData( ScDocument* pSrcDoc, SCTAB nTab, delete[] pDestRows; } -// vorher testen, wieviele Zeilen eingefuegt werden (fuer Undo) +// vorher testen, wieviele Zeilen eingefuegt werden (fuer Undo) SCROW ScConsData::GetInsertCount() const { @@ -687,8 +687,8 @@ SCROW ScConsData::GetInsertCount() const return nInsert; } -// fertige Daten ins Dokument schreiben -//! optimieren nach Spalten? +// fertige Daten ins Dokument schreiben +//! optimieren nach Spalten? void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCTAB nTab ) { @@ -697,17 +697,17 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, SCSIZE nArrX; SCSIZE nArrY; - // Ecke links oben + // Ecke links oben if ( bColByName && bRowByName && aCornerText.Len() ) pDestDoc->SetString( nCol, nRow, nTab, aCornerText ); - // Titel + // Titel SCCOL nStartCol = nCol; SCROW nStartRow = nRow; - if (bColByName) ++nStartRow; - if (bRowByName) ++nStartCol; + if (bColByName) ++nStartRow; + if (bRowByName) ++nStartCol; if (bColByName) for (SCSIZE i=0; i<nColCount; i++) @@ -719,9 +719,9 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, nCol = nStartCol; nRow = nStartRow; - // Daten + // Daten - if ( ppCount && ppUsed ) // Werte direkt einfuegen + if ( ppCount && ppUsed ) // Werte direkt einfuegen { for (nArrX=0; nArrX<nColCount; nArrX++) for (nArrY=0; nArrY<nRowCount; nArrY++) @@ -739,16 +739,16 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, } } - if ( ppRefs && ppUsed ) // Referenzen einfuegen + if ( ppRefs && ppUsed ) // Referenzen einfuegen { //! unterscheiden, ob nach Kategorien aufgeteilt String aString; - ScSingleRefData aSRef; // Daten fuer Referenz-Formelzellen + ScSingleRefData aSRef; // Daten fuer Referenz-Formelzellen aSRef.InitFlags(); aSRef.SetFlag3D(TRUE); - ScComplexRefData aCRef; // Daten fuer Summen-Zellen + ScComplexRefData aCRef; // Daten fuer Summen-Zellen aCRef.InitFlags(); aCRef.Ref1.SetColRel(TRUE); aCRef.Ref1.SetRowRel(TRUE); aCRef.Ref1.SetTabRel(TRUE); aCRef.Ref2.SetColRel(TRUE); aCRef.Ref2.SetRowRel(TRUE); aCRef.Ref2.SetTabRel(TRUE); @@ -776,7 +776,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, ScReferenceEntry aRef = rList.GetEntry(nPos); if (aRef.nTab != SC_CONS_NOTFOUND) { - // Referenz einfuegen (absolut, 3d) + // Referenz einfuegen (absolut, 3d) aSRef.nCol = aRef.nCol; aSRef.nRow = aRef.nRow; @@ -792,7 +792,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, } } - // Summe einfuegen (relativ, nicht 3d) + // Summe einfuegen (relativ, nicht 3d) ScAddress aDest( sal::static_int_cast<SCCOL>(nCol+nArrX), sal::static_int_cast<SCROW>(nRow+nArrY+nNeeded), nTab ); @@ -804,7 +804,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, aCRef.CalcRelFromAbs( aDest ); ScTokenArray aArr; - aArr.AddOpCode(eOpCode); // ausgewaehlte Funktion + aArr.AddOpCode(eOpCode); // ausgewaehlte Funktion aArr.AddOpCode(ocOpen); aArr.AddDoubleReference(aCRef); aArr.AddOpCode(ocClose); @@ -814,7 +814,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, } } - // Gliederung einfuegen + // Gliederung einfuegen ScOutlineArray* pOutArr = pDestDoc->GetOutlineTable( nTab, TRUE )->GetRowArray(); SCROW nOutStart = nRow+nArrY; @@ -827,7 +827,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, pDestDoc->SetDrawPageSize(nTab); pDestDoc->UpdateOutlineRow( nOutStart, nOutEnd, nTab, FALSE ); - // Zwischentitel + // Zwischentitel if (ppTitlePos && ppTitles && ppRowHeaders) { @@ -838,7 +838,7 @@ void ScConsData::OutputToDocument( ScDocument* pDestDoc, SCCOL nCol, SCROW nRow, BOOL bDo = TRUE; if (nPos+1<nDataCount) if (ppTitlePos[nArrY][nPos+1] == nTPos) - bDo = FALSE; // leer + bDo = FALSE; // leer if ( bDo && nTPos < nNeeded ) { aString = *ppRowHeaders[nArrY]; diff --git a/sc/source/core/tool/dbcolect.cxx b/sc/source/core/tool/dbcolect.cxx index 3bd737b2c572..a348dff2c184 100644 --- a/sc/source/core/tool/dbcolect.cxx +++ b/sc/source/core/tool/dbcolect.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,22 +48,22 @@ ScDBData::ScDBData( const String& rName, SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, BOOL bByR, BOOL bHasH) : - aName (rName), - nTable (nTab), - nStartCol (nCol1), - nStartRow (nRow1), - nEndCol (nCol2), - nEndRow (nRow2), - bByRow (bByR), - bHasHeader (bHasH), - bDoSize (FALSE), - bKeepFmt (FALSE), - bStripData (FALSE), - bIsAdvanced (FALSE), + aName (rName), + nTable (nTab), + nStartCol (nCol1), + nStartRow (nRow1), + nEndCol (nCol2), + nEndRow (nRow2), + bByRow (bByR), + bHasHeader (bHasH), + bDoSize (FALSE), + bKeepFmt (FALSE), + bStripData (FALSE), + bIsAdvanced (FALSE), bDBSelection(FALSE), - nIndex (0), + nIndex (0), bAutoFilter (FALSE), - bModified (FALSE) + bModified (FALSE) { USHORT i; @@ -90,87 +90,87 @@ ScDBData::ScDBData( const String& rName, ScDBData::ScDBData( const ScDBData& rData ) : ScDataObject(), - ScRefreshTimer ( rData ), - aName (rData.aName), - nTable (rData.nTable), - nStartCol (rData.nStartCol), - nStartRow (rData.nStartRow), - nEndCol (rData.nEndCol), - nEndRow (rData.nEndRow), - bByRow (rData.bByRow), - bHasHeader (rData.bHasHeader), - bDoSize (rData.bDoSize), - bKeepFmt (rData.bKeepFmt), - bStripData (rData.bStripData), - bSortCaseSens (rData.bSortCaseSens), - bSortNaturalSort (rData.bSortNaturalSort), - bIncludePattern (rData.bIncludePattern), - bSortInplace (rData.bSortInplace), - bSortUserDef (rData.bSortUserDef), - nSortUserIndex (rData.nSortUserIndex), - nSortDestTab (rData.nSortDestTab), - nSortDestCol (rData.nSortDestCol), - nSortDestRow (rData.nSortDestRow), - aSortLocale (rData.aSortLocale), - aSortAlgorithm (rData.aSortAlgorithm), - bQueryInplace (rData.bQueryInplace), - bQueryCaseSens (rData.bQueryCaseSens), - bQueryRegExp (rData.bQueryRegExp), - bQueryDuplicate (rData.bQueryDuplicate), - nQueryDestTab (rData.nQueryDestTab), - nQueryDestCol (rData.nQueryDestCol), - nQueryDestRow (rData.nQueryDestRow), - bIsAdvanced (rData.bIsAdvanced), - aAdvSource (rData.aAdvSource), - bSubRemoveOnly (rData.bSubRemoveOnly), - bSubReplace (rData.bSubReplace), - bSubPagebreak (rData.bSubPagebreak), - bSubCaseSens (rData.bSubCaseSens), - bSubDoSort (rData.bSubDoSort), - bSubAscending (rData.bSubAscending), - bSubIncludePattern (rData.bSubIncludePattern), - bSubUserDef (rData.bSubUserDef), - nSubUserIndex (rData.nSubUserIndex), - bDBImport (rData.bDBImport), - aDBName (rData.aDBName), - aDBStatement (rData.aDBStatement), - bDBNative (rData.bDBNative), - bDBSelection (rData.bDBSelection), - bDBSql (rData.bDBSql), - nDBType (rData.nDBType), - nIndex (rData.nIndex), - bAutoFilter (rData.bAutoFilter), - bModified (rData.bModified) + ScRefreshTimer ( rData ), + aName (rData.aName), + nTable (rData.nTable), + nStartCol (rData.nStartCol), + nStartRow (rData.nStartRow), + nEndCol (rData.nEndCol), + nEndRow (rData.nEndRow), + bByRow (rData.bByRow), + bHasHeader (rData.bHasHeader), + bDoSize (rData.bDoSize), + bKeepFmt (rData.bKeepFmt), + bStripData (rData.bStripData), + bSortCaseSens (rData.bSortCaseSens), + bSortNaturalSort (rData.bSortNaturalSort), + bIncludePattern (rData.bIncludePattern), + bSortInplace (rData.bSortInplace), + bSortUserDef (rData.bSortUserDef), + nSortUserIndex (rData.nSortUserIndex), + nSortDestTab (rData.nSortDestTab), + nSortDestCol (rData.nSortDestCol), + nSortDestRow (rData.nSortDestRow), + aSortLocale (rData.aSortLocale), + aSortAlgorithm (rData.aSortAlgorithm), + bQueryInplace (rData.bQueryInplace), + bQueryCaseSens (rData.bQueryCaseSens), + bQueryRegExp (rData.bQueryRegExp), + bQueryDuplicate (rData.bQueryDuplicate), + nQueryDestTab (rData.nQueryDestTab), + nQueryDestCol (rData.nQueryDestCol), + nQueryDestRow (rData.nQueryDestRow), + bIsAdvanced (rData.bIsAdvanced), + aAdvSource (rData.aAdvSource), + bSubRemoveOnly (rData.bSubRemoveOnly), + bSubReplace (rData.bSubReplace), + bSubPagebreak (rData.bSubPagebreak), + bSubCaseSens (rData.bSubCaseSens), + bSubDoSort (rData.bSubDoSort), + bSubAscending (rData.bSubAscending), + bSubIncludePattern (rData.bSubIncludePattern), + bSubUserDef (rData.bSubUserDef), + nSubUserIndex (rData.nSubUserIndex), + bDBImport (rData.bDBImport), + aDBName (rData.aDBName), + aDBStatement (rData.aDBStatement), + bDBNative (rData.bDBNative), + bDBSelection (rData.bDBSelection), + bDBSql (rData.bDBSql), + nDBType (rData.nDBType), + nIndex (rData.nIndex), + bAutoFilter (rData.bAutoFilter), + bModified (rData.bModified) { USHORT i; USHORT j; for (i=0; i<MAXSORT; i++) { - bDoSort[i] = rData.bDoSort[i]; - nSortField[i] = rData.nSortField[i]; - bAscending[i] = rData.bAscending[i]; + bDoSort[i] = rData.bDoSort[i]; + nSortField[i] = rData.nSortField[i]; + bAscending[i] = rData.bAscending[i]; } for (i=0; i<MAXQUERY; i++) { - bDoQuery[i] = rData.bDoQuery[i]; - nQueryField[i] = rData.nQueryField[i]; - eQueryOp[i] = rData.eQueryOp[i]; - bQueryByString[i] = rData.bQueryByString[i]; + bDoQuery[i] = rData.bDoQuery[i]; + nQueryField[i] = rData.nQueryField[i]; + eQueryOp[i] = rData.eQueryOp[i]; + bQueryByString[i] = rData.bQueryByString[i]; bQueryByDate[i] = rData.bQueryByDate[i]; - pQueryStr[i] = new String( *(rData.pQueryStr[i]) ); - nQueryVal[i] = rData.nQueryVal[i]; - eQueryConnect[i] = rData.eQueryConnect[i]; + pQueryStr[i] = new String( *(rData.pQueryStr[i]) ); + nQueryVal[i] = rData.nQueryVal[i]; + eQueryConnect[i] = rData.eQueryConnect[i]; } for (i=0; i<MAXSUBTOTAL; i++) { - bDoSubTotal[i] = rData.bDoSubTotal[i]; - nSubField[i] = rData.nSubField[i]; + bDoSubTotal[i] = rData.bDoSubTotal[i]; + nSubField[i] = rData.nSubField[i]; - SCCOL nCount = rData.nSubTotals[i]; - nSubTotals[i] = nCount; - pFunctions[i] = nCount > 0 ? new ScSubTotalFunc [nCount] : NULL; - pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL; + SCCOL nCount = rData.nSubTotals[i]; + nSubTotals[i] = nCount; + pFunctions[i] = nCount > 0 ? new ScSubTotalFunc [nCount] : NULL; + pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL; for (j=0; j<nCount; j++) { @@ -186,84 +186,84 @@ ScDBData& ScDBData::operator= (const ScDBData& rData) USHORT j; ScRefreshTimer::operator=( rData ); - aName = rData.aName; - nTable = rData.nTable; - nStartCol = rData.nStartCol; - nStartRow = rData.nStartRow; - nEndCol = rData.nEndCol; - nEndRow = rData.nEndRow; - bByRow = rData.bByRow; - bHasHeader = rData.bHasHeader; - bDoSize = rData.bDoSize; - bKeepFmt = rData.bKeepFmt; - bStripData = rData.bStripData; - bSortCaseSens = rData.bSortCaseSens; - bSortNaturalSort = rData.bSortNaturalSort; - bIncludePattern = rData.bIncludePattern; - bSortInplace = rData.bSortInplace; - nSortDestTab = rData.nSortDestTab; - nSortDestCol = rData.nSortDestCol; - nSortDestRow = rData.nSortDestRow; - bSortUserDef = rData.bSortUserDef; - nSortUserIndex = rData.nSortUserIndex; - aSortLocale = rData.aSortLocale; - aSortAlgorithm = rData.aSortAlgorithm; - bQueryInplace = rData.bQueryInplace; - bQueryCaseSens = rData.bQueryCaseSens; - bQueryRegExp = rData.bQueryRegExp; - bQueryDuplicate = rData.bQueryDuplicate; - nQueryDestTab = rData.nQueryDestTab; - nQueryDestCol = rData.nQueryDestCol; - nQueryDestRow = rData.nQueryDestRow; - bIsAdvanced = rData.bIsAdvanced; - aAdvSource = rData.aAdvSource; - bSubRemoveOnly = rData.bSubRemoveOnly; - bSubReplace = rData.bSubReplace; - bSubPagebreak = rData.bSubPagebreak; - bSubCaseSens = rData.bSubCaseSens; - bSubDoSort = rData.bSubDoSort; - bSubAscending = rData.bSubAscending; - bSubIncludePattern = rData.bSubIncludePattern; - bSubUserDef = rData.bSubUserDef; - nSubUserIndex = rData.nSubUserIndex; - bDBImport = rData.bDBImport; - aDBName = rData.aDBName; - aDBStatement = rData.aDBStatement; - bDBNative = rData.bDBNative; - bDBSelection = rData.bDBSelection; - bDBSql = rData.bDBSql; - nDBType = rData.nDBType; - nIndex = rData.nIndex; + aName = rData.aName; + nTable = rData.nTable; + nStartCol = rData.nStartCol; + nStartRow = rData.nStartRow; + nEndCol = rData.nEndCol; + nEndRow = rData.nEndRow; + bByRow = rData.bByRow; + bHasHeader = rData.bHasHeader; + bDoSize = rData.bDoSize; + bKeepFmt = rData.bKeepFmt; + bStripData = rData.bStripData; + bSortCaseSens = rData.bSortCaseSens; + bSortNaturalSort = rData.bSortNaturalSort; + bIncludePattern = rData.bIncludePattern; + bSortInplace = rData.bSortInplace; + nSortDestTab = rData.nSortDestTab; + nSortDestCol = rData.nSortDestCol; + nSortDestRow = rData.nSortDestRow; + bSortUserDef = rData.bSortUserDef; + nSortUserIndex = rData.nSortUserIndex; + aSortLocale = rData.aSortLocale; + aSortAlgorithm = rData.aSortAlgorithm; + bQueryInplace = rData.bQueryInplace; + bQueryCaseSens = rData.bQueryCaseSens; + bQueryRegExp = rData.bQueryRegExp; + bQueryDuplicate = rData.bQueryDuplicate; + nQueryDestTab = rData.nQueryDestTab; + nQueryDestCol = rData.nQueryDestCol; + nQueryDestRow = rData.nQueryDestRow; + bIsAdvanced = rData.bIsAdvanced; + aAdvSource = rData.aAdvSource; + bSubRemoveOnly = rData.bSubRemoveOnly; + bSubReplace = rData.bSubReplace; + bSubPagebreak = rData.bSubPagebreak; + bSubCaseSens = rData.bSubCaseSens; + bSubDoSort = rData.bSubDoSort; + bSubAscending = rData.bSubAscending; + bSubIncludePattern = rData.bSubIncludePattern; + bSubUserDef = rData.bSubUserDef; + nSubUserIndex = rData.nSubUserIndex; + bDBImport = rData.bDBImport; + aDBName = rData.aDBName; + aDBStatement = rData.aDBStatement; + bDBNative = rData.bDBNative; + bDBSelection = rData.bDBSelection; + bDBSql = rData.bDBSql; + nDBType = rData.nDBType; + nIndex = rData.nIndex; bAutoFilter = rData.bAutoFilter; for (i=0; i<MAXSORT; i++) { - bDoSort[i] = rData.bDoSort[i]; - nSortField[i] = rData.nSortField[i]; - bAscending[i] = rData.bAscending[i]; + bDoSort[i] = rData.bDoSort[i]; + nSortField[i] = rData.nSortField[i]; + bAscending[i] = rData.bAscending[i]; } for (i=0; i<MAXQUERY; i++) { - bDoQuery[i] = rData.bDoQuery[i]; - nQueryField[i] = rData.nQueryField[i]; - eQueryOp[i] = rData.eQueryOp[i]; - bQueryByString[i] = rData.bQueryByString[i]; + bDoQuery[i] = rData.bDoQuery[i]; + nQueryField[i] = rData.nQueryField[i]; + eQueryOp[i] = rData.eQueryOp[i]; + bQueryByString[i] = rData.bQueryByString[i]; bQueryByDate[i] = rData.bQueryByDate[i]; - *pQueryStr[i] = *rData.pQueryStr[i]; - nQueryVal[i] = rData.nQueryVal[i]; - eQueryConnect[i] = rData.eQueryConnect[i]; + *pQueryStr[i] = *rData.pQueryStr[i]; + nQueryVal[i] = rData.nQueryVal[i]; + eQueryConnect[i] = rData.eQueryConnect[i]; } for (i=0; i<MAXSUBTOTAL; i++) { - bDoSubTotal[i] = rData.bDoSubTotal[i]; - nSubField[i] = rData.nSubField[i]; - SCCOL nCount = rData.nSubTotals[i]; - nSubTotals[i] = nCount; + bDoSubTotal[i] = rData.bDoSubTotal[i]; + nSubField[i] = rData.nSubField[i]; + SCCOL nCount = rData.nSubTotals[i]; + nSubTotals[i] = nCount; delete[] pSubTotals[i]; delete[] pFunctions[i]; - pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL; + pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL; pFunctions[i] = nCount > 0 ? new ScSubTotalFunc [nCount] : NULL; for (j=0; j<nCount; j++) { @@ -277,13 +277,13 @@ ScDBData& ScDBData::operator= (const ScDBData& rData) BOOL ScDBData::operator== (const ScDBData& rData) const { - // Daten, die nicht in den Params sind + // Daten, die nicht in den Params sind - if ( nTable != rData.nTable || - bDoSize != rData.bDoSize || - bKeepFmt != rData.bKeepFmt || + if ( nTable != rData.nTable || + bDoSize != rData.bDoSize || + bKeepFmt != rData.bKeepFmt || bIsAdvanced!= rData.bIsAdvanced|| - bStripData != rData.bStripData || + bStripData != rData.bStripData || // SAB: I think this should be here, but I don't want to break something // bAutoFilter!= rData.bAutoFilter|| ScRefreshTimer::operator!=( rData ) @@ -391,7 +391,7 @@ void ScDBData::GetArea(ScRange& rRange, bool bUseDynamicRange) const void ScDBData::SetArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) { - nTable = nTab; + nTable = nTab; nStartCol = nCol1; nStartRow = nRow1; nEndCol = nCol2; @@ -418,7 +418,7 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n if (nSortField[i] > nSortEnd) { nSortField[i] = 0; - bDoSort[i] = FALSE; + bDoSort[i] = FALSE; } } for (i=0; i<MAXQUERY; i++) @@ -427,7 +427,7 @@ void ScDBData::MoveTo(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n if (nQueryField[i] > nCol2) { nQueryField[i] = 0; - bDoQuery[i] = FALSE; + bDoQuery[i] = FALSE; } } for (i=0; i<MAXSUBTOTAL; i++) @@ -458,12 +458,12 @@ void ScDBData::GetSortParam( ScSortParam& rSortParam ) const rSortParam.nDestCol = nSortDestCol; rSortParam.nDestRow = nSortDestRow; rSortParam.bIncludePattern = bIncludePattern; - rSortParam.bUserDef = bSortUserDef; + rSortParam.bUserDef = bSortUserDef; rSortParam.nUserIndex = nSortUserIndex; for (USHORT i=0; i<MAXSORT; i++) { - rSortParam.bDoSort[i] = bDoSort[i]; - rSortParam.nField[i] = nSortField[i]; + rSortParam.bDoSort[i] = bDoSort[i]; + rSortParam.nField[i] = nSortField[i]; rSortParam.bAscending[i] = bAscending[i]; } rSortParam.aCollatorLocale = aSortLocale; @@ -483,7 +483,7 @@ void ScDBData::SetSortParam( const ScSortParam& rSortParam ) nSortUserIndex = rSortParam.nUserIndex; for (USHORT i=0; i<MAXSORT; i++) { - bDoSort[i] = rSortParam.bDoSort[i]; + bDoSort[i] = rSortParam.bDoSort[i]; nSortField[i] = rSortParam.nField[i]; bAscending[i] = rSortParam.bAscending[i]; } @@ -534,8 +534,8 @@ void ScDBData::SetQueryParam(const ScQueryParam& rQueryParam) !rQueryParam.GetEntry(MAXQUERY).bDoQuery, "zuviele Eintraege bei ScDBData::SetQueryParam" ); - // set bIsAdvanced to FALSE for everything that is not from the - // advanced filter dialog + // set bIsAdvanced to FALSE for everything that is not from the + // advanced filter dialog bIsAdvanced = FALSE; bQueryInplace = rQueryParam.bInplace; @@ -587,20 +587,20 @@ void ScDBData::GetSubTotalParam(ScSubTotalParam& rSubTotalParam) const rSubTotalParam.nCol2 = nEndCol; rSubTotalParam.nRow2 = nEndRow; - rSubTotalParam.bRemoveOnly = bSubRemoveOnly; - rSubTotalParam.bReplace = bSubReplace; - rSubTotalParam.bPagebreak = bSubPagebreak; - rSubTotalParam.bCaseSens = bSubCaseSens; - rSubTotalParam.bDoSort = bSubDoSort; - rSubTotalParam.bAscending = bSubAscending; - rSubTotalParam.bIncludePattern = bSubIncludePattern; - rSubTotalParam.bUserDef = bSubUserDef; - rSubTotalParam.nUserIndex = nSubUserIndex; + rSubTotalParam.bRemoveOnly = bSubRemoveOnly; + rSubTotalParam.bReplace = bSubReplace; + rSubTotalParam.bPagebreak = bSubPagebreak; + rSubTotalParam.bCaseSens = bSubCaseSens; + rSubTotalParam.bDoSort = bSubDoSort; + rSubTotalParam.bAscending = bSubAscending; + rSubTotalParam.bIncludePattern = bSubIncludePattern; + rSubTotalParam.bUserDef = bSubUserDef; + rSubTotalParam.nUserIndex = nSubUserIndex; for (i=0; i<MAXSUBTOTAL; i++) { - rSubTotalParam.bGroupActive[i] = bDoSubTotal[i]; - rSubTotalParam.nField[i] = nSubField[i]; + rSubTotalParam.bGroupActive[i] = bDoSubTotal[i]; + rSubTotalParam.nField[i] = nSubField[i]; SCCOL nCount = nSubTotals[i]; rSubTotalParam.nSubTotals[i] = nCount; @@ -622,26 +622,26 @@ void ScDBData::SetSubTotalParam(const ScSubTotalParam& rSubTotalParam) USHORT i; USHORT j; - bSubRemoveOnly = rSubTotalParam.bRemoveOnly; - bSubReplace = rSubTotalParam.bReplace; - bSubPagebreak = rSubTotalParam.bPagebreak; - bSubCaseSens = rSubTotalParam.bCaseSens; - bSubDoSort = rSubTotalParam.bDoSort; - bSubAscending = rSubTotalParam.bAscending; - bSubIncludePattern = rSubTotalParam.bIncludePattern; - bSubUserDef = rSubTotalParam.bUserDef; - nSubUserIndex = rSubTotalParam.nUserIndex; + bSubRemoveOnly = rSubTotalParam.bRemoveOnly; + bSubReplace = rSubTotalParam.bReplace; + bSubPagebreak = rSubTotalParam.bPagebreak; + bSubCaseSens = rSubTotalParam.bCaseSens; + bSubDoSort = rSubTotalParam.bDoSort; + bSubAscending = rSubTotalParam.bAscending; + bSubIncludePattern = rSubTotalParam.bIncludePattern; + bSubUserDef = rSubTotalParam.bUserDef; + nSubUserIndex = rSubTotalParam.nUserIndex; for (i=0; i<MAXSUBTOTAL; i++) { - bDoSubTotal[i] = rSubTotalParam.bGroupActive[i]; - nSubField[i] = rSubTotalParam.nField[i]; + bDoSubTotal[i] = rSubTotalParam.bGroupActive[i]; + nSubField[i] = rSubTotalParam.nField[i]; SCCOL nCount = rSubTotalParam.nSubTotals[i]; nSubTotals[i] = nCount; delete[] pSubTotals[i]; delete[] pFunctions[i]; - pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL; + pSubTotals[i] = nCount > 0 ? new SCCOL [nCount] : NULL; pFunctions[i] = nCount > 0 ? new ScSubTotalFunc [nCount] : NULL; for (j=0; j<nCount; j++) { @@ -658,22 +658,22 @@ void ScDBData::GetImportParam(ScImportParam& rImportParam) const rImportParam.nCol2 = nEndCol; rImportParam.nRow2 = nEndRow; - rImportParam.bImport = bDBImport; - rImportParam.aDBName = aDBName; - rImportParam.aStatement = aDBStatement; - rImportParam.bNative = bDBNative; - rImportParam.bSql = bDBSql; - rImportParam.nType = nDBType; + rImportParam.bImport = bDBImport; + rImportParam.aDBName = aDBName; + rImportParam.aStatement = aDBStatement; + rImportParam.bNative = bDBNative; + rImportParam.bSql = bDBSql; + rImportParam.nType = nDBType; } void ScDBData::SetImportParam(const ScImportParam& rImportParam) { - bDBImport = rImportParam.bImport; - aDBName = rImportParam.aDBName; - aDBStatement = rImportParam.aStatement; - bDBNative = rImportParam.bNative; - bDBSql = rImportParam.bSql; - nDBType = rImportParam.nType; + bDBImport = rImportParam.bImport; + aDBName = rImportParam.aDBName; + aDBStatement = rImportParam.aStatement; + bDBNative = rImportParam.bNative; + bDBSql = rImportParam.bSql; + nDBType = rImportParam.nType; } BOOL ScDBData::IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL bStartOnly) const @@ -697,14 +697,14 @@ BOOL ScDBData::IsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR && (nCol2 == nEndCol) && (nRow2 == nEndRow)); } -ScDataObject* ScDBData::Clone() const +ScDataObject* ScDBData::Clone() const { return new ScDBData(*this); } //--------------------------------------------------------------------------------------- -// Compare zum Sortieren +// Compare zum Sortieren short ScDBCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const { @@ -713,7 +713,7 @@ short ScDBCollection::Compare(ScDataObject* pKey1, ScDataObject* pKey2) const return (short) ScGlobal::GetpTransliteration()->compareString( rStr1, rStr2 ); } -// IsEqual - alles gleich +// IsEqual - alles gleich BOOL ScDBCollection::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const { @@ -737,7 +737,7 @@ ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, BOOL return pDB; } } - return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden + return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden } ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) const @@ -757,7 +757,7 @@ ScDBData* ScDBCollection::GetDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCO return pDB; } } - return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden + return pNoNameData; // "unbenannt" nur zurueck, wenn sonst nichts gefunden } BOOL ScDBCollection::SearchName( const String& rName, USHORT& rIndex ) const @@ -818,40 +818,40 @@ void ScDBCollection::UpdateReference(UpdateRefMode eUpdateRefMode, aAdvSource.aEnd.Set( theCol2,theRow2,theTab2 ); ((ScDBData*)pItems[i])->SetAdvancedQuerySource( &aAdvSource ); - bDoUpdate = TRUE; // DBData is modified + bDoUpdate = TRUE; // DBData is modified } } ((ScDBData*)pItems[i])->SetModified(bDoUpdate); - //! Testen, ob mitten aus dem Bereich geloescht/eingefuegt wurde !!! + //! Testen, ob mitten aus dem Bereich geloescht/eingefuegt wurde !!! } } void ScDBCollection::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) { - // wenn nOldPos vor nNewPos liegt, ist nNewPos schon angepasst + // wenn nOldPos vor nNewPos liegt, ist nNewPos schon angepasst for (USHORT i=0; i<nCount; i++) { ScRange aRange; ScDBData* pData = (ScDBData*)pItems[i]; pData->GetArea( aRange ); - SCTAB nTab = aRange.aStart.Tab(); // hat nur eine Tabelle + SCTAB nTab = aRange.aStart.Tab(); // hat nur eine Tabelle - // anpassen wie die aktuelle Tabelle bei ScTablesHint (tabvwsh5.cxx) + // anpassen wie die aktuelle Tabelle bei ScTablesHint (tabvwsh5.cxx) - if ( nTab == nOldPos ) // verschobene Tabelle + if ( nTab == nOldPos ) // verschobene Tabelle nTab = nNewPos; - else if ( nOldPos < nNewPos ) // nach hinten verschoben + else if ( nOldPos < nNewPos ) // nach hinten verschoben { - if ( nTab > nOldPos && nTab <= nNewPos ) // nachrueckender Bereich + if ( nTab > nOldPos && nTab <= nNewPos ) // nachrueckender Bereich --nTab; } - else // nach vorne verschoben + else // nach vorne verschoben { - if ( nTab >= nNewPos && nTab < nOldPos ) // nachrueckender Bereich + if ( nTab >= nNewPos && nTab < nOldPos ) // nachrueckender Bereich ++nTab; } @@ -860,7 +860,7 @@ void ScDBCollection::UpdateMoveTab( SCTAB nOldPos, SCTAB nNewPos ) pData->SetArea( nTab, aRange.aStart.Col(), aRange.aStart.Row(), aRange.aEnd.Col(),aRange.aEnd .Row() ); - // MoveTo ist nicht noetig, wenn nur die Tabelle geaendert ist + // MoveTo ist nicht noetig, wenn nur die Tabelle geaendert ist pData->SetModified(bChanged); } @@ -882,7 +882,7 @@ ScDBData* ScDBCollection::FindIndex(USHORT nIndex) BOOL ScDBCollection::Insert(ScDataObject* pScDataObject) { ScDBData* pData = (ScDBData*) pScDataObject; - if (!pData->GetIndex()) // schon gesetzt? + if (!pData->GetIndex()) // schon gesetzt? pData->SetIndex(nEntryIndex++); BOOL bInserted = ScSortedCollection::Insert(pScDataObject); if ( bInserted && pData->HasImportParam() && !pData->HasImportSelection() ) diff --git a/sc/source/core/tool/ddelink.cxx b/sc/source/core/tool/ddelink.cxx index 00b97d430f0c..56ac77fa2c7c 100644 --- a/sc/source/core/tool/ddelink.cxx +++ b/sc/source/core/tool/ddelink.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 @@ TYPEINIT2(ScDdeLink,::sfx2::SvBaseLink,SfxBroadcaster); -#define DDE_TXT_ENCODING gsl_getSystemTextEncoding() +#define DDE_TXT_ENCODING gsl_getSystemTextEncoding() BOOL ScDdeLink::bIsInUpdate = FALSE; @@ -77,13 +77,13 @@ __EXPORT ScDdeLink::~ScDdeLink() ScDdeLink::ScDdeLink( ScDocument* pD, const ScDdeLink& rOther ) : ::sfx2::SvBaseLink(sfx2::LINKUPDATE_ALWAYS,FORMAT_STRING), - pDoc ( pD ), - aAppl ( rOther.aAppl ), - aTopic ( rOther.aTopic ), - aItem ( rOther.aItem ), - nMode ( rOther.nMode ), + pDoc ( pD ), + aAppl ( rOther.aAppl ), + aTopic ( rOther.aTopic ), + aItem ( rOther.aItem ), + nMode ( rOther.nMode ), bNeedUpdate( FALSE ), - pResult ( NULL ) + pResult ( NULL ) { if (rOther.pResult) pResult = rOther.pResult->Clone(); @@ -107,7 +107,7 @@ ScDdeLink::ScDdeLink( ScDocument* pD, SvStream& rStream, ScMultipleReadHeader& r if ( bHasValue ) pResult = new ScMatrix( rStream ); - if (rHdr.BytesLeft()) // neu in 388b und der 364w (RealTime-Client) Version + if (rHdr.BytesLeft()) // neu in 388b und der 364w (RealTime-Client) Version rStream >> nMode; else nMode = SC_DDE_DEFAULT; @@ -129,11 +129,11 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const if (bHasValue) pResult->Store( rStream ); - if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export - rStream << nMode; // seit 388b + if( rStream.GetVersion() > SOFFICE_FILEFORMAT_40 ) // nicht bei 4.0 Export + rStream << nMode; // seit 388b - // Links mit Mode != SC_DDE_DEFAULT werden bei 4.0 Export komplett weggelassen - // (aus ScDocument::SaveDdeLinks) + // Links mit Mode != SC_DDE_DEFAULT werden bei 4.0 Export komplett weggelassen + // (aus ScDocument::SaveDdeLinks) rHdr.EndEntry(); } @@ -141,7 +141,7 @@ void ScDdeLink::Store( SvStream& rStream, ScMultipleWriteHeader& rHdr ) const void __EXPORT ScDdeLink::DataChanged( const String& rMimeType, const ::com::sun::star::uno::Any & rValue ) { - // wir koennen nur Strings... + // wir koennen nur Strings... if ( FORMAT_STRING != SotExchange::GetFormatIdFromMimeType( rMimeType )) return; @@ -149,14 +149,14 @@ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType, ScByteSequenceToString::GetString( aLinkStr, rValue, DDE_TXT_ENCODING ); aLinkStr.ConvertLineEnd(LINEEND_LF); - // wenn String mit Zeilenende aufhoert, streichen: + // wenn String mit Zeilenende aufhoert, streichen: xub_StrLen nLen = aLinkStr.Len(); if (nLen && aLinkStr.GetChar(nLen-1) == '\n') aLinkStr.Erase(nLen-1); String aLine; - SCSIZE nCols = 1; // Leerstring -> eine leere Zelle + SCSIZE nCols = 1; // Leerstring -> eine leere Zelle SCSIZE nRows = 1; if (aLinkStr.Len()) { @@ -166,25 +166,25 @@ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType, nCols = static_cast<SCSIZE>(aLine.GetTokenCount( '\t' )); } - if (!nRows || !nCols) // keine Daten + if (!nRows || !nCols) // keine Daten { pResult.Clear(); } - else // Daten aufteilen + else // Daten aufteilen { - // Matrix immer neu anlegen, damit bIsString nicht durcheinanderkommt + // Matrix immer neu anlegen, damit bIsString nicht durcheinanderkommt pResult = new ScMatrix( nCols, nRows ); SvNumberFormatter* pFormatter = pDoc->GetFormatTable(); - // nMode bestimmt, wie der Text interpretiert wird (#44455#/#49783#): - // SC_DDE_DEFAULT - Zahlformat aus Zellvorlage "Standard" - // SC_DDE_ENGLISH - Standard-Zahlformat fuer English/US - // SC_DDE_TEXT - ohne NumberFormatter direkt als String + // nMode bestimmt, wie der Text interpretiert wird (#44455#/#49783#): + // SC_DDE_DEFAULT - Zahlformat aus Zellvorlage "Standard" + // SC_DDE_ENGLISH - Standard-Zahlformat fuer English/US + // SC_DDE_TEXT - ohne NumberFormatter direkt als String ULONG nStdFormat = 0; if ( nMode == SC_DDE_DEFAULT ) { - ScPatternAttr* pDefPattern = pDoc->GetDefPattern(); // enthaelt Standard-Vorlage + ScPatternAttr* pDefPattern = pDoc->GetDefPattern(); // enthaelt Standard-Vorlage if ( pDefPattern ) nStdFormat = pDefPattern->GetNumberFormat( pFormatter ); } @@ -208,22 +208,22 @@ void __EXPORT ScDdeLink::DataChanged( const String& rMimeType, } } - // Es hat sich was getan... + // Es hat sich was getan... if (HasListeners()) { Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) ); - pDoc->TrackFormulas(); // muss sofort passieren + pDoc->TrackFormulas(); // muss sofort passieren pDoc->StartTrackTimer(); - // StartTrackTimer ruft asynchron TrackFormulas, Broadcast(FID_DATACHANGED), - // ResetChanged, SetModified und Invalidate(SID_SAVEDOC/SID_DOC_MODIFIED) - // TrackFormulas zusaetzlich nochmal sofort, damit nicht z.B. durch IdleCalc - // eine Formel berechnet wird, die noch im FormulaTrack steht (#61676#) + // StartTrackTimer ruft asynchron TrackFormulas, Broadcast(FID_DATACHANGED), + // ResetChanged, SetModified und Invalidate(SID_SAVEDOC/SID_DOC_MODIFIED) + // TrackFormulas zusaetzlich nochmal sofort, damit nicht z.B. durch IdleCalc + // eine Formel berechnet wird, die noch im FormulaTrack steht (#61676#) - // notify Uno objects (for XRefreshListener) - // must be after TrackFormulas - //! do this asynchronously? + // notify Uno objects (for XRefreshListener) + // must be after TrackFormulas + //! do this asynchronously? ScLinkRefreshedHint aHint; aHint.SetDdeLink( aAppl, aTopic, aItem, nMode ); pDoc->BroadcastUno( aHint ); @@ -234,8 +234,8 @@ void ScDdeLink::ResetValue() { pResult.Clear(); - // Es hat sich was getan... - // Tracking, FID_DATACHANGED etc. passiert von aussen + // Es hat sich was getan... + // Tracking, FID_DATACHANGED etc. passiert von aussen if (HasListeners()) Broadcast( ScHint( SC_HINT_DATACHANGED, ScAddress(), NULL ) ); @@ -244,16 +244,16 @@ void ScDdeLink::ResetValue() void __EXPORT ScDdeLink::ListenersGone() { BOOL bWas = bIsInUpdate; - bIsInUpdate = TRUE; // Remove() kann Reschedule ausloesen??!? + bIsInUpdate = TRUE; // Remove() kann Reschedule ausloesen??!? - ScDocument* pStackDoc = pDoc; // member pDoc can't be used after removing the link + ScDocument* pStackDoc = pDoc; // member pDoc can't be used after removing the link sfx2::LinkManager* pLinkMgr = pDoc->GetLinkManager(); - pLinkMgr->Remove( this); // deletes this + pLinkMgr->Remove( this); // deletes this - if ( !pLinkMgr->GetLinks().Count() ) // letzten geloescht ? + if ( !pLinkMgr->GetLinks().Count() ) // letzten geloescht ? { - SfxBindings* pBindings = pStackDoc->GetViewBindings(); // don't use member pDoc! + SfxBindings* pBindings = pStackDoc->GetViewBindings(); // don't use member pDoc! if (pBindings) pBindings->Invalidate( SID_LINKS ); } @@ -264,11 +264,11 @@ void __EXPORT ScDdeLink::ListenersGone() void ScDdeLink::TryUpdate() { if (bIsInUpdate) - bNeedUpdate = TRUE; // kann jetzt nicht ausgefuehrt werden + bNeedUpdate = TRUE; // kann jetzt nicht ausgefuehrt werden else { bIsInUpdate = TRUE; - //Application::Reschedule(); //! OS/2-Simulation + //Application::Reschedule(); //! OS/2-Simulation pDoc->IncInDdeLinkUpdate(); Update(); pDoc->DecInDdeLinkUpdate(); diff --git a/sc/source/core/tool/detdata.cxx b/sc/source/core/tool/detdata.cxx index 075187105461..5f813ce6b303 100644 --- a/sc/source/core/tool/detdata.cxx +++ b/sc/source/core/tool/detdata.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 @@ -108,8 +108,8 @@ BOOL ScDetOpList::operator==( const ScDetOpList& r ) const USHORT nCount = Count(); BOOL bEqual = ( nCount == r.Count() ); - for (USHORT i=0; i<nCount && bEqual; i++) // Reihenfolge muss auch gleich sein - if ( !(*(*this)[i] == *r[i]) ) // Eintraege unterschiedlich ? + for (USHORT i=0; i<nCount && bEqual; i++) // Reihenfolge muss auch gleich sein + if ( !(*(*this)[i] == *r[i]) ) // Eintraege unterschiedlich ? bEqual = FALSE; return bEqual; diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 3916e2e27de3..7748122e8896 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.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 @@ -89,11 +89,11 @@ using ::std::vector; // #99319# line ends are now created with an empty name. // The checkForUniqueItem method then finds a unique name for the item's value. -#define SC_LINEEND_NAME EMPTY_STRING +#define SC_LINEEND_NAME EMPTY_STRING //------------------------------------------------------------------------ -enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level +enum DetInsertResult { // Return-Werte beim Einfuegen in einen Level DET_INS_CONTINUE, DET_INS_INSERTED, DET_INS_EMPTY, @@ -105,24 +105,24 @@ enum DetInsertResult { // Return-Werte beim Einfuegen in einen Leve class ScDetectiveData { private: - SfxItemSet aBoxSet; - SfxItemSet aArrowSet; - SfxItemSet aToTabSet; - SfxItemSet aFromTabSet; - SfxItemSet aCircleSet; //! einzeln ? - USHORT nMaxLevel; + SfxItemSet aBoxSet; + SfxItemSet aArrowSet; + SfxItemSet aToTabSet; + SfxItemSet aFromTabSet; + SfxItemSet aCircleSet; //! einzeln ? + USHORT nMaxLevel; public: ScDetectiveData( SdrModel* pModel ); - SfxItemSet& GetBoxSet() { return aBoxSet; } - SfxItemSet& GetArrowSet() { return aArrowSet; } - SfxItemSet& GetToTabSet() { return aToTabSet; } - SfxItemSet& GetFromTabSet() { return aFromTabSet; } - SfxItemSet& GetCircleSet() { return aCircleSet; } + SfxItemSet& GetBoxSet() { return aBoxSet; } + SfxItemSet& GetArrowSet() { return aArrowSet; } + SfxItemSet& GetToTabSet() { return aToTabSet; } + SfxItemSet& GetFromTabSet() { return aFromTabSet; } + SfxItemSet& GetCircleSet() { return aCircleSet; } - void SetMaxLevel( USHORT nVal ) { nMaxLevel = nVal; } - USHORT GetMaxLevel() const { return nMaxLevel; } + void SetMaxLevel( USHORT nVal ) { nMaxLevel = nVal; } + USHORT GetMaxLevel() const { return nMaxLevel; } }; class ScCommentData @@ -130,11 +130,11 @@ class ScCommentData public: ScCommentData( ScDocument& rDoc, SdrModel* pModel ); - SfxItemSet& GetCaptionSet() { return aCaptionSet; } - void UpdateCaptionSet( const SfxItemSet& rItemSet ); + SfxItemSet& GetCaptionSet() { return aCaptionSet; } + void UpdateCaptionSet( const SfxItemSet& rItemSet ); private: - SfxItemSet aCaptionSet; + SfxItemSet aCaptionSet; }; //------------------------------------------------------------------------ @@ -167,8 +167,8 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) : aBoxSet.Put( XLineColorItem( EMPTY_STRING, Color( ScDetectiveFunc::GetArrowColor() ) ) ); aBoxSet.Put( XFillStyleItem( XFILL_NONE ) ); - // #66479# Standard-Linienenden (wie aus XLineEndList::Create) selber zusammenbasteln, - // um von den konfigurierten Linienenden unabhaengig zu sein + // #66479# Standard-Linienenden (wie aus XLineEndList::Create) selber zusammenbasteln, + // um von den konfigurierten Linienenden unabhaengig zu sein basegfx::B2DPolygon aTriangle; aTriangle.append(basegfx::B2DPoint(10.0, 0.0)); @@ -211,7 +211,7 @@ ScDetectiveData::ScDetectiveData( SdrModel* pModel ) : aCircleSet.Put( XLineColorItem( String(), Color( ScDetectiveFunc::GetErrorColor() ) ) ); aCircleSet.Put( XFillStyleItem( XFILL_NONE ) ); - USHORT nWidth = 55; // 54 = 1 Pixel + USHORT nWidth = 55; // 54 = 1 Pixel aCircleSet.Put( XLineWidthItem( nWidth ) ); } @@ -233,15 +233,15 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) : Color aYellow( ScDetectiveFunc::GetCommentColor() ); aCaptionSet.Put( XFillColorItem( String(), aYellow ) ); - // shadow - // SdrShadowItem has FALSE, instead the shadow is set for the rectangle - // only with SetSpecialTextBoxShadow when the object is created - // (item must be set to adjust objects from older files) + // shadow + // SdrShadowItem has FALSE, instead the shadow is set for the rectangle + // only with SetSpecialTextBoxShadow when the object is created + // (item must be set to adjust objects from older files) aCaptionSet.Put( SdrShadowItem( FALSE ) ); aCaptionSet.Put( SdrShadowXDistItem( 100 ) ); aCaptionSet.Put( SdrShadowYDistItem( 100 ) ); - // text attributes + // text attributes aCaptionSet.Put( SdrTextLeftDistItem( 100 ) ); aCaptionSet.Put( SdrTextRightDistItem( 100 ) ); aCaptionSet.Put( SdrTextUpperDistItem( 100 ) ); @@ -250,8 +250,8 @@ ScCommentData::ScCommentData( ScDocument& rDoc, SdrModel* pModel ) : aCaptionSet.Put( SdrTextAutoGrowWidthItem( FALSE ) ); aCaptionSet.Put( SdrTextAutoGrowHeightItem( TRUE ) ); - // #78943# do use the default cell style, so the user has a chance to - // modify the font for the annotations + // #78943# do use the default cell style, so the user has a chance to + // modify the font for the annotations ((const ScPatternAttr&)rDoc.GetPool()->GetDefaultItem(ATTR_PATTERN)). FillEditItemSet( &aCaptionSet ); @@ -393,7 +393,7 @@ Rectangle ScDetectiveFunc::GetDrawRect( SCCOL nCol, SCROW nRow ) const BOOL lcl_IsOtherTab( const basegfx::B2DPolyPolygon& rPolyPolygon ) { - // test if rPolygon is the line end for "other table" (rectangle) + // test if rPolygon is the line end for "other table" (rectangle) if(1L == rPolyPolygon.count()) { const basegfx::B2DPolygon aSubPoly(rPolyPolygon.getB2DPolygon(0L)); @@ -461,7 +461,7 @@ BOOL ScDetectiveFunc::HasArrow( const ScAddress& rStart, return bFound; } -BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) // static +BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) // static { if ( pObject->GetLayer()==SC_LAYER_INTERN && pObject->IsPolyObj() && pObject->GetPointCount()==2 ) @@ -481,7 +481,7 @@ BOOL ScDetectiveFunc::IsNonAlienArrow( SdrObject* pObject ) // static //------------------------------------------------------------------------ -// InsertXXX: called from DrawEntry/DrawAlienEntry and InsertObject +// InsertXXX: called from DrawEntry/DrawAlienEntry and InsertObject BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow, SCCOL nRefStartCol, SCROW nRefStartRow, @@ -512,7 +512,7 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow, pData->maEnd.Set( nRefEndCol, nRefEndRow, nTab); } - Point aStartPos = GetDrawPos( nRefStartCol, nRefStartRow, DRAWPOS_DETARROW ); + Point aStartPos = GetDrawPos( nRefStartCol, nRefStartRow, DRAWPOS_DETARROW ); Point aEndPos = GetDrawPos( nCol, nRow, DRAWPOS_DETARROW ); if (bFromOtherTab) @@ -530,9 +530,9 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow, SfxItemSet& rAttrSet = bFromOtherTab ? rData.GetFromTabSet() : rData.GetArrowSet(); if (bArea && !bFromOtherTab) - rAttrSet.Put( XLineWidthItem( 50 ) ); // Bereich + rAttrSet.Put( XLineWidthItem( 50 ) ); // Bereich else - rAttrSet.Put( XLineWidthItem( 0 ) ); // einzelne Referenz + rAttrSet.Put( XLineWidthItem( 0 ) ); // einzelne Referenz ColorData nColorData = ( bRed ? GetErrorColor() : GetArrowColor() ); rAttrSet.Put( XLineColorItem( String(), Color( nColorData ) ) ); @@ -541,7 +541,7 @@ BOOL ScDetectiveFunc::InsertArrow( SCCOL nCol, SCROW nRow, aTempPoly.append(basegfx::B2DPoint(aStartPos.X(), aStartPos.Y())); aTempPoly.append(basegfx::B2DPoint(aEndPos.X(), aEndPos.Y())); SdrPathObj* pArrow = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aTempPoly)); - pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ??? + pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ??? pArrow->SetMergedItemSetAndBroadcast(rAttrSet); ScDrawLayer::SetAnchor( pArrow, SCA_CELL ); @@ -589,16 +589,16 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, BOOL bNegativePage = pDoc->IsNegativePage( nTab ); long nPageSign = bNegativePage ? -1 : 1; - Point aStartPos = GetDrawPos( nStartCol, nStartRow, DRAWPOS_DETARROW ); + Point aStartPos = GetDrawPos( nStartCol, nStartRow, DRAWPOS_DETARROW ); Point aEndPos = Point( aStartPos.X() + 1000 * nPageSign, aStartPos.Y() - 1000 ); if (aEndPos.Y() < 0) aEndPos.Y() += 2000; SfxItemSet& rAttrSet = rData.GetToTabSet(); if (bArea) - rAttrSet.Put( XLineWidthItem( 50 ) ); // Bereich + rAttrSet.Put( XLineWidthItem( 50 ) ); // Bereich else - rAttrSet.Put( XLineWidthItem( 0 ) ); // einzelne Referenz + rAttrSet.Put( XLineWidthItem( 0 ) ); // einzelne Referenz ColorData nColorData = ( bRed ? GetErrorColor() : GetArrowColor() ); rAttrSet.Put( XLineColorItem( String(), Color( nColorData ) ) ); @@ -607,7 +607,7 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, aTempPoly.append(basegfx::B2DPoint(aStartPos.X(), aStartPos.Y())); aTempPoly.append(basegfx::B2DPoint(aEndPos.X(), aEndPos.Y())); SdrPathObj* pArrow = new SdrPathObj(OBJ_LINE, basegfx::B2DPolyPolygon(aTempPoly)); - pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ??? + pArrow->NbcSetLogicRect(Rectangle(aStartPos,aEndPos)); //! noetig ??? pArrow->SetMergedItemSetAndBroadcast(rAttrSet); @@ -626,12 +626,12 @@ BOOL ScDetectiveFunc::InsertToOtherTab( SCCOL nStartCol, SCROW nStartRow, //------------------------------------------------------------------------ -// DrawEntry: Formel auf dieser Tabelle, -// Referenz auf dieser oder anderer -// DrawAlienEntry: Formel auf anderer Tabelle, -// Referenz auf dieser +// DrawEntry: Formel auf dieser Tabelle, +// Referenz auf dieser oder anderer +// DrawAlienEntry: Formel auf anderer Tabelle, +// Referenz auf dieser -// return FALSE: da war schon ein Pfeil +// return FALSE: da war schon ein Pfeil BOOL ScDetectiveFunc::DrawEntry( SCCOL nCol, SCROW nRow, const ScRange& rRef, @@ -670,10 +670,10 @@ void ScDetectiveFunc::DrawCircle( SCCOL nCol, SCROW nRow, ScDetectiveData& rData SdrPage* pPage = pModel->GetPage(static_cast<sal_uInt16>(nTab)); Rectangle aRect = GetDrawRect( nCol, nRow ); - aRect.Left() -= 250; - aRect.Right() += 250; - aRect.Top() -= 70; - aRect.Bottom() += 70; + aRect.Left() -= 250; + aRect.Right() += 250; + aRect.Top() -= 70; + aRect.Bottom() += 70; SdrCircObj* pCircle = new SdrCircObj( OBJ_CIRC, aRect ); SfxItemSet& rAttrSet = rData.GetCircleSet(); @@ -702,8 +702,8 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt ) pPage->RecalcObjOrdNums(); - long nDelCount = 0; - ULONG nObjCount = pPage->GetObjCount(); + long nDelCount = 0; + ULONG nObjCount = pPage->GetObjCount(); if (nObjCount) { SdrObject** ppObj = new SdrObject*[nObjCount]; @@ -715,7 +715,7 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt ) if ( pObject->GetLayer()==SC_LAYER_INTERN && pObject->IsPolyObj() && pObject->GetPointCount()==2 ) { - if (aRect.IsInside(pObject->GetPoint(bDestPnt))) // Start/Zielpunkt + if (aRect.IsInside(pObject->GetPoint(bDestPnt))) // Start/Zielpunkt ppObj[nDelCount++] = pObject; } @@ -735,9 +735,9 @@ void ScDetectiveFunc::DeleteArrowsAt( SCCOL nCol, SCROW nRow, BOOL bDestPnt ) } } - // Box um Referenz loeschen + // Box um Referenz loeschen -#define SC_DET_TOLERANCE 50 +#define SC_DET_TOLERANCE 50 inline BOOL RectIsPoints( const Rectangle& rRect, const Point& rStart, const Point& rEnd ) { @@ -755,7 +755,7 @@ inline BOOL RectIsPoints( const Rectangle& rRect, const Point& rStart, const Poi void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { -/* String aStr; +/* String aStr; aStr += nCol1; aStr += '/'; aStr += nRow1; @@ -777,8 +777,8 @@ void ScDetectiveFunc::DeleteBox( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nR pPage->RecalcObjOrdNums(); - long nDelCount = 0; - ULONG nObjCount = pPage->GetObjCount(); + long nDelCount = 0; + ULONG nObjCount = pPage->GetObjCount(); if (nObjCount) { SdrObject** ppObj = new SdrObject*[nObjCount]; @@ -860,7 +860,7 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData return DET_INS_CIRCULAR; if (pFCell->GetDirty()) - pFCell->Interpret(); // nach SetRunning geht's nicht mehr! + pFCell->Interpret(); // nach SetRunning geht's nicht mehr! pFCell->SetRunning(TRUE); USHORT nResult = DET_INS_EMPTY; @@ -871,11 +871,11 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData { if (DrawEntry( nCol, nRow, aRef, rData )) { - nResult = DET_INS_INSERTED; // neuer Pfeil eingetragen + nResult = DET_INS_INSERTED; // neuer Pfeil eingetragen } else { - // weiterverfolgen + // weiterverfolgen if ( nLevel < rData.GetMaxLevel() ) { @@ -903,7 +903,7 @@ USHORT ScDetectiveFunc::InsertPredLevel( SCCOL nCol, SCROW nRow, ScDetectiveData // DET_INS_EMPTY: unveraendert lassen } } - else // nMaxLevel erreicht + else // nMaxLevel erreicht if (nResult != DET_INS_INSERTED) nResult = DET_INS_CONTINUE; } @@ -935,7 +935,7 @@ USHORT ScDetectiveFunc::FindPredLevelArea( const ScRange& rRef, return nResult; } - // nDeleteLevel != 0 -> loeschen + // nDeleteLevel != 0 -> loeschen USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, USHORT nDeleteLevel ) { @@ -953,7 +953,7 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US return nLevel; if (pFCell->GetDirty()) - pFCell->Interpret(); // nach SetRunning geht's nicht mehr! + pFCell->Interpret(); // nach SetRunning geht's nicht mehr! pFCell->SetRunning(TRUE); USHORT nResult = nLevel; @@ -961,7 +961,7 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US if ( bDelete ) { - DeleteArrowsAt( nCol, nRow, TRUE ); // Pfeile, die hierher zeigen + DeleteArrowsAt( nCol, nRow, TRUE ); // Pfeile, die hierher zeigen } ScDetectiveRefIter aIter( (ScFormulaCell*) pCell ); @@ -970,14 +970,14 @@ USHORT ScDetectiveFunc::FindPredLevel( SCCOL nCol, SCROW nRow, USHORT nLevel, US { BOOL bArea = ( aRef.aStart != aRef.aEnd ); - if ( bDelete ) // Rahmen loeschen ? + if ( bDelete ) // Rahmen loeschen ? { if (bArea) { DeleteBox( aRef.aStart.Col(), aRef.aStart.Row(), aRef.aEnd.Col(), aRef.aEnd.Row() ); } } - else // weitersuchen + else // weitersuchen { if ( HasArrow( aRef.aStart, nCol,nRow,nTab ) ) { @@ -1015,7 +1015,7 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat return DET_INS_CIRCULAR; if (pFCell->GetDirty()) - pFCell->Interpret(); // nach SetRunning geht's nicht mehr! + pFCell->Interpret(); // nach SetRunning geht's nicht mehr! pFCell->SetRunning(TRUE); USHORT nResult = DET_INS_EMPTY; @@ -1032,9 +1032,9 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat if (DrawEntry( nCol, nRow, ScRange( aErrorPos), rData )) nResult = DET_INS_INSERTED; - // und weiterverfolgen + // und weiterverfolgen - if ( nLevel < rData.GetMaxLevel() ) // praktisch immer + if ( nLevel < rData.GetMaxLevel() ) // praktisch immer { if (InsertErrorLevel( aErrorPos.Col(), aErrorPos.Row(), rData, nLevel+1 ) == DET_INS_INSERTED) @@ -1058,11 +1058,11 @@ USHORT ScDetectiveFunc::InsertErrorLevel( SCCOL nCol, SCROW nRow, ScDetectiveDat USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, ScDetectiveData& rData, USHORT nLevel ) { - // ueber ganzes Dokument + // ueber ganzes Dokument USHORT nResult = DET_INS_EMPTY; -// ScCellIterator aCellIter( pDoc, 0,0, nTab, MAXCOL,MAXROW, nTab ); - ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB ); // alle Tabellen +// ScCellIterator aCellIter( pDoc, 0,0, nTab, MAXCOL,MAXROW, nTab ); + ScCellIterator aCellIter( pDoc, 0,0,0, MAXCOL,MAXROW,MAXTAB ); // alle Tabellen ScBaseCell* pCell = aCellIter.GetFirst(); while (pCell) { @@ -1072,7 +1072,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, BOOL bRunning = pFCell->IsRunning(); if (pFCell->GetDirty()) - pFCell->Interpret(); // nach SetRunning geht's nicht mehr! + pFCell->Interpret(); // nach SetRunning geht's nicht mehr! pFCell->SetRunning(TRUE); ScDetectiveRefIter aIter( (ScFormulaCell*) pCell ); @@ -1094,7 +1094,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, aRef, rData ); if (bDrawRet) { - nResult = DET_INS_INSERTED; // neuer Pfeil eingetragen + nResult = DET_INS_INSERTED; // neuer Pfeil eingetragen } else { @@ -1105,7 +1105,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, } else { - // weiterverfolgen + // weiterverfolgen if ( nLevel < rData.GetMaxLevel() ) { @@ -1129,7 +1129,7 @@ USHORT ScDetectiveFunc::InsertSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, // DET_INS_EMPTY: unveraendert lassen } } - else // nMaxLevel erreicht + else // nMaxLevel erreicht if (nResult != DET_INS_INSERTED) nResult = DET_INS_CONTINUE; } @@ -1163,7 +1163,7 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC BOOL bRunning = pFCell->IsRunning(); if (pFCell->GetDirty()) - pFCell->Interpret(); // nach SetRunning geht's nicht mehr! + pFCell->Interpret(); // nach SetRunning geht's nicht mehr! pFCell->SetRunning(TRUE); ScDetectiveRefIter aIter( (ScFormulaCell*) pCell ); @@ -1176,7 +1176,7 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC aRef.aStart.Col(),aRef.aStart.Row(), aRef.aEnd.Col(),aRef.aEnd.Row() )) { - if ( bDelete ) // Pfeile, die hier anfangen + if ( bDelete ) // Pfeile, die hier anfangen { if (aRef.aStart != aRef.aEnd) { @@ -1209,7 +1209,7 @@ USHORT ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SC // -// -------------------------------------------------------------------------------- +// -------------------------------------------------------------------------------- // BOOL ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow ) @@ -1279,7 +1279,7 @@ BOOL ScDetectiveFunc::DeleteSucc( SCCOL nCol, SCROW nRow ) USHORT nLevelCount = FindSuccLevel( nCol, nRow, nCol, nRow, 0, 0 ); if ( nLevelCount ) - FindSuccLevel( nCol, nRow, nCol, nRow, 0, nLevelCount ); // loeschen + FindSuccLevel( nCol, nRow, nCol, nRow, 0, nLevelCount ); // loeschen return ( nLevelCount != 0 ); } @@ -1292,7 +1292,7 @@ BOOL ScDetectiveFunc::DeletePred( SCCOL nCol, SCROW nRow ) USHORT nLevelCount = FindPredLevel( nCol, nRow, 0, 0 ); if ( nLevelCount ) - FindPredLevel( nCol, nRow, 0, nLevelCount ); // loeschen + FindPredLevel( nCol, nRow, 0, nLevelCount ); // loeschen return ( nLevelCount != 0 ); } @@ -1308,8 +1308,8 @@ BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat ) pPage->RecalcObjOrdNums(); - long nDelCount = 0; - ULONG nObjCount = pPage->GetObjCount(); + long nDelCount = 0; + ULONG nObjCount = pPage->GetObjCount(); if (nObjCount) { SdrObject** ppObj = new SdrObject*[nObjCount]; @@ -1325,12 +1325,12 @@ BOOL ScDetectiveFunc::DeleteAll( ScDetectiveDelete eWhat ) { BOOL bCircle = ( pObject->ISA(SdrCircObj) ); BOOL bCaption = ScDrawLayer::IsNoteCaption( pObject ); - if ( eWhat == SC_DET_DETECTIVE ) // Detektiv, aus Menue - bDoThis = !bCaption; // auch Kreise - else if ( eWhat == SC_DET_CIRCLES ) // Kreise, wenn neue erzeugt werden + if ( eWhat == SC_DET_DETECTIVE ) // Detektiv, aus Menue + bDoThis = !bCaption; // auch Kreise + else if ( eWhat == SC_DET_CIRCLES ) // Kreise, wenn neue erzeugt werden bDoThis = bCircle; - else if ( eWhat == SC_DET_ARROWS ) // DetectiveRefresh - bDoThis = !bCaption && !bCircle; // don't include circles + else if ( eWhat == SC_DET_ARROWS ) // DetectiveRefresh + bDoThis = !bCaption && !bCircle; // don't include circles else { DBG_ERROR("wat?"); @@ -1365,12 +1365,12 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow) if (!pModel) return FALSE; - BOOL bDeleted = DeleteAll( SC_DET_CIRCLES ); // nur die Kreise + BOOL bDeleted = DeleteAll( SC_DET_CIRCLES ); // nur die Kreise ScDetectiveData aData( pModel ); long nInsCount = 0; - // Stellen suchen, wo Gueltigkeit definiert ist + // Stellen suchen, wo Gueltigkeit definiert ist ScDocAttrIterator aAttrIter( pDoc, nTab, 0,0,MAXCOL,MAXROW ); SCCOL nCol; @@ -1382,10 +1382,10 @@ BOOL ScDetectiveFunc::MarkInvalid(BOOL& rOverflow) ULONG nIndex = ((const SfxUInt32Item&)pPattern->GetItem(ATTR_VALIDDATA)).GetValue(); if (nIndex) { - const ScValidationData* pData = pDoc->GetValidationEntry( nIndex ); + const ScValidationData* pData = pDoc->GetValidationEntry( nIndex ); if ( pData ) { - // Zellen in dem Bereich durchgehen + // Zellen in dem Bereich durchgehen BOOL bMarkEmpty = !pData->IsIgnoreBlank(); SCROW nNextRow = nRow1; @@ -1475,10 +1475,10 @@ void ScDetectiveFunc::GetAllSuccs(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW n void ScDetectiveFunc::UpdateAllComments( ScDocument& rDoc ) { - // for all caption objects, update attributes and SpecialTextBoxShadow flag - // (on all tables - nTab is ignored!) + // for all caption objects, update attributes and SpecialTextBoxShadow flag + // (on all tables - nTab is ignored!) - // no undo actions, this is refreshed after undo + // no undo actions, this is refreshed after undo ScDrawLayer* pModel = rDoc.GetDrawLayer(); if (!pModel) @@ -1520,7 +1520,7 @@ void ScDetectiveFunc::UpdateAllComments( ScDocument& rDoc ) void ScDetectiveFunc::UpdateAllArrowColors() { - // no undo actions necessary + // no undo actions necessary ScDrawLayer* pModel = pDoc->GetDrawLayer(); if (!pModel) @@ -1546,7 +1546,7 @@ void ScDetectiveFunc::UpdateAllArrowColors() ScDetectiveObjType eType = GetDetectiveObjectType( pObject, nObjTab, aPos, aSource, bDummy ); if ( eType == SC_DETOBJ_ARROW || eType == SC_DETOBJ_TOOTHERTAB ) { - // source is valid, determine error flag from source range + // source is valid, determine error flag from source range ScAddress aErrPos; if ( HasError( aSource, aErrPos ) ) @@ -1556,9 +1556,9 @@ void ScDetectiveFunc::UpdateAllArrowColors() } else if ( eType == SC_DETOBJ_FROMOTHERTAB ) { - // source range is no longer known, take error flag from formula itself - // (this means, if the formula has an error, all references to other tables - // are marked red) + // source range is no longer known, take error flag from formula itself + // (this means, if the formula has an error, all references to other tables + // are marked red) ScAddress aErrPos; if ( HasError( ScRange( aPos), aErrPos ) ) @@ -1568,13 +1568,13 @@ void ScDetectiveFunc::UpdateAllArrowColors() } else if ( eType == SC_DETOBJ_CIRCLE ) { - // circles (error marks) are always red + // circles (error marks) are always red bError = TRUE; } else if ( eType == SC_DETOBJ_NONE ) { - // frame for area reference has no ObjType, always gets arrow color + // frame for area reference has no ObjType, always gets arrow color if ( pObject->ISA( SdrRectObj ) && !pObject->ISA( SdrCaptionObj ) ) { @@ -1600,8 +1600,8 @@ void ScDetectiveFunc::UpdateAllArrowColors() BOOL ScDetectiveFunc::FindFrameForObject( SdrObject* pObject, ScRange& rRange ) { - // find the rectangle for an arrow (always the object directly before the arrow) - // rRange must be initialized to the source cell of the arrow (start of area) + // find the rectangle for an arrow (always the object directly before the arrow) + // rRange must be initialized to the source cell of the arrow (start of area) ScDrawLayer* pModel = pDoc->GetDrawLayer(); if (!pModel) return FALSE; diff --git a/sc/source/core/tool/docoptio.cxx b/sc/source/core/tool/docoptio.cxx index 6c89ba675049..ccc5eae58f2c 100644 --- a/sc/source/core/tool/docoptio.cxx +++ b/sc/source/core/tool/docoptio.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 @@ -61,20 +61,20 @@ TYPEINIT1(ScTpCalcItem, SfxPoolItem); //------------------------------------------------------------------------ -//! these functions should be moved to some header file -inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } -inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } +//! these functions should be moved to some header file +inline long TwipsToHMM(long nTwips) { return (nTwips * 127 + 36) / 72; } +inline long HMMToTwips(long nHMM) { return (nHMM * 72 + 63) / 127; } -inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; } +inline long TwipsToEvenHMM(long nTwips) { return ( (nTwips * 127 + 72) / 144 ) * 2; } //------------------------------------------------------------------------ USHORT lcl_GetDefaultTabDist() { if ( ScOptionsUtil::IsMetricSystem() ) - return 709; // 1,25 cm + return 709; // 1,25 cm else - return 720; // 1/2" + return 720; // 1/2" } //======================================================================== @@ -123,21 +123,21 @@ ScDocOptions::~ScDocOptions() void ScDocOptions::ResetDocOptions() { - bIsIgnoreCase = FALSE; - bIsIter = FALSE; - nIterCount = 100; - fIterEps = 1.0E-3; + bIsIgnoreCase = FALSE; + bIsIter = FALSE; + nIterCount = 100; + fIterEps = 1.0E-3; nPrecStandardFormat = SvNumberFormatter::UNLIMITED_PRECISION; eKeyBindingType = ScOptionsUtil::KEY_DEFAULT; - nDay = 30; - nMonth = 12; - nYear = 1899; - nYear2000 = SvNumberFormatter::GetYear2000Default(); - nTabDistance = lcl_GetDefaultTabDist(); - bCalcAsShown = FALSE; - bMatchWholeCell = TRUE; - bDoAutoSpell = FALSE; - bLookUpColRowNames = TRUE; + nDay = 30; + nMonth = 12; + nYear = 1899; + nYear2000 = SvNumberFormatter::GetYear2000Default(); + nTabDistance = lcl_GetDefaultTabDist(); + bCalcAsShown = FALSE; + bMatchWholeCell = TRUE; + bDoAutoSpell = FALSE; + bLookUpColRowNames = TRUE; bFormulaRegexEnabled= TRUE; bUseEnglishFuncName = false; eFormulaGrammar = ::formula::FormulaGrammar::GRAM_NATIVE; @@ -210,15 +210,15 @@ const LocaleDataWrapper& ScDocOptions::GetLocaleDataWrapper() ScTpCalcItem::ScTpCalcItem( USHORT nWhichP, const ScDocOptions& rOpt ) : SfxPoolItem ( nWhichP ), - theOptions ( rOpt ) + theOptions ( rOpt ) { } //------------------------------------------------------------------------ ScTpCalcItem::ScTpCalcItem( const ScTpCalcItem& rItem ) - : SfxPoolItem ( rItem ), - theOptions ( rItem.theOptions ) + : SfxPoolItem ( rItem ), + theOptions ( rItem.theOptions ) { } @@ -254,22 +254,22 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const } //================================================================== -// Config Item containing document options +// Config Item containing document options //================================================================== -#define CFGPATH_CALC "Office.Calc/Calculate" - -#define SCCALCOPT_ITER_ITER 0 -#define SCCALCOPT_ITER_STEPS 1 -#define SCCALCOPT_ITER_MINCHG 2 -#define SCCALCOPT_DATE_DAY 3 -#define SCCALCOPT_DATE_MONTH 4 -#define SCCALCOPT_DATE_YEAR 5 -#define SCCALCOPT_DECIMALS 6 -#define SCCALCOPT_CASESENSITIVE 7 -#define SCCALCOPT_PRECISION 8 -#define SCCALCOPT_SEARCHCRIT 9 -#define SCCALCOPT_FINDLABEL 10 +#define CFGPATH_CALC "Office.Calc/Calculate" + +#define SCCALCOPT_ITER_ITER 0 +#define SCCALCOPT_ITER_STEPS 1 +#define SCCALCOPT_ITER_MINCHG 2 +#define SCCALCOPT_DATE_DAY 3 +#define SCCALCOPT_DATE_MONTH 4 +#define SCCALCOPT_DATE_YEAR 5 +#define SCCALCOPT_DECIMALS 6 +#define SCCALCOPT_CASESENSITIVE 7 +#define SCCALCOPT_PRECISION 8 +#define SCCALCOPT_SEARCHCRIT 9 +#define SCCALCOPT_FINDLABEL 10 #define SCCALCOPT_REGEX 11 #define SCCALCOPT_COUNT 12 @@ -281,10 +281,10 @@ SfxPoolItem* __EXPORT ScTpCalcItem::Clone( SfxItemPool * ) const #define SCFORMULAOPT_SEP_ARRAY_COL 4 #define SCFORMULAOPT_COUNT 5 -#define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other" +#define CFGPATH_DOCLAYOUT "Office.Calc/Layout/Other" -#define SCDOCLAYOUTOPT_TABSTOP 0 -#define SCDOCLAYOUTOPT_COUNT 1 +#define SCDOCLAYOUTOPT_TABSTOP 0 +#define SCDOCLAYOUTOPT_COUNT 1 #define CFGPATH_COMPAT "Office.Calc/Compatibility" #define SCCOMPATOPT_KEY_BINDING 0 @@ -294,16 +294,16 @@ Sequence<OUString> ScDocCfg::GetCalcPropertyNames() { static const char* aPropNames[] = { - "IterativeReference/Iteration", // SCCALCOPT_ITER_ITER - "IterativeReference/Steps", // SCCALCOPT_ITER_STEPS - "IterativeReference/MinimumChange", // SCCALCOPT_ITER_MINCHG - "Other/Date/DD", // SCCALCOPT_DATE_DAY - "Other/Date/MM", // SCCALCOPT_DATE_MONTH - "Other/Date/YY", // SCCALCOPT_DATE_YEAR - "Other/DecimalPlaces", // SCCALCOPT_DECIMALS - "Other/CaseSensitive", // SCCALCOPT_CASESENSITIVE - "Other/Precision", // SCCALCOPT_PRECISION - "Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT + "IterativeReference/Iteration", // SCCALCOPT_ITER_ITER + "IterativeReference/Steps", // SCCALCOPT_ITER_STEPS + "IterativeReference/MinimumChange", // SCCALCOPT_ITER_MINCHG + "Other/Date/DD", // SCCALCOPT_DATE_DAY + "Other/Date/MM", // SCCALCOPT_DATE_MONTH + "Other/Date/YY", // SCCALCOPT_DATE_YEAR + "Other/DecimalPlaces", // SCCALCOPT_DECIMALS + "Other/CaseSensitive", // SCCALCOPT_CASESENSITIVE + "Other/Precision", // SCCALCOPT_PRECISION + "Other/SearchCriteria", // SCCALCOPT_SEARCHCRIT "Other/FindLabel", // SCCALCOPT_FINDLABEL "Other/RegularExpressions", // SCCALCOPT_REGEX }; @@ -337,14 +337,14 @@ Sequence<OUString> ScDocCfg::GetLayoutPropertyNames() { static const char* aPropNames[] = { - "TabStop/NonMetric" // SCDOCLAYOUTOPT_TABSTOP + "TabStop/NonMetric" // SCDOCLAYOUTOPT_TABSTOP }; Sequence<OUString> aNames(SCDOCLAYOUTOPT_COUNT); OUString* pNames = aNames.getArray(); for(int i = 0; i < SCDOCLAYOUTOPT_COUNT; i++) pNames[i] = OUString::createFromAscii(aPropNames[i]); - // adjust for metric system + // adjust for metric system if (ScOptionsUtil::IsMetricSystem()) pNames[SCDOCLAYOUTOPT_TABSTOP] = OUString::createFromAscii( "TabStop/Metric" ); @@ -671,9 +671,9 @@ IMPL_LINK( ScDocCfg, LayoutCommitHdl, void *, EMPTYARG ) switch(nProp) { case SCDOCLAYOUTOPT_TABSTOP: - // TabDistance in ScDocOptions is in twips - // use only even numbers, so defaults don't get changed - // by modifying other settings in the same config item + // TabDistance in ScDocOptions is in twips + // use only even numbers, so defaults don't get changed + // by modifying other settings in the same config item pValues[nProp] <<= (sal_Int32) TwipsToEvenHMM( GetTabDistance() ); break; } diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index a547041b4ce2..e83ee373e131 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -115,7 +115,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, else bValid = false; } - + if (bValid) { // equality, non-equality operator in the 3rd column. @@ -143,7 +143,7 @@ bool lcl_createStarQuery(ScQueryParamBase* pParam, const ScDBRangeBase* pDBRef, rEntry.eOp = SC_EQUAL; } - + if (bValid) { // Finally, the right-hand-side value in the 4th column. @@ -260,7 +260,7 @@ bool lcl_fillQueryEntries( // ============================================================================ -ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) : +ScDBRangeBase::ScDBRangeBase(ScDocument* pDoc, RefType eType) : mpDoc(pDoc), meType(eType) { } diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index a8a5e2cda967..cd31717935a0 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.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 @@ // STATIC DATA ----------------------------------------------------------- -// Delimiters zusaetzlich zu EditEngine-Default: +// Delimiters zusaetzlich zu EditEngine-Default: const sal_Char __FAR_DATA ScEditUtil::pCalcDelimiters[] = "=()+-*/^&<>"; @@ -77,7 +77,7 @@ const sal_Char __FAR_DATA ScEditUtil::pCalcDelimiters[] = "=()+-*/^&<>"; String ScEditUtil::ModifyDelimiters( const String& rOld ) { String aRet = rOld; - aRet.EraseAllChars( '_' ); // underscore is used in function argument names + aRet.EraseAllChars( '_' ); // underscore is used in function argument names aRet.AppendAscii( RTL_CONSTASCII_STRINGPARAM( pCalcDelimiters ) ); aRet.Append(ScCompiler::GetNativeSymbol(ocSep)); // argument separator is localized. return aRet; @@ -141,18 +141,18 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT if ( ((const SvxHorJustifyItem&)pPattern->GetItem(ATTR_HOR_JUSTIFY)).GetValue() == SVX_HOR_JUSTIFY_LEFT ) nIndent = ((const SfxUInt16Item&)pPattern->GetItem(ATTR_INDENT)).GetValue(); - long nPixDifX = (long) ( ( pMargin->GetLeftMargin() + nIndent ) * nPPTX ); - aStartPos.X() += nPixDifX * nLayoutSign; - nCellX -= nPixDifX + (long) ( pMargin->GetRightMargin() * nPPTX ); // wegen Umbruch etc. + long nPixDifX = (long) ( ( pMargin->GetLeftMargin() + nIndent ) * nPPTX ); + aStartPos.X() += nPixDifX * nLayoutSign; + nCellX -= nPixDifX + (long) ( pMargin->GetRightMargin() * nPPTX ); // wegen Umbruch etc. - // vertikale Position auf die in der Tabelle anpassen + // vertikale Position auf die in der Tabelle anpassen long nPixDifY; long nTopMargin = (long) ( pMargin->GetTopMargin() * nPPTY ); SvxCellVerJustify eJust = (SvxCellVerJustify) ((const SvxVerJustifyItem&)pPattern-> GetItem(ATTR_VER_JUSTIFY)).GetValue(); - // asian vertical is always edited top-aligned + // asian vertical is always edited top-aligned BOOL bAsianVertical = ((const SfxBoolItem&)pPattern->GetItem( ATTR_STACKED )).GetValue() && ((const SfxBoolItem&)pPattern->GetItem( ATTR_VERTICAL_ASIAN )).GetValue(); @@ -167,7 +167,7 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT long nTextHeight = pDoc->GetNeededSize( nCol, nRow, nTab, pDev, nPPTX, nPPTY, aZoomX, aZoomY, FALSE ); if (!nTextHeight) - { // leere Zelle + { // leere Zelle Font aFont; // font color doesn't matter here pPattern->GetFont( aFont, SC_AUTOCOL_BLACK, pDev, &aZoomY ); @@ -179,23 +179,23 @@ Rectangle ScEditUtil::GetEditArea( const ScPatternAttr* pPattern, BOOL bForceToT pDev->SetMapMode(aMode); if ( nTextHeight > nCellY + nTopMargin || bForceToTop ) - nPixDifY = 0; // zu gross -> oben anfangen + nPixDifY = 0; // zu gross -> oben anfangen else { if ( eJust == SVX_VER_JUSTIFY_CENTER ) nPixDifY = nTopMargin + ( nCellY - nTextHeight ) / 2; else - nPixDifY = nCellY - nTextHeight + nTopMargin; // JUSTIFY_BOTTOM + nPixDifY = nCellY - nTextHeight + nTopMargin; // JUSTIFY_BOTTOM } } aStartPos.Y() += nPixDifY; - nCellY -= nPixDifY; + nCellY -= nPixDifY; if ( bLayoutRTL ) - aStartPos.X() -= nCellX - 2; // excluding grid on both sides + aStartPos.X() -= nCellX - 2; // excluding grid on both sides - // -1 -> Gitter nicht ueberschreiben + // -1 -> Gitter nicht ueberschreiben return Rectangle( aStartPos, Size(nCellX-1,nCellY-1) ); } @@ -209,7 +209,7 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) : { if ( pEngine->GetParagraphCount() > 1 ) { - bNeedsObject = TRUE; //! Zellatribute finden ? + bNeedsObject = TRUE; //! Zellatribute finden ? } else { @@ -228,10 +228,10 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) : if ( nId == EE_CHAR_ESCAPEMENT || nId == EE_CHAR_PAIRKERNING || nId == EE_CHAR_KERNING || nId == EE_CHAR_XMLATTRIBS ) { - // Escapement and kerning are kept in EditEngine because there are no - // corresponding cell format items. User defined attributes are kept in - // EditEngine because "user attributes applied to all the text" is different - // from "user attributes applied to the cell". + // Escapement and kerning are kept in EditEngine because there are no + // corresponding cell format items. User defined attributes are kept in + // EditEngine because "user attributes applied to all the text" is different + // from "user attributes applied to the cell". if ( *pItem != rEditDefaults.Get(nId) ) bNeedsObject = TRUE; @@ -244,13 +244,13 @@ ScEditAttrTester::ScEditAttrTester( ScEditEngineDefaulter* pEng ) : } } - // Feldbefehle enthalten? + // Feldbefehle enthalten? SfxItemState eFieldState = pEditAttrs->GetItemState( EE_FEATURE_FIELD, FALSE ); if ( eFieldState == SFX_ITEM_DONTCARE || eFieldState == SFX_ITEM_SET ) bNeedsObject = TRUE; - // not converted characters? + // not converted characters? SfxItemState eConvState = pEditAttrs->GetItemState( EE_FEATURE_NOTCONV, FALSE ); if ( eConvState == SFX_ITEM_DONTCARE || eConvState == SFX_ITEM_SET ) @@ -304,8 +304,8 @@ ScEditEngineDefaulter::ScEditEngineDefaulter( SfxItemPool* pEnginePoolP, ScEnginePoolHelper( pEnginePoolP, bDeleteEnginePoolP ), EditEngine( pEnginePoolP ) { - // All EditEngines use ScGlobal::GetEditDefaultLanguage as DefaultLanguage. - // DefaultLanguage for InputHandler's EditEngine is updated later. + // All EditEngines use ScGlobal::GetEditDefaultLanguage as DefaultLanguage. + // DefaultLanguage for InputHandler's EditEngine is updated later. SetDefaultLanguage( ScGlobal::GetEditDefaultLanguage() ); } @@ -483,7 +483,7 @@ void ScEditEngineDefaulter::RemoveParaAttribs() const SfxPoolItem* pParaItem; if ( rParaAttribs.GetItemState( nWhich, FALSE, &pParaItem ) == SFX_ITEM_SET ) { - // if defaults are set, use only items that are different from default + // if defaults are set, use only items that are different from default if ( !pDefaults || *pParaItem != pDefaults->Get(nWhich) ) { if (!pCharItems) @@ -498,8 +498,8 @@ void ScEditEngineDefaulter::RemoveParaAttribs() SvUShorts aPortions; GetPortions( nPar, aPortions ); - // loop through the portions of the paragraph, and set only those items - // that are not overridden by existing character attributes + // loop through the portions of the paragraph, and set only those items + // that are not overridden by existing character attributes USHORT nPCount = aPortions.Count(); USHORT nStart = 0; @@ -511,8 +511,8 @@ void ScEditEngineDefaulter::RemoveParaAttribs() SfxItemSet aNewCharAttrs = *pCharItems; for (nWhich = EE_CHAR_START; nWhich <= EE_CHAR_END; nWhich ++) { - // Clear those items that are different from existing character attributes. - // Where no character attributes are set, GetAttribs returns the paragraph attributes. + // Clear those items that are different from existing character attributes. + // Where no character attributes are set, GetAttribs returns the paragraph attributes. const SfxPoolItem* pItem; if ( aNewCharAttrs.GetItemState( nWhich, FALSE, &pItem ) == SFX_ITEM_SET && *pItem != aOldCharAttrs.Get(nWhich) ) @@ -531,8 +531,8 @@ void ScEditEngineDefaulter::RemoveParaAttribs() if ( rParaAttribs.Count() ) { - // clear all paragraph attributes (including defaults), - // so they are not contained in resulting EditTextObjects + // clear all paragraph attributes (including defaults), + // so they are not contained in resulting EditTextObjects SetParaAttribs( nPar, SfxItemSet( *rParaAttribs.GetPool(), rParaAttribs.GetRanges() ) ); } @@ -570,11 +570,11 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern ) } //------------------------------------------------------------------------ -// Feldbefehle fuer Kopf- und Fusszeilen +// Feldbefehle fuer Kopf- und Fusszeilen //------------------------------------------------------------------------ // -// Zahlen aus \sw\source\core\doc\numbers.cxx +// Zahlen aus \sw\source\core\doc\numbers.cxx // String lcl_GetCharStr( sal_Int32 nNo ) @@ -621,10 +621,10 @@ String lcl_GetNumStr( sal_Int32 nNo, SvxNumType eType ) aTmpStr.Erase(); break; -// CHAR_SPECIAL: -// ???? +// CHAR_SPECIAL: +// ???? -// case ARABIC: ist jetzt default +// case ARABIC: ist jetzt default default: aTmpStr = String::CreateFromInt32( nNo ); break; @@ -652,7 +652,7 @@ String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, Color*& /* rTxtColor */, Color*& /* rFldColor */ ) { String aRet; - const SvxFieldData* pFieldData = rField.GetField(); + const SvxFieldData* pFieldData = rField.GetField(); if ( pFieldData ) { TypeId aType = pFieldData->Type(); @@ -696,7 +696,7 @@ String __EXPORT ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, //------------------------------------------------------------------------ // -// Feld-Daten +// Feld-Daten // //------------------------------------------------------------------------ @@ -708,7 +708,7 @@ ScFieldEditEngine::ScFieldEditEngine( SfxItemPool* pEnginePoolP, { if ( pTextObjectPool ) SetEditTextObjectPool( pTextObjectPool ); - // EE_CNTRL_URLSFXEXECUTE nicht, weil die Edit-Engine den ViewFrame nicht kennt + // EE_CNTRL_URLSFXEXECUTE nicht, weil die Edit-Engine den ViewFrame nicht kennt // wir haben keine StyleSheets fuer Text SetControlWord( (GetControlWord() | EE_CNTRL_MARKFIELDS) & ~EE_CNTRL_RTFSTYLESHEETS ); } @@ -718,7 +718,7 @@ String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, Color*& rTxtColor, Color*& /* rFldColor */ ) { String aRet; - const SvxFieldData* pFieldData = rField.GetField(); + const SvxFieldData* pFieldData = rField.GetField(); if ( pFieldData ) { @@ -751,8 +751,8 @@ String __EXPORT ScFieldEditEngine::CalcFieldValue( const SvxFieldItem& rField, } } - if (!aRet.Len()) // leer ist baeh - aRet = ' '; // Space ist Default der Editengine + if (!aRet.Len()) // leer ist baeh + aRet = ' '; // Space ist Default der Editengine return aRet; } diff --git a/sc/source/core/tool/filtopt.cxx b/sc/source/core/tool/filtopt.cxx index b5c109b6602f..61e22c8736b7 100644 --- a/sc/source/core/tool/filtopt.cxx +++ b/sc/source/core/tool/filtopt.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,20 +47,20 @@ using namespace com::sun::star::uno; //------------------------------------------------------------------ -#define CFGPATH_FILTER "Office.Calc/Filter/Import" +#define CFGPATH_FILTER "Office.Calc/Filter/Import" -#define SCFILTOPT_COLSCALE 0 -#define SCFILTOPT_ROWSCALE 1 -#define SCFILTOPT_WK3 2 -#define SCFILTOPT_COUNT 3 +#define SCFILTOPT_COLSCALE 0 +#define SCFILTOPT_ROWSCALE 1 +#define SCFILTOPT_WK3 2 +#define SCFILTOPT_COUNT 3 Sequence<OUString> ScFilterOptions::GetPropertyNames() { static const char* aPropNames[] = { - "MS_Excel/ColScale", // SCFILTOPT_COLSCALE - "MS_Excel/RowScale", // SCFILTOPT_ROWSCALE - "Lotus123/WK3" // SCFILTOPT_WK3 + "MS_Excel/ColScale", // SCFILTOPT_COLSCALE + "MS_Excel/RowScale", // SCFILTOPT_ROWSCALE + "Lotus123/WK3" // SCFILTOPT_WK3 }; Sequence<OUString> aNames(SCFILTOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -78,7 +78,7 @@ ScFilterOptions::ScFilterOptions() : { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); -// EnableNotification(aNames); +// EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) diff --git a/sc/source/core/tool/formulaparserpool.cxx b/sc/source/core/tool/formulaparserpool.cxx index 1270bf185ff4..b62d3e007592 100644 --- a/sc/source/core/tool/formulaparserpool.cxx +++ b/sc/source/core/tool/formulaparserpool.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/core/tool/hints.cxx b/sc/source/core/tool/hints.cxx index 7597070fbe18..4f9c850eba88 100644 --- a/sc/source/core/tool/hints.cxx +++ b/sc/source/core/tool/hints.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/core/tool/inputopt.cxx b/sc/source/core/tool/inputopt.cxx index 449ec8355dc1..25c4b358ad30 100644 --- a/sc/source/core/tool/inputopt.cxx +++ b/sc/source/core/tool/inputopt.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,7 +52,7 @@ using namespace com::sun::star::uno; //------------------------------------------------------------------ -// Version, ab der das Item kompatibel ist +// Version, ab der das Item kompatibel ist #define SC_VERSION ((USHORT)351) @@ -82,15 +82,15 @@ ScInputOptions::~ScInputOptions() void ScInputOptions::SetDefaults() { - nMoveDir = DIR_BOTTOM; - bMoveSelection = TRUE; - bEnterEdit = FALSE; - bExtendFormat = FALSE; - bRangeFinder = TRUE; - bExpandRefs = FALSE; - bMarkHeader = TRUE; - bUseTabCol = FALSE; - bTextWysiwyg = FALSE; + nMoveDir = DIR_BOTTOM; + bMoveSelection = TRUE; + bEnterEdit = FALSE; + bExtendFormat = FALSE; + bRangeFinder = TRUE; + bExpandRefs = FALSE; + bMarkHeader = TRUE; + bUseTabCol = FALSE; + bTextWysiwyg = FALSE; bReplCellsWarn = TRUE; } @@ -98,15 +98,15 @@ void ScInputOptions::SetDefaults() const ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy ) { - nMoveDir = rCpy.nMoveDir; - bMoveSelection = rCpy.bMoveSelection; - bEnterEdit = rCpy.bEnterEdit; - bExtendFormat = rCpy.bExtendFormat; - bRangeFinder = rCpy.bRangeFinder; - bExpandRefs = rCpy.bExpandRefs; - bMarkHeader = rCpy.bMarkHeader; - bUseTabCol = rCpy.bUseTabCol; - bTextWysiwyg = rCpy.bTextWysiwyg; + nMoveDir = rCpy.nMoveDir; + bMoveSelection = rCpy.bMoveSelection; + bEnterEdit = rCpy.bEnterEdit; + bExtendFormat = rCpy.bExtendFormat; + bRangeFinder = rCpy.bRangeFinder; + bExpandRefs = rCpy.bExpandRefs; + bMarkHeader = rCpy.bMarkHeader; + bUseTabCol = rCpy.bUseTabCol; + bTextWysiwyg = rCpy.bTextWysiwyg; bReplCellsWarn = rCpy.bReplCellsWarn; return *this; @@ -114,20 +114,20 @@ const ScInputOptions& ScInputOptions::operator=( const ScInputOptions& rCpy ) //================================================================== -// Config Item containing input options +// Config Item containing input options //================================================================== -#define CFGPATH_INPUT "Office.Calc/Input" - -#define SCINPUTOPT_MOVEDIR 0 -#define SCINPUTOPT_MOVESEL 1 -#define SCINPUTOPT_EDTEREDIT 2 -#define SCINPUTOPT_EXTENDFMT 3 -#define SCINPUTOPT_RANGEFIND 4 -#define SCINPUTOPT_EXPANDREFS 5 -#define SCINPUTOPT_MARKHEADER 6 -#define SCINPUTOPT_USETABCOL 7 -#define SCINPUTOPT_TEXTWYSIWYG 8 +#define CFGPATH_INPUT "Office.Calc/Input" + +#define SCINPUTOPT_MOVEDIR 0 +#define SCINPUTOPT_MOVESEL 1 +#define SCINPUTOPT_EDTEREDIT 2 +#define SCINPUTOPT_EXTENDFMT 3 +#define SCINPUTOPT_RANGEFIND 4 +#define SCINPUTOPT_EXPANDREFS 5 +#define SCINPUTOPT_MARKHEADER 6 +#define SCINPUTOPT_USETABCOL 7 +#define SCINPUTOPT_TEXTWYSIWYG 8 #define SCINPUTOPT_REPLCELLSWARN 9 #define SCINPUTOPT_COUNT 10 @@ -135,14 +135,14 @@ Sequence<OUString> ScInputCfg::GetPropertyNames() { static const char* aPropNames[] = { - "MoveSelectionDirection", // SCINPUTOPT_MOVEDIR - "MoveSelection", // SCINPUTOPT_MOVESEL - "SwitchToEditMode", // SCINPUTOPT_EDTEREDIT - "ExpandFormatting", // SCINPUTOPT_EXTENDFMT - "ShowReference", // SCINPUTOPT_RANGEFIND - "ExpandReference", // SCINPUTOPT_EXPANDREFS - "HighlightSelection", // SCINPUTOPT_MARKHEADER - "UseTabCol", // SCINPUTOPT_USETABCOL + "MoveSelectionDirection", // SCINPUTOPT_MOVEDIR + "MoveSelection", // SCINPUTOPT_MOVESEL + "SwitchToEditMode", // SCINPUTOPT_EDTEREDIT + "ExpandFormatting", // SCINPUTOPT_EXTENDFMT + "ShowReference", // SCINPUTOPT_RANGEFIND + "ExpandReference", // SCINPUTOPT_EXPANDREFS + "HighlightSelection", // SCINPUTOPT_MARKHEADER + "UseTabCol", // SCINPUTOPT_USETABCOL "UsePrinterMetrics", // SCINPUTOPT_TEXTWYSIWYG "ReplaceCellsWarning" // SCINPUTOPT_REPLCELLSWARN }; diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 0b702777d8e8..08f048147769 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.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 @@ -755,7 +755,7 @@ double ScInterpreter::GetChiSqDistPDF(double fX, double fDF) else // fDF is small in most cases, we can iterate { if (fmod(fDF,2.0)<0.5) - { + { // even fValue = 0.5; fCount = 2.0; @@ -863,7 +863,7 @@ double ScInterpreter::GetBeta(double fAlpha, double fBeta) fResult *= fLanczos; return fResult; } - + // Same as GetBeta but with logarithm double ScInterpreter::GetLogBeta(double fAlpha, double fBeta) { @@ -939,7 +939,7 @@ double ScInterpreter::GetBetaDistPDF(double fX, double fA, double fB) if (fB < 1.0 && fX == 1.0) { SetError(errIllegalArgument); - return HUGE_VAL; + return HUGE_VAL; } else return 0.0; @@ -1125,7 +1125,7 @@ double ScInterpreter::GetBetaDist(double fXin, double fAlpha, double fBeta) return; } } - + void ScInterpreter::ScPhi() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPhi" ); @@ -1345,7 +1345,7 @@ void ScInterpreter::ScB() } } else - { + { if ( bIsValidX ) // not(0<p<1) { if ( p == 0.0 ) @@ -1353,7 +1353,7 @@ void ScInterpreter::ScB() else if ( p == 1.0 ) PushDouble( (xe == n) ? 1.0 : 0.0 ); else - PushIllegalArgument(); + PushIllegalArgument(); } else PushIllegalArgument(); @@ -1536,7 +1536,7 @@ void ScInterpreter::ScLogNormDist() //expanded, see #i100119# { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLogNormDist" ); BYTE nParamCount = GetByte(); - if ( !MustHaveParamCount( nParamCount, 1, 4)) + if ( !MustHaveParamCount( nParamCount, 1, 4)) return; bool bCumulative = nParamCount == 4 ? GetBool() : true; // cumulative double sigma = nParamCount >= 3 ? GetDouble() : 1.0; // standard deviation @@ -3014,7 +3014,7 @@ bool ScInterpreter::CalculateSkew(double& fSum,double& fCount,double& vSum,std:: short nParamCount = GetByte(); if ( !MustHaveParamCountMin( nParamCount, 1 ) ) return false; - + fSum = 0.0; fCount = 0.0; vSum = 0.0; @@ -3303,9 +3303,9 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall) } SCSIZE k = static_cast<SCSIZE>(f); vector<double> aSortArray; - /* TODO: using nth_element() is best for one single value, but LARGE/SMALL - * actually are defined to return an array of values if an array of - * positions was passed, in which case, depending on the number of values, + /* TODO: using nth_element() is best for one single value, but LARGE/SMALL + * actually are defined to return an array of values if an array of + * positions was passed, in which case, depending on the number of values, * we may or will need a real sorted array again, see #i32345. */ //GetSortArray(1, aSortArray); GetNumberSequenceArray(1, aSortArray); @@ -3324,7 +3324,7 @@ void ScInterpreter::CalculateSmallLarge(BOOL bSmall) void ScInterpreter::ScLarge() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScLarge" ); - CalculateSmallLarge(FALSE); + CalculateSmallLarge(FALSE); } void ScInterpreter::ScSmall() @@ -3948,7 +3948,7 @@ void ScInterpreter::ScProbability() void ScInterpreter::ScCorrel() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScCorrel" ); - // This is identical to ScPearson() + // This is identical to ScPearson() ScPearson(); } @@ -3958,12 +3958,12 @@ void ScInterpreter::ScCovar() CalculatePearsonCovar(FALSE,FALSE); } -void ScInterpreter::ScPearson() +void ScInterpreter::ScPearson() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScPearson" ); CalculatePearsonCovar(TRUE,FALSE); } -void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy) +void ScInterpreter::CalculatePearsonCovar(BOOL _bPearson,BOOL _bStexy) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::CalculatePearsonCovar" ); if ( !MustHaveParamCount( GetByte(), 2 ) ) @@ -4074,7 +4074,7 @@ void ScInterpreter::ScRSQ() void ScInterpreter::ScSTEXY() { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::ScSTEXY" ); - CalculatePearsonCovar(TRUE,TRUE); + CalculatePearsonCovar(TRUE,TRUE); } void ScInterpreter::CalculateSlopeIntercept(BOOL bSlope) { diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 049e7a235870..ff728173661b 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.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 @@ -66,35 +66,35 @@ const double fInvEpsilon = 1.0E-7; // ----------------------------------------------------------------------- struct MatrixAdd : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return ::rtl::math::approxAdd( lhs,rhs); } }; struct MatrixSub : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return ::rtl::math::approxSub( lhs,rhs); } }; struct MatrixMul : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return lhs * rhs; } }; struct MatrixDiv : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return ScInterpreter::div( lhs,rhs); } }; struct MatrixPow : public ::std::binary_function<double,double,double> { - inline double operator() (const double& lhs, const double& rhs) const + inline double operator() (const double& lhs, const double& rhs) const { return ::pow( lhs,rhs); } @@ -309,7 +309,7 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR) RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetNewMat" ); ScMatrix* pMat = new ScMatrix( nC, nR); pMat->SetErrorInterpreter( this); - // A temporary matrix is mutable and ScMatrix::CloneIfConst() returns the + // A temporary matrix is mutable and ScMatrix::CloneIfConst() returns the // very matrix. pMat->SetImmutable( false); SCSIZE nCols, nRows; @@ -2061,7 +2061,7 @@ void ScInterpreter::ScRGP() CalulateRGPRKP(FALSE); } bool ScInterpreter::CheckMatrix(BOOL _bLOG,BOOL _bTrendGrowth,BYTE& nCase,SCSIZE& nCX,SCSIZE& nCY,SCSIZE& nRX,SCSIZE& nRY,SCSIZE& M,SCSIZE& N,ScMatrixRef& pMatX,ScMatrixRef& pMatY) -{ +{ nCX = 0; nCY = 0; nRX = 0; @@ -2191,7 +2191,7 @@ void ScInterpreter::CalulateRGPRKP(BOOL _bRKP) SCSIZE M = 0, N = 0; if ( !CheckMatrix(_bRKP,FALSE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) ) return; - + ScMatrixRef pResMat; if (nCase == 1) { @@ -2350,7 +2350,7 @@ void ScInterpreter::CalulateRGPRKP(BOOL _bRKP) } if ( !Calculate4(_bRKP,pResMat,pQ,bConstant,N,M) ) return; - + if (bStats) Calculate(pResMat,pE,pQ,pV,pMatX,bConstant,N,M,nCase); } @@ -2406,7 +2406,7 @@ bool ScInterpreter::Calculate4(BOOL _bExp,ScMatrixRef& pResMat,ScMatrixRef& pQ,B { if ( !Calculate3(M,pQ) ) return false; - + } for (SCSIZE i = 0; i < M+1; i++) { @@ -2594,8 +2594,8 @@ void ScInterpreter::CalculateTrendGrowth(BOOL _bGrowth) SCSIZE M = 0, N = 0; if ( !CheckMatrix(_bGrowth,TRUE,nCase,nCX,nCY,nRX,nRY,M,N,pMatX,pMatY) ) return; - - + + SCSIZE nCXN, nRXN; SCSIZE nCountXN; if (!pMatNewX) diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index 109495ddb6d2..f9f8284b9cd3 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.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 @@ -70,7 +70,7 @@ double ScInterpreter::GetGammaContFraction( double fA, double fX ) fPk = fPkm1 * fDenom - fPkm2 * fNum; fQk = fQkm1 * fDenom - fQkm2 * fNum; if (fQk != 0.0) - { + { fR = fPk/fQk; bFinished = (fabs( (fApprox - fR)/fR ) <= fHalfMachEps); fApprox = fR; @@ -138,7 +138,7 @@ double ScInterpreter::GetLowRegIGamma( double fA, double fX ) double ScInterpreter::GetUpRegIGamma( double fA, double fX ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "sc", "er", "ScInterpreter::GetUpRegIGamma" ); - + double fLnFactor= fA*log(fX)-fX-GetLogGamma(fA); double fFactor = exp(fLnFactor); //Do I need more accuracy than exp(ln()) has?; if (fX>fA+1.0) // includes fX>1.0 @@ -164,7 +164,7 @@ double ScInterpreter::GetGammaDistPDF( double fX, double fAlpha, double fLambda const double fLogDblMax = log( ::std::numeric_limits<double>::max()); if (log(fXr) * (fAlpha-1.0) < fLogDblMax && fAlpha < fMaxGammaArgument) { - return pow( fXr, fAlpha-1.0) * exp(-fXr) / fLambda / GetGamma(fAlpha); + return pow( fXr, fAlpha-1.0) * exp(-fXr) / fLambda / GetGamma(fAlpha); } else { diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx index 75f45261e471..a9b2cfdb078d 100644 --- a/sc/source/core/tool/lookupcache.cxx +++ b/sc/source/core/tool/lookupcache.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/core/tool/navicfg.cxx b/sc/source/core/tool/navicfg.cxx index a0b9b629bc34..1e9faff2a725 100644 --- a/sc/source/core/tool/navicfg.cxx +++ b/sc/source/core/tool/navicfg.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,12 +37,12 @@ //------------------------------------------------------------------ -//! #define CFGPATH_NAVIPI "Office.Calc/Navigator" +//! #define CFGPATH_NAVIPI "Office.Calc/Navigator" //------------------------------------------------------------------ ScNavipiCfg::ScNavipiCfg() : -//! ConfigItem( OUString::createFromAscii( CFGPATH_NAVIPI ) ), +//! ConfigItem( OUString::createFromAscii( CFGPATH_NAVIPI ) ), nListMode(0), nDragMode(0), nRootType(0) @@ -56,7 +56,7 @@ void ScNavipiCfg::SetListMode(USHORT nNew) if ( nListMode != nNew ) { nListMode = nNew; -//! SetModified(); +//! SetModified(); } } @@ -65,7 +65,7 @@ void ScNavipiCfg::SetDragMode(USHORT nNew) if ( nDragMode != nNew ) { nDragMode = nNew; -//! SetModified(); +//! SetModified(); } } @@ -74,7 +74,7 @@ void ScNavipiCfg::SetRootType(USHORT nNew) if ( nRootType != nNew ) { nRootType = nNew; -//! SetModified(); +//! SetModified(); } } diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx index 28b13e249a07..74c86e75deab 100644 --- a/sc/source/core/tool/odffmap.cxx +++ b/sc/source/core/tool/odffmap.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/core/tool/optutil.cxx b/sc/source/core/tool/optutil.cxx index 03f4174c8613..5c461e352559 100644 --- a/sc/source/core/tool/optutil.cxx +++ b/sc/source/core/tool/optutil.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 @@ -42,9 +42,9 @@ // static BOOL ScOptionsUtil::IsMetricSystem() { - //! which language should be used here - system language or installed office language? + //! which language should be used here - system language or installed office language? -// MeasurementSystem eSys = Application::GetAppInternational().GetMeasurementSystem(); +// MeasurementSystem eSys = Application::GetAppInternational().GetMeasurementSystem(); MeasurementSystem eSys = ScGlobal::pLocaleData->getMeasurementSystemEnum(); return ( eSys == MEASURE_METRIC ); @@ -69,7 +69,7 @@ void ScLinkConfigItem::SetCommitLink( const Link& rLink ) void ScLinkConfigItem::Notify( const com::sun::star::uno::Sequence<rtl::OUString>& /* aPropertyNames */ ) { - //! not implemented yet... + //! not implemented yet... } void ScLinkConfigItem::Commit() diff --git a/sc/source/core/tool/parclass.cxx b/sc/source/core/tool/parclass.cxx index 9af15044f69a..f7b414d3149e 100644 --- a/sc/source/core/tool/parclass.cxx +++ b/sc/source/core/tool/parclass.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/core/tool/printopt.cxx b/sc/source/core/tool/printopt.cxx index f895bbc0a6ca..86e36bfb9a9f 100644 --- a/sc/source/core/tool/printopt.cxx +++ b/sc/source/core/tool/printopt.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 @@ -91,13 +91,13 @@ int ScPrintOptions::operator!=( const ScPrintOptions& rOpt ) const ScTpPrintItem::ScTpPrintItem( USHORT nWhichP, const ScPrintOptions& rOpt ) : SfxPoolItem ( nWhichP ), - theOptions ( rOpt ) + theOptions ( rOpt ) { } ScTpPrintItem::ScTpPrintItem( const ScTpPrintItem& rItem ) : - SfxPoolItem ( rItem ), - theOptions ( rItem.theOptions ) + SfxPoolItem ( rItem ), + theOptions ( rItem.theOptions ) { } @@ -125,18 +125,18 @@ SfxPoolItem* ScTpPrintItem::Clone( SfxItemPool * ) const // ----------------------------------------------------------------------- -#define CFGPATH_PRINT "Office.Calc/Print" +#define CFGPATH_PRINT "Office.Calc/Print" -#define SCPRINTOPT_EMPTYPAGES 0 -#define SCPRINTOPT_ALLSHEETS 1 -#define SCPRINTOPT_COUNT 2 +#define SCPRINTOPT_EMPTYPAGES 0 +#define SCPRINTOPT_ALLSHEETS 1 +#define SCPRINTOPT_COUNT 2 Sequence<OUString> ScPrintCfg::GetPropertyNames() { static const char* aPropNames[] = { - "Page/EmptyPages", // SCPRINTOPT_EMPTYPAGES - "Other/AllSheets" // SCPRINTOPT_ALLSHEETS + "Page/EmptyPages", // SCPRINTOPT_EMPTYPAGES + "Other/AllSheets" // SCPRINTOPT_ALLSHEETS }; Sequence<OUString> aNames(SCPRINTOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -151,7 +151,7 @@ ScPrintCfg::ScPrintCfg() : { Sequence<OUString> aNames = GetPropertyNames(); Sequence<Any> aValues = GetProperties(aNames); -// EnableNotification(aNames); +// EnableNotification(aNames); const Any* pValues = aValues.getConstArray(); DBG_ASSERT(aValues.getLength() == aNames.getLength(), "GetProperties failed"); if(aValues.getLength() == aNames.getLength()) diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx index 35200d6b4ff9..9301225f4c3e 100644 --- a/sc/source/core/tool/prnsave.cxx +++ b/sc/source/core/tool/prnsave.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,7 +44,7 @@ //------------------------------------------------------------------ // -// Daten pro Tabelle +// Daten pro Tabelle // ScPrintSaverTab::ScPrintSaverTab() : @@ -89,7 +89,7 @@ BOOL ScPrintSaverTab::operator==( const ScPrintSaverTab& rCmp ) const } // -// Daten fuer das ganze Dokument +// Daten fuer das ganze Dokument // ScPrintRangeSaver::ScPrintRangeSaver( SCTAB nCount ) : diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index 0a26b968f112..58b8fd3c2b7a 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -50,16 +50,16 @@ static ScProgress theDummyInterpretProgress; -SfxProgress* ScProgress::pGlobalProgress = NULL; -ULONG ScProgress::nGlobalRange = 0; -ULONG ScProgress::nGlobalPercent = 0; -BOOL ScProgress::bGlobalNoUserBreak = TRUE; -ScProgress* ScProgress::pInterpretProgress = &theDummyInterpretProgress; -ScProgress* ScProgress::pOldInterpretProgress = NULL; -ULONG ScProgress::nInterpretProgress = 0; -BOOL ScProgress::bAllowInterpretProgress = TRUE; -ScDocument* ScProgress::pInterpretDoc; -BOOL ScProgress::bIdleWasDisabled = FALSE; +SfxProgress* ScProgress::pGlobalProgress = NULL; +ULONG ScProgress::nGlobalRange = 0; +ULONG ScProgress::nGlobalPercent = 0; +BOOL ScProgress::bGlobalNoUserBreak = TRUE; +ScProgress* ScProgress::pInterpretProgress = &theDummyInterpretProgress; +ScProgress* ScProgress::pOldInterpretProgress = NULL; +ULONG ScProgress::nInterpretProgress = 0; +BOOL ScProgress::bAllowInterpretProgress = TRUE; +ScDocument* ScProgress::pInterpretDoc; +BOOL ScProgress::bIdleWasDisabled = FALSE; BOOL lcl_IsHiddenDocument( SfxObjectShell* pObjSh ) @@ -98,17 +98,17 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText, } else if ( SFX_APP()->IsDowning() ) { - // kommt vor z.B. beim Speichern des Clipboard-Inhalts als OLE beim Beenden - // Dann wuerde ein SfxProgress wild im Speicher rummuellen - //! Soll das so sein ??? + // kommt vor z.B. beim Speichern des Clipboard-Inhalts als OLE beim Beenden + // Dann wuerde ein SfxProgress wild im Speicher rummuellen + //! Soll das so sein ??? pProgress = NULL; } else if ( pObjSh && ( pObjSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED || pObjSh->GetProgress() ) ) { - // #62808# no own progress for embedded objects, - // #73633# no second progress if the document already has one + // #62808# no own progress for embedded objects, + // #73633# no second progress if the document already has one pProgress = NULL; } @@ -125,7 +125,7 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const String& rText, ScProgress::ScProgress() : pProgress( NULL ) -{ // DummyInterpret +{ // DummyInterpret } diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index ca87b1503b0b..429bdc908bc3 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -170,7 +170,7 @@ ScQueryParamTable::~ScQueryParamTable() // ============================================================================ -ScQueryParam::ScQueryParam() : +ScQueryParam::ScQueryParam() : ScQueryParamBase(), ScQueryParamTable(), bDestPers(true), @@ -202,7 +202,7 @@ ScQueryParam::ScQueryParam( const ScDBQueryParamInternal& r ) : bUseDynamicRange(false) { } - + //------------------------------------------------------------------------ diff --git a/sc/source/core/tool/rangelst.cxx b/sc/source/core/tool/rangelst.cxx index ed93713eb65f..b7d21336d451 100644 --- a/sc/source/core/tool/rangelst.cxx +++ b/sc/source/core/tool/rangelst.cxx @@ -32,10 +32,10 @@ //------------------------------------------------------------------------ -#define SC_RANGELST_CXX //fuer ICC +#define SC_RANGELST_CXX //fuer ICC #include <tools/debug.hxx> -#include <stdlib.h> // qsort +#include <stdlib.h> // qsort #include <unotools/collatorwrapper.hxx> #include "rangelst.hxx" @@ -68,15 +68,15 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask, if (!cDelimiter) cDelimiter = ScCompiler::GetNativeSymbol(ocSep).GetChar(0); - nMask |= SCA_VALID; // falls das jemand vergessen sollte - USHORT nResult = (USHORT)~0; // alle Bits setzen - ScRange aRange; + nMask |= SCA_VALID; // falls das jemand vergessen sollte + USHORT nResult = (USHORT)~0; // alle Bits setzen + ScRange aRange; String aOne; SCTAB nTab = 0; if ( pDoc ) { - //! erste markierte Tabelle gibts nicht mehr am Dokument - //! -> uebergeben? oder spaeter an den Ranges setzen + //! erste markierte Tabelle gibts nicht mehr am Dokument + //! -> uebergeben? oder spaeter an den Ranges setzen } else nTab = 0; @@ -84,7 +84,7 @@ USHORT ScRangeList::Parse( const String& rStr, ScDocument* pDoc, USHORT nMask, for ( USHORT i=0; i<nTCount; i++ ) { aOne = rStr.GetToken( i, cDelimiter ); - aRange.aStart.SetTab( nTab ); // Default Tab wenn nicht angegeben + aRange.aStart.SetTab( nTab ); // Default Tab wenn nicht angegeben USHORT nRes = aRange.ParseAny( aOne, pDoc, eConv ); USHORT nEndRangeBits = SCA_VALID_COL2 | SCA_VALID_ROW2 | SCA_VALID_TAB2; @@ -98,9 +98,9 @@ SCA_VALID_TAB2; if ( (nRes & nMask) == nMask ) Append( aRange ); - nResult &= nRes; // alle gemeinsamen Bits bleiben erhalten + nResult &= nRes; // alle gemeinsamen Bits bleiben erhalten } - return nResult; // SCA_VALID gesetzt wenn alle ok + return nResult; // SCA_VALID gesetzt wenn alle ok } else return 0; @@ -141,44 +141,44 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList ) SCCOL nCol2 = r.aEnd.Col(); SCROW nRow2 = r.aEnd.Row(); SCTAB nTab2 = r.aEnd.Tab(); - ScRangePtr pOver = (ScRangePtr) &r; // fies aber wahr wenn bInList + ScRangePtr pOver = (ScRangePtr) &r; // fies aber wahr wenn bInList ULONG nOldPos = 0; if ( bIsInList ) - { // merken um ggbf. zu loeschen bzw. wiederherzustellen + { // merken um ggbf. zu loeschen bzw. wiederherzustellen nOldPos = GetPos( pOver ); } BOOL bJoinedInput = FALSE; for ( ScRangePtr p = First(); p && pOver; p = Next() ) { if ( p == pOver ) - continue; // derselbe, weiter mit dem naechsten + continue; // derselbe, weiter mit dem naechsten BOOL bJoined = FALSE; if ( p->In( r ) ) - { // Range r in Range p enthalten oder identisch + { // Range r in Range p enthalten oder identisch if ( bIsInList ) - bJoined = TRUE; // weg mit Range r + bJoined = TRUE; // weg mit Range r else - { // das war's dann - bJoinedInput = TRUE; // nicht anhaengen - break; // for + { // das war's dann + bJoinedInput = TRUE; // nicht anhaengen + break; // for } } else if ( r.In( *p ) ) - { // Range p in Range r enthalten, r zum neuen Range machen + { // Range p in Range r enthalten, r zum neuen Range machen *p = r; bJoined = TRUE; } if ( !bJoined && p->aStart.Tab() == nTab1 && p->aEnd.Tab() == nTab2 ) - { // 2D + { // 2D if ( p->aStart.Col() == nCol1 && p->aEnd.Col() == nCol2 ) { if ( p->aStart.Row() == nRow2+1 ) - { // oben + { // oben p->aStart.SetRow( nRow1 ); bJoined = TRUE; } else if ( p->aEnd.Row() == nRow1-1 ) - { // unten + { // unten p->aEnd.SetRow( nRow2 ); bJoined = TRUE; } @@ -186,12 +186,12 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList ) else if ( p->aStart.Row() == nRow1 && p->aEnd.Row() == nRow2 ) { if ( p->aStart.Col() == nCol2+1 ) - { // links + { // links p->aStart.SetCol( nCol1 ); bJoined = TRUE; } else if ( p->aEnd.Col() == nCol1-1 ) - { // rechts + { // rechts p->aEnd.SetCol( nCol2 ); bJoined = TRUE; } @@ -200,15 +200,15 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList ) if ( bJoined ) { if ( bIsInList ) - { // innerhalb der Liste Range loeschen + { // innerhalb der Liste Range loeschen Remove( nOldPos ); delete pOver; pOver = NULL; if ( nOldPos ) - nOldPos--; // Seek richtig aufsetzen + nOldPos--; // Seek richtig aufsetzen } bJoinedInput = TRUE; - Join( *p, TRUE ); // rekursiv! + Join( *p, TRUE ); // rekursiv! } } if ( bIsInList ) @@ -221,14 +221,14 @@ void ScRangeList::Join( const ScRange& r, BOOL bIsInList ) BOOL ScRangeList::operator==( const ScRangeList& r ) const { if ( this == &r ) - return TRUE; // identische Referenz + return TRUE; // identische Referenz if ( Count() != r.Count() ) return FALSE; ULONG nCnt = Count(); for ( ULONG nIdx = 0; nIdx < nCnt; nIdx++ ) { if ( *GetObject( nIdx ) != *r.GetObject( nIdx ) ) - return FALSE; // auch andere Reihenfolge ist ungleich + return FALSE; // auch andere Reihenfolge ist ungleich } return TRUE; } @@ -373,34 +373,34 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList ) SCCOL nCol2 = r1.aEnd.Col(); SCROW nRow2 = r1.aEnd.Row(); SCTAB nTab2 = r1.aEnd.Tab(); - ScRangePair* pOver = (ScRangePair*) &r; // fies aber wahr wenn bInList + ScRangePair* pOver = (ScRangePair*) &r; // fies aber wahr wenn bInList ULONG nOldPos = 0; if ( bIsInList ) - { // merken um ggbf. zu loeschen bzw. wiederherzustellen + { // merken um ggbf. zu loeschen bzw. wiederherzustellen nOldPos = GetPos( pOver ); } BOOL bJoinedInput = FALSE; for ( ScRangePair* p = First(); p && pOver; p = Next() ) { if ( p == pOver ) - continue; // derselbe, weiter mit dem naechsten + continue; // derselbe, weiter mit dem naechsten BOOL bJoined = FALSE; ScRange& rp1 = p->GetRange(0); ScRange& rp2 = p->GetRange(1); if ( rp2 == r2 ) - { // nur wenn Range2 gleich ist + { // nur wenn Range2 gleich ist if ( rp1.In( r1 ) ) - { // RangePair r in RangePair p enthalten oder identisch + { // RangePair r in RangePair p enthalten oder identisch if ( bIsInList ) - bJoined = TRUE; // weg mit RangePair r + bJoined = TRUE; // weg mit RangePair r else - { // das war's dann - bJoinedInput = TRUE; // nicht anhaengen - break; // for + { // das war's dann + bJoinedInput = TRUE; // nicht anhaengen + break; // for } } else if ( r1.In( rp1 ) ) - { // RangePair p in RangePair r enthalten, r zum neuen RangePair machen + { // RangePair p in RangePair r enthalten, r zum neuen RangePair machen *p = r; bJoined = TRUE; } @@ -408,21 +408,21 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList ) if ( !bJoined && rp1.aStart.Tab() == nTab1 && rp1.aEnd.Tab() == nTab2 && rp2.aStart.Tab() == r2.aStart.Tab() && rp2.aEnd.Tab() == r2.aEnd.Tab() ) - { // 2D, Range2 muss genauso nebeneinander liegen wie Range1 + { // 2D, Range2 muss genauso nebeneinander liegen wie Range1 if ( rp1.aStart.Col() == nCol1 && rp1.aEnd.Col() == nCol2 && rp2.aStart.Col() == r2.aStart.Col() && rp2.aEnd.Col() == r2.aEnd.Col() ) { if ( rp1.aStart.Row() == nRow2+1 && rp2.aStart.Row() == r2.aEnd.Row()+1 ) - { // oben + { // oben rp1.aStart.SetRow( nRow1 ); rp2.aStart.SetRow( r2.aStart.Row() ); bJoined = TRUE; } else if ( rp1.aEnd.Row() == nRow1-1 && rp2.aEnd.Row() == r2.aStart.Row()-1 ) - { // unten + { // unten rp1.aEnd.SetRow( nRow2 ); rp2.aEnd.SetRow( r2.aEnd.Row() ); bJoined = TRUE; @@ -434,14 +434,14 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList ) { if ( rp1.aStart.Col() == nCol2+1 && rp2.aStart.Col() == r2.aEnd.Col()+1 ) - { // links + { // links rp1.aStart.SetCol( nCol1 ); rp2.aStart.SetCol( r2.aStart.Col() ); bJoined = TRUE; } else if ( rp1.aEnd.Col() == nCol1-1 && rp2.aEnd.Col() == r2.aEnd.Col()-1 ) - { // rechts + { // rechts rp1.aEnd.SetCol( nCol2 ); rp2.aEnd.SetCol( r2.aEnd.Col() ); bJoined = TRUE; @@ -451,15 +451,15 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList ) if ( bJoined ) { if ( bIsInList ) - { // innerhalb der Liste RangePair loeschen + { // innerhalb der Liste RangePair loeschen Remove( nOldPos ); delete pOver; pOver = NULL; if ( nOldPos ) - nOldPos--; // Seek richtig aufsetzen + nOldPos--; // Seek richtig aufsetzen } bJoinedInput = TRUE; - Join( *p, TRUE ); // rekursiv! + Join( *p, TRUE ); // rekursiv! } } if ( bIsInList ) @@ -472,14 +472,14 @@ void ScRangePairList::Join( const ScRangePair& r, BOOL bIsInList ) BOOL ScRangePairList::operator==( const ScRangePairList& r ) const { if ( this == &r ) - return TRUE; // identische Referenz + return TRUE; // identische Referenz if ( Count() != r.Count() ) return FALSE; ULONG nCnt = Count(); for ( ULONG nIdx = 0; nIdx < nCnt; nIdx++ ) { if ( *GetObject( nIdx ) != *r.GetObject( nIdx ) ) - return FALSE; // auch andere Reihenfolge ist ungleich + return FALSE; // auch andere Reihenfolge ist ungleich } return TRUE; } @@ -590,8 +590,8 @@ ScRangePairList* ScRangePairList::Clone() const struct ScRangePairNameSort { - ScRangePair* pPair; - ScDocument* pDoc; + ScRangePair* pPair; + ScDocument* pDoc; }; diff --git a/sc/source/core/tool/rangenam.cxx b/sc/source/core/tool/rangenam.cxx index f115f4a4bf62..008d5f41c4ad 100644 --- a/sc/source/core/tool/rangenam.cxx +++ b/sc/source/core/tool/rangenam.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 @@ -66,14 +66,14 @@ ScRangeData::ScRangeData( ScDocument* pDok, const ScAddress& rAddress, RangeType nType, const FormulaGrammar::Grammar eGrammar ) : - aName ( rName ), + aName ( rName ), aUpperName ( ScGlobal::pCharClass->upper( rName ) ), - pCode ( NULL ), - aPos ( rAddress ), - eType ( nType ), - pDoc ( pDok ), - nIndex ( 0 ), - bModified ( FALSE ), + pCode ( NULL ), + aPos ( rAddress ), + eType ( nType ), + pDoc ( pDok ), + nIndex ( 0 ), + bModified ( FALSE ), mnMaxRow (-1), mnMaxCol (-1) { @@ -114,14 +114,14 @@ ScRangeData::ScRangeData( ScDocument* pDok, const ScTokenArray& rArr, const ScAddress& rAddress, RangeType nType ) : - aName ( rName ), + aName ( rName ), aUpperName ( ScGlobal::pCharClass->upper( rName ) ), - pCode ( new ScTokenArray( rArr ) ), - aPos ( rAddress ), - eType ( nType ), - pDoc ( pDok ), - nIndex ( 0 ), - bModified ( FALSE ), + pCode ( new ScTokenArray( rArr ) ), + aPos ( rAddress ), + eType ( nType ), + pDoc ( pDok ), + nIndex ( 0 ), + bModified ( FALSE ), mnMaxRow (-1), mnMaxCol (-1) { @@ -138,27 +138,27 @@ ScRangeData::ScRangeData( ScDocument* pDok, } // Die Importfilter haben diesen Test nicht, // da die benannten Bereiche z.T. noch unvollstaendig sind. -// if( !pCode->GetCodeLen() ) -// { -// // ggf. den Fehlercode wg. unvollstaendiger Formel setzen! -// ScCompiler aComp( pDok, aPos, *pCode ); -// aComp.CompileTokenArray(); -// pCode->DelRPN(); -// } +// if( !pCode->GetCodeLen() ) +// { +// // ggf. den Fehlercode wg. unvollstaendiger Formel setzen! +// ScCompiler aComp( pDok, aPos, *pCode ); +// aComp.CompileTokenArray(); +// pCode->DelRPN(); +// } } } ScRangeData::ScRangeData( ScDocument* pDok, const String& rName, const ScAddress& rTarget ) : - aName ( rName ), + aName ( rName ), aUpperName ( ScGlobal::pCharClass->upper( rName ) ), - pCode ( new ScTokenArray() ), - aPos ( rTarget ), - eType ( RT_NAME ), - pDoc ( pDok ), - nIndex ( 0 ), - bModified ( FALSE ), + pCode ( new ScTokenArray() ), + aPos ( rTarget ), + eType ( RT_NAME ), + pDoc ( pDok ), + nIndex ( 0 ), + bModified ( FALSE ), mnMaxRow (-1), mnMaxCol (-1) { @@ -175,14 +175,14 @@ ScRangeData::ScRangeData( ScDocument* pDok, ScRangeData::ScRangeData(const ScRangeData& rScRangeData) : ScDataObject(), - aName (rScRangeData.aName), + aName (rScRangeData.aName), aUpperName (rScRangeData.aUpperName), - pCode (rScRangeData.pCode ? rScRangeData.pCode->Clone() : new ScTokenArray()), // echte Kopie erzeugen (nicht copy-ctor) - aPos (rScRangeData.aPos), - eType (rScRangeData.eType), - pDoc (rScRangeData.pDoc), - nIndex (rScRangeData.nIndex), - bModified (rScRangeData.bModified), + pCode (rScRangeData.pCode ? rScRangeData.pCode->Clone() : new ScTokenArray()), // echte Kopie erzeugen (nicht copy-ctor) + aPos (rScRangeData.aPos), + eType (rScRangeData.eType), + pDoc (rScRangeData.pDoc), + nIndex (rScRangeData.nIndex), + bModified (rScRangeData.bModified), mnMaxRow (rScRangeData.mnMaxRow), mnMaxCol (rScRangeData.mnMaxCol) {} @@ -199,8 +199,8 @@ ScDataObject* ScRangeData::Clone() const void ScRangeData::GuessPosition() { - // setzt eine Position, mit der alle relative Referenzen bei CalcAbsIfRel - // ohne Fehler verabsolutiert werden koennen + // setzt eine Position, mit der alle relative Referenzen bei CalcAbsIfRel + // ohne Fehler verabsolutiert werden koennen DBG_ASSERT(aPos == ScAddress(), "die Position geht jetzt verloren"); @@ -234,9 +234,9 @@ void ScRangeData::GuessPosition() aPos = ScAddress( (SCCOL)(-nMinCol), (SCROW)(-nMinRow), (SCTAB)(-nMinTab) ); - //! Test -// DBG_ERROR(String("Pos ")+String((SCCOL)(-nMinCol))+String("/")+ -// String((SCROW)(-nMinRow))+String("/")+String((SCTAB)(-nMinTab))); + //! Test +// DBG_ERROR(String("Pos ")+String((SCCOL)(-nMinCol))+String("/")+ +// String((SCROW)(-nMinRow))+String("/")+String((SCTAB)(-nMinTab))); } void ScRangeData::GetSymbol( String& rSymbol, const FormulaGrammar::Grammar eGrammar ) const @@ -246,7 +246,7 @@ void ScRangeData::GetSymbol( String& rSymbol, const FormulaGrammar::Grammar eGra aComp.CreateStringFromTokenArray( rSymbol ); } -void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos, +void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& rPos, const FormulaGrammar::Grammar eGrammar ) { ::std::auto_ptr<ScTokenArray> pTemp( pCode->Clone() ); @@ -256,7 +256,7 @@ void ScRangeData::UpdateSymbol( rtl::OUStringBuffer& rBuffer, const ScAddress& r aComp.CreateStringFromTokenArray( rBuffer ); } -void ScRangeData::UpdateReference( UpdateRefMode eUpdateRefMode, +void ScRangeData::UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& r, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) { @@ -337,15 +337,15 @@ void ScRangeData::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) } } - bModified = bChanged; // muss direkt hinterher ausgewertet werden + bModified = bChanged; // muss direkt hinterher ausgewertet werden } -BOOL ScRangeData::operator== (const ScRangeData& rData) const // fuer Undo +BOOL ScRangeData::operator== (const ScRangeData& rData) const // fuer Undo { - if ( nIndex != rData.nIndex || - aName != rData.aName || - aPos != rData.aPos || - eType != rData.eType ) return FALSE; + if ( nIndex != rData.nIndex || + aName != rData.aName || + aPos != rData.aPos || + eType != rData.eType ) return FALSE; USHORT nLen = pCode->GetLen(); if ( nLen != rData.pCode->GetLen() ) return FALSE; @@ -411,13 +411,13 @@ void ScRangeData::UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable) aComp.SetGrammar(pDoc->GetGrammar()); switch (nFlag) { - case 1: // einfache InsertTab (doc.cxx) - pRangeData = aComp.UpdateInsertTab(nOldTable, TRUE ); // und CopyTab (doc2.cxx) + case 1: // einfache InsertTab (doc.cxx) + pRangeData = aComp.UpdateInsertTab(nOldTable, TRUE ); // und CopyTab (doc2.cxx) break; - case 2: // einfaches delete (doc.cxx) + case 2: // einfaches delete (doc.cxx) pRangeData = aComp.UpdateDeleteTab(nOldTable, FALSE, TRUE, bChanged); break; - case 3: // move (doc2.cxx) + case 3: // move (doc2.cxx) { pRangeData = aComp.UpdateMoveTab(nOldTable, nNewTable, TRUE ); } @@ -439,7 +439,7 @@ void ScRangeData::UpdateTabRef(SCTAB nOldTable, USHORT nFlag, SCTAB nNewTable) } -void ScRangeData::MakeValidName( String& rName ) // static +void ScRangeData::MakeValidName( String& rName ) // static { //ScCompiler::InitSymbolsNative(); @@ -451,7 +451,7 @@ void ScRangeData::MakeValidName( String& rName ) // static if ( nPos>0 ) rName.Erase(0,nPos); - // if the first character is an invalid start character, precede with '_' + // if the first character is an invalid start character, precede with '_' if ( rName.Len() && !ScCompiler::IsCharFlagAllConventions( rName, 0, SC_COMPILER_C_CHAR_NAME ) ) rName.Insert('_',0); @@ -463,14 +463,14 @@ void ScRangeData::MakeValidName( String& rName ) // static rName.SetChar( nPos, '_' ); } - // Ensure that the proposed name is not a reference under any convention, + // Ensure that the proposed name is not a reference under any convention, // same as in IsNameValid() ScAddress aAddr; ScRange aRange; for (int nConv = FormulaGrammar::CONV_UNSPECIFIED; ++nConv < FormulaGrammar::CONV_LAST; ) { ScAddress::Details details( static_cast<FormulaGrammar::AddressConvention>( nConv ) ); - // Don't check Parse on VALID, any partial only VALID may result in + // Don't check Parse on VALID, any partial only VALID may result in // #REF! during compile later! while (aRange.Parse( rName, NULL, details) || aAddr.Parse( rName, NULL, details)) { @@ -484,7 +484,7 @@ void ScRangeData::MakeValidName( String& rName ) // static BOOL ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc ) { - /* XXX If changed, sc/source/filter/ftools/ftools.cxx + /* XXX If changed, sc/source/filter/ftools/ftools.cxx * ScfTools::ConvertToScDefinedName needs to be changed too. */ xub_StrLen nPos = 0; xub_StrLen nLen = rName.Len(); @@ -500,7 +500,7 @@ BOOL ScRangeData::IsNameValid( const String& rName, ScDocument* pDoc ) for (int nConv = FormulaGrammar::CONV_UNSPECIFIED; ++nConv < FormulaGrammar::CONV_LAST; ) { ScAddress::Details details( static_cast<FormulaGrammar::AddressConvention>( nConv ) ); - // Don't check Parse on VALID, any partial only VALID may result in + // Don't check Parse on VALID, any partial only VALID may result in // #REF! during compile later! if (aRange.Parse( rName, pDoc, details) || aAddr.Parse( rName, pDoc, details)) return FALSE; @@ -596,13 +596,13 @@ void ScRangeData::ReplaceRangeNamesInUse( const IndexMap& rMap ) void ScRangeData::ValidateTabRefs() { - // try to make sure all relative references and the reference position - // are within existing tables, so they can be represented as text - // (if the range of used tables is more than the existing tables, - // the result may still contain invalid tables, because the relative - // references aren't changed so formulas stay the same) + // try to make sure all relative references and the reference position + // are within existing tables, so they can be represented as text + // (if the range of used tables is more than the existing tables, + // the result may still contain invalid tables, because the relative + // references aren't changed so formulas stay the same) - // find range of used tables + // find range of used tables SCTAB nMinTab = aPos.Tab(); SCTAB nMaxTab = nMinTab; @@ -634,8 +634,8 @@ void ScRangeData::ValidateTabRefs() SCTAB nTabCount = pDoc->GetTableCount(); if ( nMaxTab >= nTabCount && nMinTab > 0 ) { - // move position and relative tab refs - // The formulas that use the name are not changed by this + // move position and relative tab refs + // The formulas that use the name are not changed by this SCTAB nMove = nMinTab; aPos.SetTab( aPos.Tab() - nMove ); @@ -717,7 +717,7 @@ BOOL ScRangeName::SearchName( const String& rName, USHORT& rIndex ) const return FALSE; } -void ScRangeName::UpdateReference( UpdateRefMode eUpdateRefMode, +void ScRangeName::UpdateReference( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) { @@ -745,7 +745,7 @@ BOOL ScRangeName::IsEqual(ScDataObject* pKey1, ScDataObject* pKey2) const BOOL ScRangeName::Insert(ScDataObject* pScDataObject) { - if (!((ScRangeData*)pScDataObject)->GetIndex()) // schon gesetzt? + if (!((ScRangeData*)pScDataObject)->GetIndex()) // schon gesetzt? { ((ScRangeData*)pScDataObject)->SetIndex( GetEntryIndex() ); } diff --git a/sc/source/core/tool/rangeseq.cxx b/sc/source/core/tool/rangeseq.cxx index d7b86780e562..95ccdc700ba4 100644 --- a/sc/source/core/tool/rangeseq.cxx +++ b/sc/source/core/tool/rangeseq.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,7 +54,7 @@ long lcl_DoubleToLong( double fVal ) if ( fInt >= LONG_MIN && fInt <= LONG_MAX ) return (long)fInt; else - return 0; // out of range + return 0; // out of range } BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, const ScRange& rRange ) @@ -79,7 +79,7 @@ BOOL ScRangeToSequence::FillLongArray( uno::Any& rAny, ScDocument* pDoc, const S } rAny <<= aRowSeq; - return TRUE; //! check for errors + return TRUE; //! check for errors } @@ -135,7 +135,7 @@ BOOL ScRangeToSequence::FillDoubleArray( uno::Any& rAny, ScDocument* pDoc, const } rAny <<= aRowSeq; - return TRUE; //! check for errors + return TRUE; //! check for errors } @@ -194,7 +194,7 @@ BOOL ScRangeToSequence::FillStringArray( uno::Any& rAny, ScDocument* pDoc, const } rAny <<= aRowSeq; - return TRUE; //! check for errors + return TRUE; //! check for errors } @@ -242,13 +242,13 @@ BOOL ScRangeToSequence::FillStringArray( uno::Any& rAny, const ScMatrix* pMatrix double lcl_GetValueFromCell( ScBaseCell& rCell ) { - //! ScBaseCell member function? + //! ScBaseCell member function? CellType eType = rCell.GetCellType(); if ( eType == CELLTYPE_VALUE ) return ((ScValueCell&)rCell).GetValue(); else if ( eType == CELLTYPE_FORMULA ) - return ((ScFormulaCell&)rCell).GetValue(); // called only if result is value + return ((ScFormulaCell&)rCell).GetValue(); // called only if result is value DBG_ERROR( "GetValueFromCell: wrong type" ); return 0; @@ -292,7 +292,7 @@ BOOL ScRangeToSequence::FillMixedArray( uno::Any& rAny, ScDocument* pDoc, const rElement <<= rtl::OUString( pCell->GetStringData() ); } else - rElement <<= rtl::OUString(); // empty: empty string + rElement <<= rtl::OUString(); // empty: empty string } pRowAry[nRow] = aColSeq; } diff --git a/sc/source/core/tool/rangeutl.cxx b/sc/source/core/tool/rangeutl.cxx index 6cae0b6d2f24..08a07c090110 100644 --- a/sc/source/core/tool/rangeutl.cxx +++ b/sc/source/core/tool/rangeutl.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 @@ -53,10 +53,10 @@ using namespace ::com::sun::star; //------------------------------------------------------------------------ -BOOL ScRangeUtil::MakeArea( const String& rAreaStr, - ScArea& rArea, - ScDocument* pDoc, - SCTAB nTab, +BOOL ScRangeUtil::MakeArea( const String& rAreaStr, + ScArea& rArea, + ScDocument* pDoc, + SCTAB nTab, ScAddress::Details const & rDetails ) const { // Eingabe in rAreaStr: "$Tabelle1.$A1:$D17" @@ -64,12 +64,12 @@ BOOL ScRangeUtil::MakeArea( const String& rAreaStr, // BROKEN BROKEN BROKEN // but it is only used in the consolidate dialog. Ignore for now. - BOOL nSuccess = FALSE; - USHORT nPointPos = rAreaStr.Search('.'); - USHORT nColonPos = rAreaStr.Search(':'); - String aStrArea( rAreaStr ); - ScRefAddress startPos; - ScRefAddress endPos; + BOOL nSuccess = FALSE; + USHORT nPointPos = rAreaStr.Search('.'); + USHORT nColonPos = rAreaStr.Search(':'); + String aStrArea( rAreaStr ); + ScRefAddress startPos; + ScRefAddress endPos; if ( nColonPos == STRING_NOTFOUND ) if ( nPointPos != STRING_NOTFOUND ) @@ -82,22 +82,22 @@ BOOL ScRangeUtil::MakeArea( const String& rAreaStr, if ( nSuccess ) rArea = ScArea( startPos.Tab(), - startPos.Col(), startPos.Row(), - endPos.Col(), endPos.Row() ); + startPos.Col(), startPos.Row(), + endPos.Col(), endPos.Row() ); return nSuccess; } //------------------------------------------------------------------------ -void ScRangeUtil::CutPosString( const String& theAreaStr, - String& thePosStr ) const +void ScRangeUtil::CutPosString( const String& theAreaStr, + String& thePosStr ) const { - String aPosStr; + String aPosStr; // BROKEN BROKEN BROKEN // but it is only used in the consolidate dialog. Ignore for now. - USHORT nColonPos = theAreaStr.Search(':'); + USHORT nColonPos = theAreaStr.Search(':'); if ( nColonPos != STRING_NOTFOUND ) aPosStr = theAreaStr.Copy( 0, nColonPos ); // ':' nicht mitkopieren @@ -109,10 +109,10 @@ void ScRangeUtil::CutPosString( const String& theAreaStr, //------------------------------------------------------------------------ -BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, - ScDocument* pDoc, - ScArea*** pppAreas, - USHORT* pAreaCount, +BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, + ScDocument* pDoc, + ScArea*** pppAreas, + USHORT* pAreaCount, BOOL /* bAcceptCellRef */, ScAddress::Details const & rDetails ) const { @@ -125,9 +125,9 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, /* * Erwartet wird ein String der Form - * "$Tabelle1.$A$1:$Tabelle3.$D$17" + * "$Tabelle1.$A$1:$Tabelle3.$D$17" * Wenn bAcceptCellRef == TRUE ist, wird auch ein String der Form - * "$Tabelle1.$A$1" + * "$Tabelle1.$A$1" * akzeptiert. * * als Ergebnis wird ein ScArea-Array angelegt, @@ -135,10 +135,10 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, * wieder geloescht werden muss! */ - BOOL bStrOk = FALSE; - String aTempAreaStr(rAreaStr); - String aStartPosStr; - String aEndPosStr; + BOOL bStrOk = FALSE; + String aTempAreaStr(rAreaStr); + String aStartPosStr; + String aEndPosStr; if ( STRING_NOTFOUND == aTempAreaStr.Search(':') ) { @@ -146,16 +146,16 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, aTempAreaStr.Append(rAreaStr); } - USHORT nColonPos = aTempAreaStr.Search(':'); + USHORT nColonPos = aTempAreaStr.Search(':'); if ( STRING_NOTFOUND != nColonPos && STRING_NOTFOUND != aTempAreaStr.Search('.') ) { - ScRefAddress aStartPos; - ScRefAddress aEndPos; + ScRefAddress aStartPos; + ScRefAddress aEndPos; - aStartPosStr = aTempAreaStr.Copy( 0, nColonPos ); - aEndPosStr = aTempAreaStr.Copy( nColonPos+1, STRING_LEN ); + aStartPosStr = aTempAreaStr.Copy( 0, nColonPos ); + aEndPosStr = aTempAreaStr.Copy( nColonPos+1, STRING_LEN ); if ( ConvertSingleRef( pDoc, aStartPosStr, 0, aStartPos, rDetails ) ) { @@ -172,13 +172,13 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, if ( pppAreas && pAreaCount ) // Array zurueckgegeben? { - SCTAB nStartTab = aStartPos.Tab(); - SCTAB nEndTab = aEndPos.Tab(); - USHORT nTabCount = static_cast<USHORT>(nEndTab-nStartTab+1); - ScArea** theAreas = new ScArea*[nTabCount]; - SCTAB nTab = 0; - USHORT i = 0; - ScArea theArea( 0, aStartPos.Col(), aStartPos.Row(), + SCTAB nStartTab = aStartPos.Tab(); + SCTAB nEndTab = aEndPos.Tab(); + USHORT nTabCount = static_cast<USHORT>(nEndTab-nStartTab+1); + ScArea** theAreas = new ScArea*[nTabCount]; + SCTAB nTab = 0; + USHORT i = 0; + ScArea theArea( 0, aStartPos.Col(), aStartPos.Row(), aEndPos.Col(), aEndPos.Row() ); nTab = nStartTab; @@ -200,17 +200,17 @@ BOOL ScRangeUtil::IsAbsTabArea( const String& rAreaStr, //------------------------------------------------------------------------ -BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr, - ScDocument* pDoc, - SCTAB nTab, - String* pCompleteStr, - ScRefAddress* pStartPos, - ScRefAddress* pEndPos, +BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr, + ScDocument* pDoc, + SCTAB nTab, + String* pCompleteStr, + ScRefAddress* pStartPos, + ScRefAddress* pEndPos, ScAddress::Details const & rDetails ) const { - BOOL bIsAbsArea = FALSE; - ScRefAddress startPos; - ScRefAddress endPos; + BOOL bIsAbsArea = FALSE; + ScRefAddress startPos; + ScRefAddress endPos; bIsAbsArea = ConvertDoubleRef( pDoc, rAreaStr, nTab, startPos, endPos, rDetails ); @@ -242,17 +242,17 @@ BOOL ScRangeUtil::IsAbsArea( const String& rAreaStr, //------------------------------------------------------------------------ -BOOL ScRangeUtil::IsAbsPos( const String& rPosStr, - ScDocument* pDoc, - SCTAB nTab, - String* pCompleteStr, - ScRefAddress* pPosTripel, +BOOL ScRangeUtil::IsAbsPos( const String& rPosStr, + ScDocument* pDoc, + SCTAB nTab, + String* pCompleteStr, + ScRefAddress* pPosTripel, ScAddress::Details const & rDetails ) const { - BOOL bIsAbsPos = FALSE; - ScRefAddress thePos; + BOOL bIsAbsPos = FALSE; + ScRefAddress thePos; - bIsAbsPos = ConvertSingleRef( pDoc, rPosStr, nTab, thePos, rDetails ); + bIsAbsPos = ConvertSingleRef( pDoc, rPosStr, nTab, thePos, rDetails ); thePos.SetRelCol( FALSE ); thePos.SetRelRow( FALSE ); thePos.SetRelTab( FALSE ); @@ -270,16 +270,16 @@ BOOL ScRangeUtil::IsAbsPos( const String& rPosStr, //------------------------------------------------------------------------ -BOOL ScRangeUtil::MakeRangeFromName ( - const String& rName, - ScDocument* pDoc, - SCTAB nCurTab, - ScRange& rRange, - RutlNameScope eScope, +BOOL ScRangeUtil::MakeRangeFromName ( + const String& rName, + ScDocument* pDoc, + SCTAB nCurTab, + ScRange& rRange, + RutlNameScope eScope, ScAddress::Details const & rDetails ) const { BOOL bResult=FALSE; - ScRangeUtil aRangeUtil; + ScRangeUtil aRangeUtil; SCTAB nTab = 0; SCCOL nColStart = 0; SCCOL nColEnd = 0; @@ -289,26 +289,26 @@ BOOL ScRangeUtil::MakeRangeFromName ( if( eScope==RUTL_NAMES ) { ScRangeName& rRangeNames = *(pDoc->GetRangeName()); - USHORT nAt = 0; + USHORT nAt = 0; if ( rRangeNames.SearchName( rName, nAt ) ) { ScRangeData* pData = rRangeNames[nAt]; - String aStrArea; - ScRefAddress aStartPos; - ScRefAddress aEndPos; + String aStrArea; + ScRefAddress aStartPos; + ScRefAddress aEndPos; pData->GetSymbol( aStrArea ); if ( IsAbsArea( aStrArea, pDoc, nCurTab, NULL, &aStartPos, &aEndPos, rDetails ) ) { - nTab = aStartPos.Tab(); + nTab = aStartPos.Tab(); nColStart = aStartPos.Col(); nRowStart = aStartPos.Row(); nColEnd = aEndPos.Col(); nRowEnd = aEndPos.Row(); - bResult = TRUE; + bResult = TRUE; } else { @@ -317,25 +317,25 @@ BOOL ScRangeUtil::MakeRangeFromName ( if ( IsAbsPos( aStrArea, pDoc, nCurTab, NULL, &aStartPos, rDetails ) ) { - nTab = aStartPos.Tab(); + nTab = aStartPos.Tab(); nColStart = nColEnd = aStartPos.Col(); nRowStart = nRowEnd = aStartPos.Row(); - bResult = TRUE; + bResult = TRUE; } } } } else if( eScope==RUTL_DBASE ) { - ScDBCollection& rDbNames = *(pDoc->GetDBCollection()); - USHORT nAt = 0; + ScDBCollection& rDbNames = *(pDoc->GetDBCollection()); + USHORT nAt = 0; if ( rDbNames.SearchName( rName, nAt ) ) { ScDBData* pData = rDbNames[nAt]; pData->GetArea( nTab, nColStart, nRowStart, - nColEnd, nRowEnd ); + nColEnd, nRowEnd ); bResult = TRUE; } } @@ -379,10 +379,10 @@ sal_Int32 ScRangeStringConverter::IndexOf( sal_Int32 nOffset, sal_Unicode cQuote ) { - sal_Int32 nLength = rString.getLength(); - sal_Int32 nIndex = nOffset; - sal_Bool bQuoted = sal_False; - sal_Bool bExitLoop = sal_False; + sal_Int32 nLength = rString.getLength(); + sal_Int32 nIndex = nOffset; + sal_Bool bQuoted = sal_False; + sal_Bool bExitLoop = sal_False; while( !bExitLoop && (nIndex < nLength) ) { @@ -400,9 +400,9 @@ sal_Int32 ScRangeStringConverter::IndexOfDifferent( sal_Unicode cSearchChar, sal_Int32 nOffset ) { - sal_Int32 nLength = rString.getLength(); - sal_Int32 nIndex = nOffset; - sal_Bool bExitLoop = sal_False; + sal_Int32 nLength = rString.getLength(); + sal_Int32 nIndex = nOffset; + sal_Bool bExitLoop = sal_False; while( !bExitLoop && (nIndex < nLength) ) { @@ -448,9 +448,9 @@ void ScRangeStringConverter::AppendTableName(OUStringBuffer& rBuf, const OUStrin sal_Int32 ScRangeStringConverter::GetTokenCount( const OUString& rString, sal_Unicode cSeperator, sal_Unicode cQuote ) { - OUString sToken; - sal_Int32 nCount = 0; - sal_Int32 nOffset = 0; + OUString sToken; + sal_Int32 nCount = 0; + sal_Int32 nOffset = 0; while( nOffset >= 0 ) { GetTokenByOffset( sToken, rString, nOffset, cQuote, cSeperator ); @@ -532,7 +532,7 @@ sal_Bool ScRangeStringConverter::GetRangeFromString( // #i77703# chart ranges in the file format contain both sheet names, even for an external reference sheet. // This isn't parsed by ScRange, so try to parse the two Addresses then. if (!bResult) - { + { bResult = ((rRange.aStart.Parse( aUIString.Copy(0, (xub_StrLen)nIndex), const_cast<ScDocument*>(pDocument), eConv) & SCA_VALID) == SCA_VALID) && ((rRange.aEnd.Parse( aUIString.Copy((xub_StrLen)nIndex+1), const_cast<ScDocument*>(pDocument), @@ -797,7 +797,7 @@ void ScRangeStringConverter::GetStringFromRangeList( } static void lcl_appendCellAddress( - rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, + rtl::OUStringBuffer& rBuf, ScDocument* pDoc, const ScAddress& rCell, const ScAddress::ExternalInfo& rExtInfo) { if (rExtInfo.mbExternal) @@ -915,7 +915,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con OUStringBuffer aBuf = aBeginCell.copy(0, nDotPos); if (nEndCellDotPos == 0) - { + { // workaround for old syntax (probably pre-chart2 age?) // e.g. Sheet1.A1:.B2 aBuf.append(aEndCell); @@ -928,7 +928,7 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con } aEndCell = aBuf.makeStringAndClear(); } - + ScAddress::ExternalInfo aExtInfo1, aExtInfo2; ScAddress aCell1, aCell2; rtl::OUString aBuf; @@ -1015,18 +1015,18 @@ void ScRangeStringConverter::GetStringFromXMLRangeString( OUString& rString, con ScArea::ScArea( SCTAB tab, SCCOL colStart, SCROW rowStart, SCCOL colEnd, SCROW rowEnd ) : - nTab ( tab ), - nColStart( colStart ), nRowStart( rowStart ), - nColEnd ( colEnd ), nRowEnd ( rowEnd ) + nTab ( tab ), + nColStart( colStart ), nRowStart( rowStart ), + nColEnd ( colEnd ), nRowEnd ( rowEnd ) { } //------------------------------------------------------------------------ ScArea::ScArea( const ScArea& r ) : - nTab ( r.nTab ), - nColStart( r.nColStart ), nRowStart( r.nRowStart ), - nColEnd ( r.nColEnd ), nRowEnd ( r.nRowEnd ) + nTab ( r.nTab ), + nColStart( r.nColStart ), nRowStart( r.nRowStart ), + nColEnd ( r.nColEnd ), nRowEnd ( r.nRowEnd ) { } @@ -1034,11 +1034,11 @@ ScArea::ScArea( const ScArea& r ) : ScArea& ScArea::operator=( const ScArea& r ) { - nTab = r.nTab; - nColStart = r.nColStart; - nRowStart = r.nRowStart; - nColEnd = r.nColEnd; - nRowEnd = r.nRowEnd; + nTab = r.nTab; + nColStart = r.nColStart; + nRowStart = r.nRowStart; + nColEnd = r.nColEnd; + nRowEnd = r.nRowEnd; return *this; } @@ -1046,11 +1046,11 @@ ScArea& ScArea::operator=( const ScArea& r ) BOOL ScArea::operator==( const ScArea& r ) const { - return ( (nTab == r.nTab) - && (nColStart == r.nColStart) - && (nRowStart == r.nRowStart) - && (nColEnd == r.nColEnd) - && (nRowEnd == r.nRowEnd) ); + return ( (nTab == r.nTab) + && (nColStart == r.nColStart) + && (nRowStart == r.nRowStart) + && (nColEnd == r.nColEnd) + && (nRowEnd == r.nRowEnd) ); } //------------------------------------------------------------------------ @@ -1068,7 +1068,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange ) { for (;;) { - if ( bFirstPass ) // erst Bereichsnamen + if ( bFirstPass ) // erst Bereichsnamen { if ( pRangeName && nPos < pRangeName->GetCount() ) { @@ -1076,7 +1076,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange ) if ( pData && pData->IsValidReference(rRange) ) { rName = pData->GetName(); - return TRUE; // gefunden + return TRUE; // gefunden } } else @@ -1085,7 +1085,7 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange ) nPos = 0; } } - if ( !bFirstPass ) // dann DB-Bereiche + if ( !bFirstPass ) // dann DB-Bereiche { if ( pDBCollection && nPos < pDBCollection->GetCount() ) { @@ -1094,11 +1094,11 @@ BOOL ScAreaNameIterator::Next( String& rName, ScRange& rRange ) { pData->GetArea( rRange ); rName = pData->GetName(); - return TRUE; // gefunden + return TRUE; // gefunden } } else - return FALSE; // gibt nichts mehr + return FALSE; // gibt nichts mehr } } } diff --git a/sc/source/core/tool/rechead.cxx b/sc/source/core/tool/rechead.cxx index 90818b37cd60..06cba51dcad4 100644 --- a/sc/source/core/tool/rechead.cxx +++ b/sc/source/core/tool/rechead.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,7 +60,7 @@ ScMultipleReadHeader::ScMultipleReadHeader(SvStream& rNewStream) : if ( rStream.GetError() == SVSTREAM_OK ) rStream.SetError( SVSTREAM_FILEFORMAT_ERROR ); - // alles auf 0, damit BytesLeft() wenigstens abbricht + // alles auf 0, damit BytesLeft() wenigstens abbricht pBuf = NULL; pMemStream = NULL; nEntryEnd = nDataPos; } @@ -99,10 +99,10 @@ void ScMultipleReadHeader::EndEntry() { if ( rStream.GetError() == SVSTREAM_OK ) rStream.SetError( SCWARN_IMPORT_INFOLOST ); - rStream.Seek( nEntryEnd ); // Rest ueberspringen + rStream.Seek( nEntryEnd ); // Rest ueberspringen } - nEntryEnd = nTotalEnd; // den ganzen Rest, wenn kein StartEntry kommt + nEntryEnd = nTotalEnd; // den ganzen Rest, wenn kein StartEntry kommt } void ScMultipleReadHeader::StartEntry() @@ -146,12 +146,12 @@ ScMultipleWriteHeader::~ScMultipleWriteHeader() rStream << static_cast<sal_uInt32>(aMemStream.Tell()); rStream.Write( aMemStream.GetData(), aMemStream.Tell() ); - if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen? + if ( nDataEnd - nDataPos != nDataSize ) // Default getroffen? { nDataSize = nDataEnd - nDataPos; ULONG nPos = rStream.Tell(); rStream.Seek(nDataPos-sizeof(sal_uInt32)); - rStream << nDataSize; // Groesse am Anfang eintragen + rStream << nDataSize; // Groesse am Anfang eintragen rStream.Seek(nPos); } } diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx index 07c8442f6bd7..22c524f7593e 100644 --- a/sc/source/core/tool/refdata.cxx +++ b/sc/source/core/tool/refdata.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 @@ -244,7 +244,7 @@ ScComplexRefData& ScComplexRefData::Extend( const ScSingleRefData & rRef, const Ref2.SetColRel( aRef.IsColRel()); if (Ref2.nRow == aRef.nRow) Ref2.SetRowRel( aRef.IsRowRel()); - // $Sheet1.$A$5:$A$6 => $Sheet1.$A$5:$A$5:$A$6 => $Sheet1.$A$5:$A$6, and + // $Sheet1.$A$5:$A$6 => $Sheet1.$A$5:$A$5:$A$6 => $Sheet1.$A$5:$A$6, and // not $Sheet1.$A$5:Sheet1.$A$6 (with invisible second 3D, but relative). if (Ref2.nTab == aRef.nTab) Ref2.SetTabRel( bInherit3Dtemp ? Ref1.IsTabRel() : aRef.IsTabRel()); diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx index 49c91cfa42e8..461ce92f42b1 100644 --- a/sc/source/core/tool/reffind.cxx +++ b/sc/source/core/tool/reffind.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 @@ -42,7 +42,7 @@ // STATIC DATA ----------------------------------------------------------- -// incl. Doppelpunkt -> Doppelte Referenzen werden einzeln behandelt +// incl. Doppelpunkt -> Doppelte Referenzen werden einzeln behandelt const sal_Unicode __FAR_DATA ScRefFinder::pDelimiters[] = { '=','(',')','+','-','*','/','^','&',' ','{','}','<','>',':', 0 }; @@ -88,11 +88,11 @@ ScRefFinder::~ScRefFinder() USHORT lcl_NextFlags( USHORT nOld ) { - USHORT nNew = nOld & 7; // die drei Abs-Flags - nNew = ( nNew - 1 ) & 7; // weiterzaehlen + USHORT nNew = nOld & 7; // die drei Abs-Flags + nNew = ( nNew - 1 ) & 7; // weiterzaehlen if (!(nOld & SCA_TAB_3D)) - nNew &= ~SCA_TAB_ABSOLUTE; // nicht 3D -> nie absolut! + nNew &= ~SCA_TAB_ABSOLUTE; // nicht 3D -> nie absolut! return ( nOld & 0xfff8 ) | nNew; } @@ -102,9 +102,9 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ) xub_StrLen nLen = aFormula.Len(); if (!nLen) return; - const sal_Unicode* pSource = aFormula.GetBuffer(); // fuer schnellen Zugriff + const sal_Unicode* pSource = aFormula.GetBuffer(); // fuer schnellen Zugriff - // Selektion erweitern, und statt Selektion Start- und Endindex + // Selektion erweitern, und statt Selektion Start- und Endindex if ( nEndPos < nStartPos ) { @@ -126,7 +126,7 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ) xub_StrLen nLoopStart = nStartPos; while ( nLoopStart <= nEndPos ) { - // Formel zerlegen + // Formel zerlegen xub_StrLen nEStart = nLoopStart; while ( nEStart <= nEndPos && !IsText(pSource[nEStart]) ) @@ -140,7 +140,7 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ) aSep = aFormula.Copy( nLoopStart, nEStart-nLoopStart ); aExpr = aFormula.Copy( nEStart, nEEnd-nEStart ); - // Test, ob aExpr eine Referenz ist + // Test, ob aExpr eine Referenz ist USHORT nResult = aAddr.Parse( aExpr, pDoc, pDoc->GetAddressConvention() ); if ( nResult & SCA_VALID ) @@ -150,13 +150,13 @@ void ScRefFinder::ToggleRel( xub_StrLen nStartPos, xub_StrLen nEndPos ) xub_StrLen nAbsStart = nStartPos+aResult.Len()+aSep.Len(); - if (!nFound) // erste Referenz ? + if (!nFound) // erste Referenz ? nSelStart = nAbsStart; - nSelEnd = nAbsStart+aExpr.Len(); // Selektion, keine Indizes + nSelEnd = nAbsStart+aExpr.Len(); // Selektion, keine Indizes ++nFound; } - // zusammenbauen + // zusammenbauen aResult += aSep; aResult += aExpr; diff --git a/sc/source/core/tool/refreshtimer.cxx b/sc/source/core/tool/refreshtimer.cxx index e12916a9f907..5d890a993f97 100644 --- a/sc/source/core/tool/refreshtimer.cxx +++ b/sc/source/core/tool/refreshtimer.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/core/tool/reftokenhelper.cxx b/sc/source/core/tool/reftokenhelper.cxx index eaf4b8134490..83df2dd9fc0c 100644 --- a/sc/source/core/tool/reftokenhelper.cxx +++ b/sc/source/core/tool/reftokenhelper.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/core/tool/refupdat.cxx b/sc/source/core/tool/refupdat.cxx index 970a85d3392a..1703f7cd26f8 100644 --- a/sc/source/core/tool/refupdat.cxx +++ b/sc/source/core/tool/refupdat.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 @@ BOOL lcl_MoveStart( R& rRef, U nStart, S nDelta, U nMask ) if ( rRef >= nStart ) rRef = sal::static_int_cast<R>( rRef + nDelta ); else if ( nDelta < 0 && rRef >= nStart + nDelta ) - rRef = nStart + nDelta; //! begrenzen ??? + rRef = nStart + nDelta; //! begrenzen ??? if ( rRef < 0 ) { rRef = 0; @@ -69,7 +69,7 @@ BOOL lcl_MoveEnd( R& rRef, U nStart, S nDelta, U nMask ) if ( rRef >= nStart ) rRef = sal::static_int_cast<R>( rRef + nDelta ); else if ( nDelta < 0 && rRef >= nStart + nDelta ) - rRef = nStart + nDelta - 1; //! begrenzen ??? + rRef = nStart + nDelta - 1; //! begrenzen ??? if ( rRef < 0 ) { rRef = 0; @@ -92,25 +92,25 @@ BOOL lcl_MoveReorder( R& rRef, U nStart, U nEnd, S nDelta ) return TRUE; } - if ( nDelta > 0 ) // nach hinten schieben + if ( nDelta > 0 ) // nach hinten schieben { if ( rRef >= nStart && rRef <= nEnd + nDelta ) { if ( rRef <= nEnd ) rRef = sal::static_int_cast<R>( rRef + nDelta ); // in the moved range else - rRef -= nEnd - nStart + 1; // nachruecken + rRef -= nEnd - nStart + 1; // nachruecken return TRUE; } } - else // nach vorne schieben + else // nach vorne schieben { if ( rRef >= nStart + nDelta && rRef <= nEnd ) { if ( rRef >= nStart ) rRef = sal::static_int_cast<R>( rRef + nDelta ); // in the moved range else - rRef += nEnd - nStart + 1; // nachruecken + rRef += nEnd - nStart + 1; // nachruecken return TRUE; } } @@ -174,7 +174,7 @@ BOOL lcl_MoveRefPart( R& rRef1Val, BOOL& rRef1Del, BOOL bDo1, } } if ( bDel ) - { // move deleted along + { // move deleted along rRef1Val = sal::static_int_cast<R>( rRef1Val + nDelta ); rRef2Val = sal::static_int_cast<R>( rRef2Val + nDelta ); } @@ -205,23 +205,23 @@ BOOL lcl_MoveRefPart( R& rRef1Val, BOOL& rRef1Del, BOOL bDo1, template< typename R, typename S, typename U > BOOL IsExpand( R n1, R n2, U nStart, S nD ) -{ //! vor normalem Move... +{ //! vor normalem Move... return - nD > 0 // Insert - && n1 < n2 // mindestens zwei Cols/Rows/Tabs in Ref + nD > 0 // Insert + && n1 < n2 // mindestens zwei Cols/Rows/Tabs in Ref && ( - (nStart <= n1 && n1 < nStart + nD) // n1 innerhalb des Insert - || (n2 + 1 == nStart) // n2 direkt vor Insert - ); // n1 < nStart <= n2 wird sowieso expanded! + (nStart <= n1 && n1 < nStart + nD) // n1 innerhalb des Insert + || (n2 + 1 == nStart) // n2 direkt vor Insert + ); // n1 < nStart <= n2 wird sowieso expanded! } template< typename R, typename S, typename U > void Expand( R& n1, R& n2, U nStart, S nD ) -{ //! nach normalem Move..., nur wenn IsExpand vorher TRUE war! +{ //! nach normalem Move..., nur wenn IsExpand vorher TRUE war! //! erst das Ende if ( n2 + 1 == nStart ) - { // am Ende + { // am Ende n2 = sal::static_int_cast<R>( n2 + nD ); return; } @@ -375,7 +375,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo } else if (eUpdateRefMode == URM_REORDER) { - // bisher nur fuer nDz (MoveTab) + // bisher nur fuer nDz (MoveTab) DBG_ASSERT ( !nDx && !nDy, "URM_REORDER fuer x und y noch nicht implementiert" ); if ( nDz && (theCol1 >= nCol1) && (theCol2 <= nCol2) && @@ -391,11 +391,11 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eUpdateRefMo if ( eRet == UR_NOTHING ) { if (oldCol1 != theCol1 - || oldRow1 != theRow1 - || oldTab1 != theTab1 - || oldCol2 != theCol2 - || oldRow2 != theRow2 - || oldTab2 != theTab2 + || oldRow1 != theRow1 + || oldTab1 != theTab1 + || oldCol2 != theCol2 + || oldRow2 != theRow2 + || oldTab2 != theTab2 ) eRet = UR_UPDATED; } @@ -663,11 +663,11 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode, if ( eRet == UR_NOTHING ) { if (oldCol1 != rRef.Ref1.nCol - || oldRow1 != rRef.Ref1.nRow - || oldTab1 != rRef.Ref1.nTab - || oldCol2 != rRef.Ref2.nCol - || oldRow2 != rRef.Ref2.nRow - || oldTab2 != rRef.Ref2.nTab + || oldRow1 != rRef.Ref1.nRow + || oldTab1 != rRef.Ref1.nTab + || oldCol2 != rRef.Ref2.nCol + || oldRow2 != rRef.Ref2.nRow + || oldTab2 != rRef.Ref2.nTab ) eRet = UR_UPDATED; } @@ -685,7 +685,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode, && rRef.Ref2.nRow <= nRow2-nDy && rRef.Ref2.nTab <= nTab2-nDz ) { - eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, TRUE ); // immer verschieben + eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, TRUE ); // immer verschieben } else if ( nDz && r.In( rPos ) ) { @@ -699,7 +699,7 @@ ScRefUpdateRes ScRefUpdate::Update( ScDocument* pDoc, UpdateRefMode eMode, rRef.CalcRelFromAbs( rPos ); } else if( eMode == URM_COPY && r.In( rPos ) ) - eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, FALSE ); // nur relative + eRet = Move( pDoc, rPos, nDx, nDy, nDz, rRef, FALSE, FALSE ); // nur relative // sollte nicht mehr verwendet werden muessen else if (eWhat != ScRefUpdate::ABSOLUTE) rRef.CalcRelFromAbs( rPos ); @@ -804,11 +804,11 @@ ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos, if ( eRet == UR_NOTHING ) { if (oldCol1 != rRef.Ref1.nCol - || oldRow1 != rRef.Ref1.nRow - || oldTab1 != rRef.Ref1.nTab - || oldCol2 != rRef.Ref2.nCol - || oldRow2 != rRef.Ref2.nRow - || oldTab2 != rRef.Ref2.nTab + || oldRow1 != rRef.Ref1.nRow + || oldTab1 != rRef.Ref1.nTab + || oldCol2 != rRef.Ref2.nCol + || oldRow2 != rRef.Ref2.nRow + || oldTab2 != rRef.Ref2.nTab ) eRet = UR_UPDATED; } @@ -818,7 +818,7 @@ ScRefUpdateRes ScRefUpdate::Move( ScDocument* pDoc, const ScAddress& rPos, return eRet; } -void ScRefUpdate::MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos, +void ScRefUpdate::MoveRelWrap( ScDocument* pDoc, const ScAddress& rPos, SCCOL nMaxCol, SCROW nMaxRow, ScComplexRefData& rRef ) { if( rRef.Ref1.IsColRel() ) @@ -901,8 +901,8 @@ ScRefUpdateRes ScRefUpdate::UpdateTranspose( ScDocument* pDoc, //------------------------------------------------------------------ -// UpdateGrow - erweitert Referenzen, die genau auf den Bereich zeigen -// kommt ohne Dokument aus +// UpdateGrow - erweitert Referenzen, die genau auf den Bereich zeigen +// kommt ohne Dokument aus ScRefUpdateRes ScRefUpdate::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY, @@ -910,8 +910,8 @@ ScRefUpdateRes ScRefUpdate::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCRO { ScRefUpdateRes eRet = UR_NOTHING; - // in Y-Richtung darf die Ref auch eine Zeile weiter unten anfangen, - // falls ein Bereich Spaltenkoepfe enthaelt + // in Y-Richtung darf die Ref auch eine Zeile weiter unten anfangen, + // falls ein Bereich Spaltenkoepfe enthaelt BOOL bUpdateX = ( nGrowX && rRef.Ref1.nCol == rArea.aStart.Col() && rRef.Ref2.nCol == rArea.aEnd.Col() && diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index c7232c3adebc..f0bad698aac3 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.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,7 +44,7 @@ //------------------------------------------------------------------------ -void ScMatrix::CreateMatrix(SCSIZE nC, SCSIZE nR) // nur fuer ctor +void ScMatrix::CreateMatrix(SCSIZE nC, SCSIZE nR) // nur fuer ctor { pErrorInterpreter = NULL; nColCount = nC; @@ -97,7 +97,7 @@ ScMatrix* ScMatrix::CloneAndExtend( SCSIZE nNewCols, SCSIZE nNewRows ) const { ScMatrix* pScMat = new ScMatrix( nNewCols, nNewRows); MatCopy(*pScMat); - pScMat->SetErrorInterpreter( pErrorInterpreter); + pScMat->SetErrorInterpreter( pErrorInterpreter); return pScMat; } @@ -108,15 +108,15 @@ void ScMatrix::SetErrorAtInterpreter( USHORT nError ) const } // -// File format: USHORT columns, USHORT rows, (columns*rows) entries: -// BYTE type ( CELLTYPE_NONE, CELLTYPE_VALUE, CELLTYPE_STRING ); nothing, double or String +// File format: USHORT columns, USHORT rows, (columns*rows) entries: +// BYTE type ( CELLTYPE_NONE, CELLTYPE_VALUE, CELLTYPE_STRING ); nothing, double or String // ScMatrix::ScMatrix(SvStream& /* rStream */) : pErrorInterpreter( NULL) , nRefCnt(0) { -#if SC_ROWLIMIT_STREAM_ACCESS +#if SC_ROWLIMIT_STREAM_ACCESS #error address types changed! USHORT nC; USHORT nR; @@ -153,7 +153,7 @@ ScMatrix::ScMatrix(SvStream& /* rStream */) if ( i < nCount ) { if (!mnValType) - ResetIsString(); // init string flags + ResetIsString(); // init string flags mnValType[i] = ( nType == CELLTYPE_NONE ? SC_MATVAL_EMPTY : SC_MATVAL_STRING ); mnNonValue++; @@ -171,7 +171,7 @@ ScMatrix::ScMatrix(SvStream& /* rStream */) void ScMatrix::Store(SvStream& /* rStream */) const { -#if SC_ROWLIMIT_STREAM_ACCESS +#if SC_ROWLIMIT_STREAM_ACCESS #error address types changed! SCSIZE nCount = nColCount * nRowCount; // Don't store matrix with more than USHORT max elements, old versions @@ -655,7 +655,7 @@ void ScMatrix::CompareEqual() if ( mnValType ) { for ( SCSIZE j=0; j<n; j++ ) - if ( IsValueType( mnValType[j]) ) // else: #WERT! + if ( IsValueType( mnValType[j]) ) // else: #WERT! if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError pMat[j].fVal = (pMat[j].fVal == 0.0); } @@ -673,7 +673,7 @@ void ScMatrix::CompareNotEqual() if ( mnValType ) { for ( SCSIZE j=0; j<n; j++ ) - if ( IsValueType( mnValType[j]) ) // else: #WERT! + if ( IsValueType( mnValType[j]) ) // else: #WERT! if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError pMat[j].fVal = (pMat[j].fVal != 0.0); } @@ -691,7 +691,7 @@ void ScMatrix::CompareLess() if ( mnValType ) { for ( SCSIZE j=0; j<n; j++ ) - if ( IsValueType( mnValType[j]) ) // else: #WERT! + if ( IsValueType( mnValType[j]) ) // else: #WERT! if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError pMat[j].fVal = (pMat[j].fVal < 0.0); } @@ -709,7 +709,7 @@ void ScMatrix::CompareGreater() if ( mnValType ) { for ( SCSIZE j=0; j<n; j++ ) - if ( IsValueType( mnValType[j]) ) // else: #WERT! + if ( IsValueType( mnValType[j]) ) // else: #WERT! if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError pMat[j].fVal = (pMat[j].fVal > 0.0); } @@ -727,7 +727,7 @@ void ScMatrix::CompareLessEqual() if ( mnValType ) { for ( SCSIZE j=0; j<n; j++ ) - if ( IsValueType( mnValType[j]) ) // else: #WERT! + if ( IsValueType( mnValType[j]) ) // else: #WERT! if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError pMat[j].fVal = (pMat[j].fVal <= 0.0); } @@ -745,7 +745,7 @@ void ScMatrix::CompareGreaterEqual() if ( mnValType ) { for ( SCSIZE j=0; j<n; j++ ) - if ( IsValueType( mnValType[j]) ) // else: #WERT! + if ( IsValueType( mnValType[j]) ) // else: #WERT! if ( ::rtl::math::isFinite( pMat[j].fVal)) // else: DoubleError pMat[j].fVal = (pMat[j].fVal >= 0.0); } diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx index 34561bf50cb5..1953aaedfd50 100644 --- a/sc/source/core/tool/stringutil.cxx +++ b/sc/source/core/tool/stringutil.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx index 7f211cef4033..9e248ce30cc7 100644 --- a/sc/source/core/tool/subtotal.cxx +++ b/sc/source/core/tool/subtotal.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/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 7c972250c7d2..48021b1a2ddb 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.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,7 +86,7 @@ namespace rRef.SetFlag3D( ( rAPI.Flags & sheet::ReferenceFlags::SHEET_3D ) != 0 ); rRef.SetRelName( ( rAPI.Flags & sheet::ReferenceFlags::RELATIVE_NAME ) != 0 ); } - + void lcl_ExternalRefToCalc( ScSingleRefData& rRef, const sheet::SingleReference& rAPI ) { rRef.InitFlags(); @@ -109,10 +109,7 @@ namespace } // } // namespace -// -// ImpTokenIterator wird je Interpreter angelegt, mehrfache auch durch -// SubCode via FormulaTokenIterator Push/Pop moeglich -IMPL_FIXEDMEMPOOL_NEWDEL( ImpTokenIterator, 32, 16 ) +// // Align MemPools on 4k boundaries - 64 bytes (4k is a MUST for OS/2) @@ -246,7 +243,7 @@ void ScRawToken::SetExternalSingleRef( sal_uInt16 nFileId, const String& rTabNam nRefCnt = 0; extref.nFileId = nFileId; - extref.aRef.Ref1 = + extref.aRef.Ref1 = extref.aRef.Ref2 = rRef; xub_StrLen n = rTabName.Len(); @@ -535,7 +532,7 @@ BOOL ScToken::Is3DRef() const FormulaTokenRef ScToken::ExtendRangeReference( FormulaToken & rTok1, FormulaToken & rTok2, const ScAddress & rPos, bool bReuseDoubleRef ) { - + StackVar sv1, sv2; // Doing a RangeOp with RefList is probably utter nonsense, but Xcl // supports it, so do we. @@ -811,7 +808,7 @@ ScExternalSingleRefToken::ScExternalSingleRefToken( sal_uInt16 nFileId, const St } ScExternalSingleRefToken::ScExternalSingleRefToken( const ScExternalSingleRefToken& r ) : - ScToken(r), + ScToken(r), mnFileId(r.mnFileId), maTabName(r.maTabName), maSingleRef(r.maSingleRef) @@ -877,7 +874,7 @@ ScExternalDoubleRefToken::ScExternalDoubleRefToken( sal_uInt16 nFileId, const St } ScExternalDoubleRefToken::ScExternalDoubleRefToken( const ScExternalDoubleRefToken& r ) : - ScToken(r), + ScToken(r), mnFileId(r.mnFileId), maTabName(r.maTabName), maDoubleRef(r.maDoubleRef) @@ -1016,10 +1013,10 @@ ScJumpMatrixToken::~ScJumpMatrixToken() } double ScEmptyCellToken::GetDouble() const { return 0.0; } -const String & ScEmptyCellToken::GetString() const -{ +const String & ScEmptyCellToken::GetString() const +{ static String aDummyString; - return aDummyString; + return aDummyString; } BOOL ScEmptyCellToken::operator==( const FormulaToken& r ) const { @@ -1272,7 +1269,7 @@ BOOL ScTokenArray::IsValidReference( ScRange& rRange ) const //////////////////////////////////////////////////////////////////////////// -ScTokenArray::ScTokenArray() +ScTokenArray::ScTokenArray() { } diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index 918060b12751..42b5921eb9c3 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.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 @@ -36,7 +36,7 @@ #include "unitconv.hxx" #include "global.hxx" -#include "viewopti.hxx" //! move ScLinkConfigItem to separate header! +#include "viewopti.hxx" //! move ScLinkConfigItem to separate header! using namespace utl; using namespace rtl; @@ -44,7 +44,7 @@ using namespace com::sun::star::uno; // -------------------------------------------------------------------- -const sal_Unicode cDelim = 0x01; // Delimiter zwischen From und To +const sal_Unicode cDelim = 0x01; // Delimiter zwischen From und To // --- ScUnitConverterData -------------------------------------------- @@ -98,16 +98,16 @@ void ScUnitConverterData::BuildIndexString( String& rStr, // --- ScUnitConverter ------------------------------------------------ -#define CFGPATH_UNIT "Office.Calc/UnitConversion" -#define CFGSTR_UNIT_FROM "FromUnit" -#define CFGSTR_UNIT_TO "ToUnit" -#define CFGSTR_UNIT_FACTOR "Factor" +#define CFGPATH_UNIT "Office.Calc/UnitConversion" +#define CFGSTR_UNIT_FROM "FromUnit" +#define CFGSTR_UNIT_TO "ToUnit" +#define CFGSTR_UNIT_FACTOR "Factor" ScUnitConverter::ScUnitConverter( USHORT nInit, USHORT nDeltaP ) : ScStrCollection( nInit, nDeltaP, FALSE ) { - // read from configuration - "convert.ini" is no longer used - //! config item as member to allow change of values + // read from configuration - "convert.ini" is no longer used + //! config item as member to allow change of values ScLinkConfigItem aConfigItem( OUString::createFromAscii( CFGPATH_UNIT ) ); diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index deb070005653..aad2f730a62c 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.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 @@ StringCompare ScUserListData::ICompare(const String& rSubStr1, const String& rSu } ScUserList::ScUserList(USHORT nLim, USHORT nDel) : - ScCollection ( nLim, nDel ) + ScCollection ( nLim, nDel ) { using namespace ::com::sun::star; @@ -254,8 +254,8 @@ ScDataObject* ScUserList::Clone() const ScUserListData* ScUserList::GetData(const String& rSubStr) const { - USHORT nIndex; - USHORT i = 0; + USHORT nIndex; + USHORT i = 0; for (i=0; i < nCount; i++) if (((ScUserListData*)pItems[i])->GetSubIndex(rSubStr, nIndex)) return (ScUserListData*)pItems[i]; @@ -277,7 +277,7 @@ BOOL ScUserList::operator==( const ScUserList& r ) const pOtherData = (ScUserListData*)r.At(i); bEqual =( (pMyData->nTokenCount == pOtherData->nTokenCount) - && (pMyData->aStr == pOtherData->aStr) ); + && (pMyData->aStr == pOtherData->aStr) ); } } diff --git a/sc/source/core/tool/viewopti.cxx b/sc/source/core/tool/viewopti.cxx index 4c01f443d0db..1d0ab5575b08 100644 --- a/sc/source/core/tool/viewopti.cxx +++ b/sc/source/core/tool/viewopti.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 @@ -51,7 +51,7 @@ using namespace com::sun::star::uno; //------------------------------------------------------------------ -TYPEINIT1(ScTpViewItem, SfxPoolItem); +TYPEINIT1(ScTpViewItem, SfxPoolItem); #define SC_VERSION ((USHORT)302) @@ -65,19 +65,19 @@ void ScGridOptions::SetDefaults() { *this = ScGridOptions(); - // Raster-Defaults sind jetzt zwischen den Apps unterschiedlich - // darum hier selber eintragen (alles in 1/100mm) + // Raster-Defaults sind jetzt zwischen den Apps unterschiedlich + // darum hier selber eintragen (alles in 1/100mm) if ( ScOptionsUtil::IsMetricSystem() ) { - nFldDrawX = 1000; // 1cm + nFldDrawX = 1000; // 1cm nFldDrawY = 1000; nFldSnapX = 1000; nFldSnapY = 1000; } else { - nFldDrawX = 1270; // 0,5" + nFldDrawX = 1270; // 0,5" nFldDrawY = 1270; nFldSnapX = 1270; nFldSnapY = 1270; @@ -90,17 +90,17 @@ void ScGridOptions::SetDefaults() const ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy ) { - nFldDrawX = rCpy.nFldDrawX; // UINT32 - nFldDrawX = rCpy.nFldDrawX; - nFldDivisionX = rCpy.nFldDivisionX; - nFldDrawY = rCpy.nFldDrawY; - nFldDivisionY = rCpy.nFldDivisionY; - nFldSnapX = rCpy.nFldSnapX; - nFldSnapY = rCpy.nFldSnapY; - bUseGridsnap = rCpy.bUseGridsnap; // BitBool - bSynchronize = rCpy.bSynchronize; - bGridVisible = rCpy.bGridVisible; - bEqualGrid = rCpy.bEqualGrid; + nFldDrawX = rCpy.nFldDrawX; // UINT32 + nFldDrawX = rCpy.nFldDrawX; + nFldDivisionX = rCpy.nFldDivisionX; + nFldDrawY = rCpy.nFldDrawY; + nFldDivisionY = rCpy.nFldDivisionY; + nFldSnapX = rCpy.nFldSnapX; + nFldSnapY = rCpy.nFldSnapY; + bUseGridsnap = rCpy.bUseGridsnap; // BitBool + bSynchronize = rCpy.bSynchronize; + bGridVisible = rCpy.bGridVisible; + bEqualGrid = rCpy.bEqualGrid; return *this; } @@ -109,17 +109,17 @@ const ScGridOptions& ScGridOptions::operator=( const ScGridOptions& rCpy ) int ScGridOptions::operator==( const ScGridOptions& rCpy ) const { - return ( nFldDrawX == rCpy.nFldDrawX - && nFldDrawX == rCpy.nFldDrawX - && nFldDivisionX == rCpy.nFldDivisionX - && nFldDrawY == rCpy.nFldDrawY - && nFldDivisionY == rCpy.nFldDivisionY - && nFldSnapX == rCpy.nFldSnapX - && nFldSnapY == rCpy.nFldSnapY - && bUseGridsnap == rCpy.bUseGridsnap - && bSynchronize == rCpy.bSynchronize - && bGridVisible == rCpy.bGridVisible - && bEqualGrid == rCpy.bEqualGrid ); + return ( nFldDrawX == rCpy.nFldDrawX + && nFldDrawX == rCpy.nFldDrawX + && nFldDivisionX == rCpy.nFldDivisionX + && nFldDrawY == rCpy.nFldDrawY + && nFldDivisionY == rCpy.nFldDivisionY + && nFldSnapX == rCpy.nFldSnapX + && nFldSnapY == rCpy.nFldSnapY + && bUseGridsnap == rCpy.bUseGridsnap + && bSynchronize == rCpy.bSynchronize + && bGridVisible == rCpy.bGridVisible + && bEqualGrid == rCpy.bEqualGrid ); } @@ -149,22 +149,22 @@ __EXPORT ScViewOptions::~ScViewOptions() void ScViewOptions::SetDefaults() { - aOptArr[ VOPT_FORMULAS ] = - aOptArr[ VOPT_SYNTAX ] = + aOptArr[ VOPT_FORMULAS ] = + aOptArr[ VOPT_SYNTAX ] = aOptArr[ VOPT_HELPLINES ] = aOptArr[ VOPT_BIGHANDLES ] = FALSE; - aOptArr[ VOPT_NOTES ] = - aOptArr[ VOPT_NULLVALS ] = - aOptArr[ VOPT_VSCROLL ] = - aOptArr[ VOPT_HSCROLL ] = + aOptArr[ VOPT_NOTES ] = + aOptArr[ VOPT_NULLVALS ] = + aOptArr[ VOPT_VSCROLL ] = + aOptArr[ VOPT_HSCROLL ] = aOptArr[ VOPT_TABCONTROLS ] = - aOptArr[ VOPT_OUTLINER ] = - aOptArr[ VOPT_HEADER ] = - aOptArr[ VOPT_GRID ] = - aOptArr[ VOPT_ANCHOR ] = + aOptArr[ VOPT_OUTLINER ] = + aOptArr[ VOPT_HEADER ] = + aOptArr[ VOPT_GRID ] = + aOptArr[ VOPT_ANCHOR ] = aOptArr[ VOPT_PAGEBREAKS ] = aOptArr[ VOPT_SOLIDHANDLES] = - aOptArr[ VOPT_CLIPMARKS ] = TRUE; + aOptArr[ VOPT_CLIPMARKS ] = TRUE; aModeArr[VOBJ_TYPE_OLE ] = aModeArr[VOBJ_TYPE_CHART] = @@ -192,12 +192,12 @@ const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy ) { USHORT i; - for ( i=0; i<MAX_OPT; i++ ) aOptArr [i] = rCpy.aOptArr[i]; + for ( i=0; i<MAX_OPT; i++ ) aOptArr [i] = rCpy.aOptArr[i]; for ( i=0; i<MAX_TYPE; i++ ) aModeArr[i] = rCpy.aModeArr[i]; - aGridCol = rCpy.aGridCol; - aGridColName = rCpy.aGridColName; - aGridOpt = rCpy.aGridOpt; + aGridCol = rCpy.aGridCol; + aGridColName = rCpy.aGridColName; + aGridOpt = rCpy.aGridOpt; return *this; } @@ -206,15 +206,15 @@ const ScViewOptions& ScViewOptions::operator=( const ScViewOptions& rCpy ) int ScViewOptions::operator==( const ScViewOptions& rOpt ) const { - BOOL bEqual = TRUE; - USHORT i; + BOOL bEqual = TRUE; + USHORT i; for ( i=0; i<MAX_OPT && bEqual; i++ ) bEqual = (aOptArr [i] == rOpt.aOptArr[i]); for ( i=0; i<MAX_TYPE && bEqual; i++ ) bEqual = (aModeArr[i] == rOpt.aModeArr[i]); bEqual = bEqual && (aGridCol == rOpt.aGridCol); bEqual = bEqual && (aGridColName == rOpt.aGridColName); - bEqual = bEqual && (aGridOpt == rOpt.aGridOpt); + bEqual = bEqual && (aGridOpt == rOpt.aGridOpt); return bEqual; } @@ -225,16 +225,16 @@ SvxGridItem* ScViewOptions::CreateGridItem( USHORT nId /* = SID_ATTR_GRID_OPTION { SvxGridItem* pItem = new SvxGridItem( nId ); - pItem->SetFldDrawX ( aGridOpt.GetFldDrawX() ); - pItem->SetFldDivisionX ( aGridOpt.GetFldDivisionX() ); - pItem->SetFldDrawY ( aGridOpt.GetFldDrawY() ); - pItem->SetFldDivisionY ( aGridOpt.GetFldDivisionY() ); - pItem->SetFldSnapX ( aGridOpt.GetFldSnapX() ); - pItem->SetFldSnapY ( aGridOpt.GetFldSnapY() ); - pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() ); - pItem->SetSynchronize ( aGridOpt.GetSynchronize() ); - pItem->SetGridVisible ( aGridOpt.GetGridVisible() ); - pItem->SetEqualGrid ( aGridOpt.GetEqualGrid() ); + pItem->SetFldDrawX ( aGridOpt.GetFldDrawX() ); + pItem->SetFldDivisionX ( aGridOpt.GetFldDivisionX() ); + pItem->SetFldDrawY ( aGridOpt.GetFldDrawY() ); + pItem->SetFldDivisionY ( aGridOpt.GetFldDivisionY() ); + pItem->SetFldSnapX ( aGridOpt.GetFldSnapX() ); + pItem->SetFldSnapY ( aGridOpt.GetFldSnapY() ); + pItem->SetUseGridSnap ( aGridOpt.GetUseGridSnap() ); + pItem->SetSynchronize ( aGridOpt.GetSynchronize() ); + pItem->SetGridVisible ( aGridOpt.GetGridVisible() ); + pItem->SetEqualGrid ( aGridOpt.GetEqualGrid() ); return pItem; } @@ -247,15 +247,15 @@ SvxGridItem* ScViewOptions::CreateGridItem( USHORT nId /* = SID_ATTR_GRID_OPTION ScTpViewItem::ScTpViewItem( USHORT nWhichP, const ScViewOptions& rOpt ) : SfxPoolItem ( nWhichP ), - theOptions ( rOpt ) + theOptions ( rOpt ) { } //------------------------------------------------------------------------ ScTpViewItem::ScTpViewItem( const ScTpViewItem& rItem ) - : SfxPoolItem ( rItem ), - theOptions ( rItem.theOptions ) + : SfxPoolItem ( rItem ), + theOptions ( rItem.theOptions ) { } @@ -291,67 +291,67 @@ SfxPoolItem* __EXPORT ScTpViewItem::Clone( SfxItemPool * ) const } //================================================================== -// Config Item containing view options +// Config Item containing view options //================================================================== -#define CFGPATH_LAYOUT "Office.Calc/Layout" - -#define SCLAYOUTOPT_GRIDLINES 0 -#define SCLAYOUTOPT_GRIDCOLOR 1 -#define SCLAYOUTOPT_PAGEBREAK 2 -#define SCLAYOUTOPT_GUIDE 3 -#define SCLAYOUTOPT_SIMPLECONT 4 -#define SCLAYOUTOPT_LARGECONT 5 -#define SCLAYOUTOPT_COLROWHDR 6 -#define SCLAYOUTOPT_HORISCROLL 7 -#define SCLAYOUTOPT_VERTSCROLL 8 -#define SCLAYOUTOPT_SHEETTAB 9 -#define SCLAYOUTOPT_OUTLINE 10 -#define SCLAYOUTOPT_COUNT 11 - -#define CFGPATH_DISPLAY "Office.Calc/Content/Display" - -#define SCDISPLAYOPT_FORMULA 0 -#define SCDISPLAYOPT_ZEROVALUE 1 -#define SCDISPLAYOPT_NOTETAG 2 -#define SCDISPLAYOPT_VALUEHI 3 -#define SCDISPLAYOPT_ANCHOR 4 -#define SCDISPLAYOPT_TEXTOVER 5 -#define SCDISPLAYOPT_OBJECTGRA 6 -#define SCDISPLAYOPT_CHART 7 -#define SCDISPLAYOPT_DRAWING 8 -#define SCDISPLAYOPT_COUNT 9 - -#define CFGPATH_GRID "Office.Calc/Grid" - -#define SCGRIDOPT_RESOLU_X 0 -#define SCGRIDOPT_RESOLU_Y 1 -#define SCGRIDOPT_SUBDIV_X 2 -#define SCGRIDOPT_SUBDIV_Y 3 -#define SCGRIDOPT_OPTION_X 4 -#define SCGRIDOPT_OPTION_Y 5 -#define SCGRIDOPT_SNAPTOGRID 6 -#define SCGRIDOPT_SYNCHRON 7 -#define SCGRIDOPT_VISIBLE 8 -#define SCGRIDOPT_SIZETOGRID 9 -#define SCGRIDOPT_COUNT 10 +#define CFGPATH_LAYOUT "Office.Calc/Layout" + +#define SCLAYOUTOPT_GRIDLINES 0 +#define SCLAYOUTOPT_GRIDCOLOR 1 +#define SCLAYOUTOPT_PAGEBREAK 2 +#define SCLAYOUTOPT_GUIDE 3 +#define SCLAYOUTOPT_SIMPLECONT 4 +#define SCLAYOUTOPT_LARGECONT 5 +#define SCLAYOUTOPT_COLROWHDR 6 +#define SCLAYOUTOPT_HORISCROLL 7 +#define SCLAYOUTOPT_VERTSCROLL 8 +#define SCLAYOUTOPT_SHEETTAB 9 +#define SCLAYOUTOPT_OUTLINE 10 +#define SCLAYOUTOPT_COUNT 11 + +#define CFGPATH_DISPLAY "Office.Calc/Content/Display" + +#define SCDISPLAYOPT_FORMULA 0 +#define SCDISPLAYOPT_ZEROVALUE 1 +#define SCDISPLAYOPT_NOTETAG 2 +#define SCDISPLAYOPT_VALUEHI 3 +#define SCDISPLAYOPT_ANCHOR 4 +#define SCDISPLAYOPT_TEXTOVER 5 +#define SCDISPLAYOPT_OBJECTGRA 6 +#define SCDISPLAYOPT_CHART 7 +#define SCDISPLAYOPT_DRAWING 8 +#define SCDISPLAYOPT_COUNT 9 + +#define CFGPATH_GRID "Office.Calc/Grid" + +#define SCGRIDOPT_RESOLU_X 0 +#define SCGRIDOPT_RESOLU_Y 1 +#define SCGRIDOPT_SUBDIV_X 2 +#define SCGRIDOPT_SUBDIV_Y 3 +#define SCGRIDOPT_OPTION_X 4 +#define SCGRIDOPT_OPTION_Y 5 +#define SCGRIDOPT_SNAPTOGRID 6 +#define SCGRIDOPT_SYNCHRON 7 +#define SCGRIDOPT_VISIBLE 8 +#define SCGRIDOPT_SIZETOGRID 9 +#define SCGRIDOPT_COUNT 10 Sequence<OUString> ScViewCfg::GetLayoutPropertyNames() { static const char* aPropNames[] = { - "Line/GridLine", // SCLAYOUTOPT_GRIDLINES - "Line/GridLineColor", // SCLAYOUTOPT_GRIDCOLOR - "Line/PageBreak", // SCLAYOUTOPT_PAGEBREAK - "Line/Guide", // SCLAYOUTOPT_GUIDE - "Line/SimpleControlPoint", // SCLAYOUTOPT_SIMPLECONT - "Line/LargeControlPoint", // SCLAYOUTOPT_LARGECONT - "Window/ColumnRowHeader", // SCLAYOUTOPT_COLROWHDR - "Window/HorizontalScroll", // SCLAYOUTOPT_HORISCROLL - "Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL - "Window/SheetTab", // SCLAYOUTOPT_SHEETTAB - "Window/OutlineSymbol" // SCLAYOUTOPT_OUTLINE + "Line/GridLine", // SCLAYOUTOPT_GRIDLINES + "Line/GridLineColor", // SCLAYOUTOPT_GRIDCOLOR + "Line/PageBreak", // SCLAYOUTOPT_PAGEBREAK + "Line/Guide", // SCLAYOUTOPT_GUIDE + "Line/SimpleControlPoint", // SCLAYOUTOPT_SIMPLECONT + "Line/LargeControlPoint", // SCLAYOUTOPT_LARGECONT + "Window/ColumnRowHeader", // SCLAYOUTOPT_COLROWHDR + "Window/HorizontalScroll", // SCLAYOUTOPT_HORISCROLL + "Window/VerticalScroll", // SCLAYOUTOPT_VERTSCROLL + "Window/SheetTab", // SCLAYOUTOPT_SHEETTAB + "Window/OutlineSymbol" // SCLAYOUTOPT_OUTLINE }; Sequence<OUString> aNames(SCLAYOUTOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -365,15 +365,15 @@ Sequence<OUString> ScViewCfg::GetDisplayPropertyNames() { static const char* aPropNames[] = { - "Formula", // SCDISPLAYOPT_FORMULA - "ZeroValue", // SCDISPLAYOPT_ZEROVALUE - "NoteTag", // SCDISPLAYOPT_NOTETAG - "ValueHighlighting", // SCDISPLAYOPT_VALUEHI - "Anchor", // SCDISPLAYOPT_ANCHOR - "TextOverflow", // SCDISPLAYOPT_TEXTOVER - "ObjectGraphic", // SCDISPLAYOPT_OBJECTGRA - "Chart", // SCDISPLAYOPT_CHART - "DrawingObject" // SCDISPLAYOPT_DRAWING + "Formula", // SCDISPLAYOPT_FORMULA + "ZeroValue", // SCDISPLAYOPT_ZEROVALUE + "NoteTag", // SCDISPLAYOPT_NOTETAG + "ValueHighlighting", // SCDISPLAYOPT_VALUEHI + "Anchor", // SCDISPLAYOPT_ANCHOR + "TextOverflow", // SCDISPLAYOPT_TEXTOVER + "ObjectGraphic", // SCDISPLAYOPT_OBJECTGRA + "Chart", // SCDISPLAYOPT_CHART + "DrawingObject" // SCDISPLAYOPT_DRAWING }; Sequence<OUString> aNames(SCDISPLAYOPT_COUNT); OUString* pNames = aNames.getArray(); @@ -387,23 +387,23 @@ Sequence<OUString> ScViewCfg::GetGridPropertyNames() { static const char* aPropNames[] = { - "Resolution/XAxis/NonMetric", // SCGRIDOPT_RESOLU_X - "Resolution/YAxis/NonMetric", // SCGRIDOPT_RESOLU_Y - "Subdivision/XAxis", // SCGRIDOPT_SUBDIV_X - "Subdivision/YAxis", // SCGRIDOPT_SUBDIV_Y - "Option/XAxis/NonMetric", // SCGRIDOPT_OPTION_X - "Option/YAxis/NonMetric", // SCGRIDOPT_OPTION_Y - "Option/SnapToGrid", // SCGRIDOPT_SNAPTOGRID - "Option/Synchronize", // SCGRIDOPT_SYNCHRON - "Option/VisibleGrid", // SCGRIDOPT_VISIBLE - "Option/SizeToGrid" // SCGRIDOPT_SIZETOGRID + "Resolution/XAxis/NonMetric", // SCGRIDOPT_RESOLU_X + "Resolution/YAxis/NonMetric", // SCGRIDOPT_RESOLU_Y + "Subdivision/XAxis", // SCGRIDOPT_SUBDIV_X + "Subdivision/YAxis", // SCGRIDOPT_SUBDIV_Y + "Option/XAxis/NonMetric", // SCGRIDOPT_OPTION_X + "Option/YAxis/NonMetric", // SCGRIDOPT_OPTION_Y + "Option/SnapToGrid", // SCGRIDOPT_SNAPTOGRID + "Option/Synchronize", // SCGRIDOPT_SYNCHRON + "Option/VisibleGrid", // SCGRIDOPT_VISIBLE + "Option/SizeToGrid" // SCGRIDOPT_SIZETOGRID }; Sequence<OUString> aNames(SCGRIDOPT_COUNT); OUString* pNames = aNames.getArray(); for(int i = 0; i < SCGRIDOPT_COUNT; i++) pNames[i] = OUString::createFromAscii(aPropNames[i]); - // adjust for metric system + // adjust for metric system if (ScOptionsUtil::IsMetricSystem()) { pNames[SCGRIDOPT_RESOLU_X] = OUString::createFromAscii( "Resolution/XAxis/Metric" ); @@ -543,7 +543,7 @@ ScViewCfg::ScViewCfg() : } aDisplayItem.SetCommitLink( LINK( this, ScViewCfg, DisplayCommitHdl ) ); - ScGridOptions aGrid = GetGridOptions(); //! initialization necessary? + ScGridOptions aGrid = GetGridOptions(); //! initialization necessary? aNames = GetGridPropertyNames(); aValues = aGridItem.GetProperties(aNames); aGridItem.EnableNotification(aNames); diff --git a/sc/source/core/tool/zforauto.cxx b/sc/source/core/tool/zforauto.cxx index 0b9f116aa153..3205faa38b18 100644 --- a/sc/source/core/tool/zforauto.cxx +++ b/sc/source/core/tool/zforauto.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 @@ -42,16 +42,16 @@ static const sal_Char __FAR_DATA pStandardName[] = "Standard"; //------------------------------------------------------------------------ ScNumFormatAbbrev::ScNumFormatAbbrev() : - sFormatstring ( RTL_CONSTASCII_USTRINGPARAM( pStandardName ) ), - eLnge (LANGUAGE_SYSTEM), - eSysLnge (LANGUAGE_GERMAN) // sonst passt "Standard" nicht + sFormatstring ( RTL_CONSTASCII_USTRINGPARAM( pStandardName ) ), + eLnge (LANGUAGE_SYSTEM), + eSysLnge (LANGUAGE_GERMAN) // sonst passt "Standard" nicht { } ScNumFormatAbbrev::ScNumFormatAbbrev(const ScNumFormatAbbrev& aFormat) : - sFormatstring (aFormat.sFormatstring), - eLnge (aFormat.eLnge), - eSysLnge (aFormat.eSysLnge) + sFormatstring (aFormat.sFormatstring), + eLnge (aFormat.eLnge), + eSysLnge (aFormat.eSysLnge) { } @@ -92,7 +92,7 @@ void ScNumFormatAbbrev::PutFormatIndex(ULONG nFormat, { DBG_ERROR("SCNumFormatAbbrev:: unbekanntes Zahlformat"); eLnge = LANGUAGE_SYSTEM; - eSysLnge = LANGUAGE_GERMAN; // sonst passt "Standard" nicht + eSysLnge = LANGUAGE_GERMAN; // sonst passt "Standard" nicht sFormatstring.AssignAscii( RTL_CONSTASCII_STRINGPARAM( pStandardName ) ); } } |