diff options
| author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:20:47 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-25 05:41:10 +0200 |
| commit | 37e6631cc5d4147e9d0a4ebefbd0c9d2a8137d24 (patch) | |
| tree | 060cf0aafda3f205b3e12508465a5403826d014d /sc/source/core | |
| parent | ed6b8a100c1aabb342573f252509573bbe124d29 (diff) | |
remove whitespace
Change-Id: Ib15413e73409cc33de01fa92a47b9d1237cfc4b2
Diffstat (limited to 'sc/source/core')
127 files changed, 0 insertions, 1106 deletions
diff --git a/sc/source/core/data/attarray.cxx b/sc/source/core/data/attarray.cxx index a8011c99c3d2..3cfc9be6ab41 100644 --- a/sc/source/core/data/attarray.cxx +++ b/sc/source/core/data/attarray.cxx @@ -49,7 +49,6 @@ // STATIC DATA ----------------------------------------------------------- - using ::editeng::SvxBorderLine; ScAttrArray::ScAttrArray( SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc ) : @@ -77,7 +76,6 @@ ScAttrArray::~ScAttrArray() delete[] pData; } - #if OSL_DEBUG_LEVEL > 1 void ScAttrArray::TestData() const { @@ -139,7 +137,6 @@ void ScAttrArray::Reset( const ScPatternAttr* pPattern ) pData[0].pPattern = pNewPattern; } - bool ScAttrArray::Concat(SCSIZE nPos) { bool bRet = false; @@ -208,7 +205,6 @@ bool ScAttrArray::Search( SCROW nRow, SCSIZE& nIndex ) const return bFound; } - const ScPatternAttr* ScAttrArray::GetPattern( SCROW nRow ) const { SCSIZE i; @@ -218,7 +214,6 @@ const ScPatternAttr* ScAttrArray::GetPattern( SCROW nRow ) const return NULL; } - const ScPatternAttr* ScAttrArray::GetPatternRange( SCROW& rStartRow, SCROW& rEndRow, SCROW nRow ) const { @@ -568,7 +563,6 @@ void ScAttrArray::SetPatternArea(SCROW nStartRow, SCROW nEndRow, const ScPattern #endif } - void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* pStyle ) { if (ValidRow(nStartRow) && ValidRow(nEndRow)) @@ -642,7 +636,6 @@ void ScAttrArray::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, ScStyleSheet* #endif } - // const cast, otherwise it will be too inefficient/complicated #define SET_LINECOLOR(dest,c) \ if ((dest)) \ @@ -786,7 +779,6 @@ void ScAttrArray::ApplyLineStyleArea( SCROW nStartRow, SCROW nEndRow, #undef SET_LINECOLOR #undef SET_LINE - void ScAttrArray::ApplyCacheArea( SCROW nStartRow, SCROW nEndRow, SfxItemPoolCache* pCache, ScEditDataArray* pDataArray ) { #if OSL_DEBUG_LEVEL > 1 @@ -915,7 +907,6 @@ static void lcl_MergeDeep( SfxItemSet& rMergeSet, const SfxItemSet& rSource ) } } - void ScAttrArray::MergePatternArea( SCROW nStartRow, SCROW nEndRow, ScMergePatternState& rState, bool bDeep ) const { @@ -995,7 +986,6 @@ static bool lcl_TestAttr( const SvxBorderLine* pOldLine, const SvxBorderLine* pN return true; // another line -> don't care } - static void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, const ScPatternAttr* pPattern, bool bLeft, SCCOL nDistRight, bool bTop, SCROW nDistBottom ) @@ -1059,7 +1049,6 @@ static void lcl_MergeToFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner } } - void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) const @@ -1094,10 +1083,8 @@ void ScAttrArray::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLine } } - // apply border - // ApplyFrame - on an entry into the array bool ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, @@ -1172,7 +1159,6 @@ bool ScAttrArray::ApplyFrame( const SvxBoxItem* pBoxItem, } } - void ScAttrArray::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) { @@ -1425,7 +1411,6 @@ bool ScAttrArray::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, return bFound; } - bool ScAttrArray::RemoveAreaMerge(SCROW nStartRow, SCROW nEndRow) { bool bFound = false; @@ -1493,7 +1478,6 @@ void ScAttrArray::DeleteAreaSafe(SCROW nStartRow, SCROW nEndRow) SetPatternAreaSafe( nStartRow, nEndRow, pDocument->GetDefPattern(), true ); } - void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr* pWantedPattern, bool bDefault ) { @@ -1549,7 +1533,6 @@ void ScAttrArray::SetPatternAreaSafe( SCROW nStartRow, SCROW nEndRow, } } - bool ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) { const ScPatternAttr* pOldPattern; @@ -1586,7 +1569,6 @@ bool ScAttrArray::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) return bChanged; } - bool ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) { const ScPatternAttr* pOldPattern; @@ -1623,7 +1605,6 @@ bool ScAttrArray::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags return bChanged; } - void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich ) { const ScPatternAttr* pOldPattern; @@ -1655,7 +1636,6 @@ void ScAttrArray::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* } } - void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement ) { SCSIZE nIndex; @@ -1717,7 +1697,6 @@ void ScAttrArray::ChangeIndent( SCROW nStartRow, SCROW nEndRow, bool bIncrement } } - SCsROW ScAttrArray::GetNextUnprotected( SCsROW nRow, bool bUp ) const { long nRet = nRow; @@ -1783,7 +1762,6 @@ void ScAttrArray::FindStyleSheet( const SfxStyleSheetBase* pStyleSheet, ScFlatBo } } - bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const { @@ -1809,7 +1787,6 @@ bool ScAttrArray::IsStyleSheetUsed( const ScStyleSheet& rStyle, return bIsUsed; } - bool ScAttrArray::IsEmpty() const { if (nCount == 1) @@ -1823,7 +1800,6 @@ bool ScAttrArray::IsEmpty() const return false; } - bool ScAttrArray::GetFirstVisibleAttr( SCROW& rFirstRow ) const { OSL_ENSURE( nCount, "nCount == 0" ); @@ -1920,7 +1896,6 @@ bool ScAttrArray::GetLastVisibleAttr( SCROW& rLastRow, SCROW nLastData, bool bFu return bFound; } - bool ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const { SCSIZE nIndex; @@ -1939,7 +1914,6 @@ bool ScAttrArray::HasVisibleAttrIn( SCROW nStartRow, SCROW nEndRow ) const return bFound; } - bool ScAttrArray::IsVisibleEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const { @@ -1976,7 +1950,6 @@ bool ScAttrArray::IsVisibleEqual( const ScAttrArray& rOther, return bEqual; } - bool ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW nEndRow ) const { // summarised with IsVisibleEqual @@ -2013,7 +1986,6 @@ bool ScAttrArray::IsAllEqual( const ScAttrArray& rOther, SCROW nStartRow, SCROW return bEqual; } - bool ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const { // Horizontal aggregate are not allowed to be moved out; if whole summary, @@ -2041,7 +2013,6 @@ bool ScAttrArray::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const return bTest; } - bool ScAttrArray::TestInsertRow( SCSIZE nSize ) const { // if 1st row pushed out is vertically overlapped, summary would be broken @@ -2059,7 +2030,6 @@ bool ScAttrArray::TestInsertRow( SCSIZE nSize ) const return true; } - void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize ) { if (!pData) @@ -2108,7 +2078,6 @@ void ScAttrArray::InsertRow( SCROW nStartRow, SCSIZE nSize ) RemoveFlags( nStartRow, nStartRow+nSize-1, SC_MF_HOR | SC_MF_VER | SC_MF_AUTO | SC_MF_BUTTON ); } - void ScAttrArray::DeleteRow( SCROW nStartRow, SCSIZE nSize ) { bool bFirst=true; @@ -2156,7 +2125,6 @@ void ScAttrArray::DeleteRow( SCROW nStartRow, SCSIZE nSize ) RemoveFlags( MAXROW-nSize+1, MAXROW, SC_MF_HOR | SC_MF_VER | SC_MF_AUTO ); } - void ScAttrArray::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ) { ScDocumentPool* pDocPool = pDocument->GetPool(); @@ -2167,7 +2135,6 @@ void ScAttrArray::DeleteRange( SCSIZE nStartIndex, SCSIZE nEndIndex ) nCount -= nEndIndex-nStartIndex+1; } - void ScAttrArray::DeleteArea(SCROW nStartRow, SCROW nEndRow) { RemoveAreaMerge( nStartRow, nEndRow ); // remove from combined flags @@ -2178,7 +2145,6 @@ void ScAttrArray::DeleteArea(SCROW nStartRow, SCROW nEndRow) DeleteAreaSafe( nStartRow, nEndRow ); // leave merge flags } - void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) { const ScPatternAttr* pDefPattern = pDocument->GetDefPattern(); @@ -2220,7 +2186,6 @@ void ScAttrArray::DeleteHardAttr(SCROW nStartRow, SCROW nEndRow) } } - // move within a document void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray) @@ -2239,7 +2204,6 @@ void ScAttrArray::MoveTo(SCROW nStartRow, SCROW nEndRow, ScAttrArray& rAttrArray DeleteArea(nStartRow, nEndRow); } - // copy between documents (Clipboard) void ScAttrArray::CopyArea( @@ -2305,7 +2269,6 @@ void ScAttrArray::CopyArea( } } - // leave flags // summarized with CopyArea @@ -2349,7 +2312,6 @@ void ScAttrArray::CopyAreaSafe( SCROW nStartRow, SCROW nEndRow, long nDy, ScAttr } } - SCsROW ScAttrArray::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp, const ScMarkArray* pMarkArray) const @@ -2413,7 +2375,6 @@ SCsROW ScAttrArray::SearchStyle( return nRow; } - bool ScAttrArray::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp, const ScMarkArray* pMarkArray) const diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx index 712bd0457e5c..07e3f29c9ba4 100644 --- a/sc/source/core/data/attrib.cxx +++ b/sc/source/core/data/attrib.cxx @@ -51,10 +51,8 @@ TYPEINIT1(ScDoubleItem, SfxPoolItem); TYPEINIT1(ScPageScaleToItem, SfxPoolItem); TYPEINIT1(ScCondFormatItem, SfxPoolItem); - // General Help Function - bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxBorderLine* pOther ) { @@ -87,7 +85,6 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB // Merge - ScMergeAttr::ScMergeAttr(): SfxPoolItem(ATTR_MERGE), nColMerge(0), @@ -143,10 +140,8 @@ SfxPoolItem* ScMergeAttr::Create( SvStream& rStream, sal_uInt16 /* nVer */ ) con return new ScMergeAttr(static_cast<SCCOL>(nCol),static_cast<SCROW>(nRow)); } - // MergeFlag - ScMergeFlagAttr::ScMergeFlagAttr(): SfxInt16Item(ATTR_MERGE_FLAG, 0) { @@ -171,10 +166,8 @@ bool ScMergeFlagAttr::HasPivotPopupButton() const return (GetValue() & SC_MF_BUTTON_POPUP) != 0; } - // Protection - ScProtectionAttr::ScProtectionAttr(): SfxPoolItem(ATTR_PROTECTION), bProtection(true), @@ -396,10 +389,8 @@ bool ScProtectionAttr::SetHidePrint( bool bHPrint) return true; } - // ScRangeItem - Tabellenbereich - bool ScRangeItem::operator==( const SfxPoolItem& rAttr ) const { OSL_ENSURE( SfxPoolItem::operator==(rAttr), "unequal types" ); @@ -445,10 +436,8 @@ SfxItemPresentation ScRangeItem::GetPresentation return ePres; } - // ScTableListItem - List from Tables (-numbers) - ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) : SfxPoolItem ( rCpy.Which() ), nCount ( rCpy.nCount ) @@ -464,7 +453,6 @@ ScTableListItem::ScTableListItem( const ScTableListItem& rCpy ) pTabArr = NULL; } - ScTableListItem::~ScTableListItem() { delete [] pTabArr; @@ -559,7 +547,6 @@ SfxItemPresentation ScTableListItem::GetPresentation // ScPageHFItem - Dates from the Head and Foot lines - ScPageHFItem::ScPageHFItem( sal_uInt16 nWhichP ) : SfxPoolItem ( nWhichP ), pLeftArea ( NULL ), @@ -809,7 +796,6 @@ SfxPoolItem* ScPageHFItem::Create( SvStream& rStream, sal_uInt16 nVer ) const return pItem; } - void ScPageHFItem::SetLeftArea( const EditTextObject& rNew ) { delete pLeftArea; @@ -840,10 +826,8 @@ void ScPageHFItem::SetArea( EditTextObject *pNew, int nArea ) } } - // ScViewObjectModeItem - Display Mode of View Objects - ScViewObjectModeItem::ScViewObjectModeItem( sal_uInt16 nWhichP ) : SfxEnumItem( nWhichP, VOBJ_MODE_SHOW ) { @@ -949,10 +933,8 @@ SfxPoolItem* ScViewObjectModeItem::Create( } } - // double - ScDoubleItem::ScDoubleItem( sal_uInt16 nWhichP, double nVal ) : SfxPoolItem ( nWhichP ), nValue ( nVal ) @@ -996,7 +978,6 @@ ScDoubleItem::~ScDoubleItem() { } - ScPageScaleToItem::ScPageScaleToItem() : SfxPoolItem( ATTR_PAGE_SCALETO ), mnWidth( 0 ), @@ -1130,7 +1111,6 @@ ScCondFormatItem* ScCondFormatItem::Clone(SfxItemPool*) const return new ScCondFormatItem(maIndex); } - void ScCondFormatItem::AddCondFormatData( sal_uInt32 nIndex ) { maIndex.push_back(nIndex); @@ -1141,5 +1121,4 @@ void ScCondFormatItem::SetCondFormatData( const std::vector<sal_uInt32>& rIndex maIndex = rIndex; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx index 2dfc9a7d6ac6..6d6eee24bde9 100644 --- a/sc/source/core/data/bcaslot.cxx +++ b/sc/source/core/data/bcaslot.cxx @@ -106,7 +106,6 @@ static SCSIZE nBcaSlots = initSlotDistribution( aSlotDistribution, nBcaSlotsRow) // Ensure that all static variables are initialized with this one call. #endif - ScBroadcastAreaSlot::ScBroadcastAreaSlot( ScDocument* pDocument, ScBroadcastAreaSlotMachine* pBASMa ) : aTmpSeekBroadcastArea( ScRange()), @@ -116,7 +115,6 @@ ScBroadcastAreaSlot::ScBroadcastAreaSlot( ScDocument* pDocument, { } - ScBroadcastAreaSlot::~ScBroadcastAreaSlot() { for ( ScBroadcastAreas::iterator aIter( aBroadcastAreaTbl.begin()); @@ -133,7 +131,6 @@ ScBroadcastAreaSlot::~ScBroadcastAreaSlot() } } - bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const { if ( pDoc->GetHardRecalcState() ) @@ -156,7 +153,6 @@ bool ScBroadcastAreaSlot::CheckHardRecalcStateCondition() const return false; } - bool ScBroadcastAreaSlot::StartListeningArea( const ScRange& rRange, SvtListener* pListener, ScBroadcastArea*& rpArea ) { @@ -199,7 +195,6 @@ bool ScBroadcastAreaSlot::StartListeningArea( const ScRange& rRange, return bNewArea; } - void ScBroadcastAreaSlot::InsertListeningArea( ScBroadcastArea* pArea ) { OSL_ENSURE( pArea, "InsertListeningArea: pArea NULL"); @@ -209,7 +204,6 @@ void ScBroadcastAreaSlot::InsertListeningArea( ScBroadcastArea* pArea ) pArea->IncRef(); } - // If rpArea != NULL then no listeners are stopped, only the area is removed // and the reference count decremented. void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, @@ -245,7 +239,6 @@ void ScBroadcastAreaSlot::EndListeningArea( const ScRange& rRange, } } - ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea( const ScRange& rRange ) const { @@ -253,7 +246,6 @@ ScBroadcastAreas::const_iterator ScBroadcastAreaSlot::FindBroadcastArea( return aBroadcastAreaTbl.find( &aTmpSeekBroadcastArea); } - bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) { if (aBroadcastAreaTbl.empty()) @@ -286,7 +278,6 @@ bool ScBroadcastAreaSlot::AreaBroadcast( const ScHint& rHint) return bIsBroadcasted; } - bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint) { @@ -319,7 +310,6 @@ bool ScBroadcastAreaSlot::AreaBroadcastInRange( const ScRange& rRange, return bIsBroadcasted; } - void ScBroadcastAreaSlot::DelBroadcastAreasInRange( const ScRange& rRange ) { if (aBroadcastAreaTbl.empty()) @@ -344,7 +334,6 @@ void ScBroadcastAreaSlot::DelBroadcastAreasInRange( const ScRange& rRange ) } } - void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode eUpdateRefMode, const ScRange& rRange, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) { @@ -389,7 +378,6 @@ void ScBroadcastAreaSlot::UpdateRemove( UpdateRefMode eUpdateRefMode, } } - void ScBroadcastAreaSlot::UpdateRemoveArea( ScBroadcastArea* pArea ) { ScBroadcastAreas::iterator aIter( aBroadcastAreaTbl.find( pArea)); @@ -404,7 +392,6 @@ void ScBroadcastAreaSlot::UpdateRemoveArea( ScBroadcastArea* pArea ) } } - void ScBroadcastAreaSlot::UpdateInsert( ScBroadcastArea* pArea ) { ::std::pair< ScBroadcastAreas::iterator, bool > aPair = @@ -429,7 +416,6 @@ void ScBroadcastAreaSlot::UpdateInsert( ScBroadcastArea* pArea ) } } - void ScBroadcastAreaSlot::EraseArea( ScBroadcastAreas::iterator& rIter ) { if (mbInBroadcastIteration) @@ -476,7 +462,6 @@ void ScBroadcastAreaSlot::FinallyEraseAreas() pBASM->FinallyEraseAreas( this); } - // --- ScBroadcastAreaSlotMachine ------------------------------------- ScBroadcastAreaSlotMachine::TableSlots::TableSlots() @@ -485,7 +470,6 @@ ScBroadcastAreaSlotMachine::TableSlots::TableSlots() memset( ppSlots, 0 , sizeof( ScBroadcastAreaSlot* ) * nBcaSlots ); } - ScBroadcastAreaSlotMachine::TableSlots::~TableSlots() { for ( ScBroadcastAreaSlot** pp = ppSlots + nBcaSlots; --pp >= ppSlots; /* nothing */ ) @@ -496,7 +480,6 @@ ScBroadcastAreaSlotMachine::TableSlots::~TableSlots() delete [] ppSlots; } - ScBroadcastAreaSlotMachine::ScBroadcastAreaSlotMachine( ScDocument* pDocument ) : pBCAlways( NULL ), @@ -507,7 +490,6 @@ ScBroadcastAreaSlotMachine::ScBroadcastAreaSlotMachine( { } - ScBroadcastAreaSlotMachine::~ScBroadcastAreaSlotMachine() { for (TableSlotsMap::iterator iTab( aTableSlotsMap.begin()); @@ -521,7 +503,6 @@ ScBroadcastAreaSlotMachine::~ScBroadcastAreaSlotMachine() SAL_WARN_IF( !maAreasToBeErased.empty(), "sc", "ScBroadcastAreaSlotMachine::dtor: maAreasToBeErased not empty"); } - inline SCSIZE ScBroadcastAreaSlotMachine::ComputeSlotOffset( const ScAddress& rAddress ) const { @@ -546,7 +527,6 @@ inline SCSIZE ScBroadcastAreaSlotMachine::ComputeSlotOffset( return nBcaSlots - 1; } - void ScBroadcastAreaSlotMachine::ComputeAreaPoints( const ScRange& rRange, SCSIZE& rStart, SCSIZE& rEnd, SCSIZE& rRowBreak ) const { @@ -557,7 +537,6 @@ void ScBroadcastAreaSlotMachine::ComputeAreaPoints( const ScRange& rRange, ScAddress( rRange.aStart.Col(), rRange.aEnd.Row(), 0 ) ) - rStart; } - inline void ComputeNextSlot( SCSIZE & nOff, SCSIZE & nBreak, ScBroadcastAreaSlot** & pp, SCSIZE & nStart, ScBroadcastAreaSlot** const & ppSlots, SCSIZE const & nRowBreak ) { @@ -575,7 +554,6 @@ inline void ComputeNextSlot( SCSIZE & nOff, SCSIZE & nBreak, ScBroadcastAreaSlot } } - void ScBroadcastAreaSlotMachine::StartListeningArea( const ScRange& rRange, SvtListener* pListener ) { @@ -623,7 +601,6 @@ void ScBroadcastAreaSlotMachine::StartListeningArea( const ScRange& rRange, } } - void ScBroadcastAreaSlotMachine::EndListeningArea( const ScRange& rRange, SvtListener* pListener ) { @@ -676,7 +653,6 @@ void ScBroadcastAreaSlotMachine::EndListeningArea( const ScRange& rRange, } } - bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const { const ScAddress& rAddress = rHint.GetAddress(); @@ -704,7 +680,6 @@ bool ScBroadcastAreaSlotMachine::AreaBroadcast( const ScHint& rHint ) const } } - bool ScBroadcastAreaSlotMachine::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) const { @@ -729,7 +704,6 @@ bool ScBroadcastAreaSlotMachine::AreaBroadcastInRange( const ScRange& rRange, return bBroadcasted; } - void ScBroadcastAreaSlotMachine::DelBroadcastAreasInRange( const ScRange& rRange ) { @@ -766,7 +740,6 @@ void ScBroadcastAreaSlotMachine::DelBroadcastAreasInRange( } } - // for all affected: remove, chain, update range, insert, and maybe delete void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode, @@ -942,13 +915,11 @@ void ScBroadcastAreaSlotMachine::UpdateBroadcastAreas( pEOUpdateChain = NULL; } - void ScBroadcastAreaSlotMachine::EnterBulkBroadcast() { ++nInBulkBroadcast; } - void ScBroadcastAreaSlotMachine::LeaveBulkBroadcast() { if (nInBulkBroadcast > 0) @@ -958,26 +929,22 @@ void ScBroadcastAreaSlotMachine::LeaveBulkBroadcast() } } - bool ScBroadcastAreaSlotMachine::InsertBulkArea( const ScBroadcastArea* pArea ) { return aBulkBroadcastAreas.insert( pArea ).second; } - size_t ScBroadcastAreaSlotMachine::RemoveBulkArea( const ScBroadcastArea* pArea ) { return aBulkBroadcastAreas.erase( pArea ); } - void ScBroadcastAreaSlotMachine::PushAreaToBeErased( ScBroadcastAreaSlot* pSlot, ScBroadcastAreas::iterator& rIter ) { maAreasToBeErased.push_back( ::std::make_pair( pSlot, rIter)); } - void ScBroadcastAreaSlotMachine::FinallyEraseAreas( ScBroadcastAreaSlot* pSlot ) { SAL_WARN_IF( pSlot->IsInBroadcastIteration(), "sc", diff --git a/sc/source/core/data/clipcontext.cxx b/sc/source/core/data/clipcontext.cxx index d5dc3dc15831..1afe1f5c61a2 100644 --- a/sc/source/core/data/clipcontext.cxx +++ b/sc/source/core/data/clipcontext.cxx @@ -53,8 +53,6 @@ void CopyFromClipContext::setTabRange(SCTAB nStart, SCTAB nEnd) mnTabEnd = nEnd; } - - void CopyFromClipContext::setDestRange( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { mnDestCol1 = nCol1; @@ -73,29 +71,21 @@ CopyFromClipContext::Range CopyFromClipContext::getDestRange() const return aRet; } - - - void CopyFromClipContext::setDeleteFlag( sal_uInt16 nFlag ) { mnDeleteFlag = nFlag; } - - void CopyFromClipContext::setCondFormatList( ScConditionalFormatList* pCondFormatList ) { mpCondFormatList = pCondFormatList; } - - void CopyFromClipContext::setSingleCellPattern( const ScPatternAttr* pAttr ) { mpSinglePattern = pAttr; } - void CopyFromClipContext::setSingleCellNote( const ScPostIt* pNote ) { mpSingleNote = pNote; @@ -106,10 +96,6 @@ void CopyFromClipContext::setTableProtected( bool b ) mbTableProtected = b; } - - - - bool CopyFromClipContext::isDateCell( const ScColumn& rCol, SCROW nRow ) const { sal_uLong nNumIndex = static_cast<const SfxUInt32Item*>(rCol.GetAttr(nRow, ATTR_VALUE_FORMAT))->GetValue(); @@ -123,8 +109,6 @@ CopyToClipContext::CopyToClipContext( CopyToClipContext::~CopyToClipContext() {} - - CopyToDocContext::CopyToDocContext(ScDocument& rDoc) : ClipContextBase(rDoc) {} CopyToDocContext::~CopyToDocContext() {} diff --git a/sc/source/core/data/colorscale.cxx b/sc/source/core/data/colorscale.cxx index d2e0eef2950b..d4726956b3bb 100644 --- a/sc/source/core/data/colorscale.cxx +++ b/sc/source/core/data/colorscale.cxx @@ -280,7 +280,6 @@ bool ScColorScaleEntry::NeedsRepaint() const return false; } - void ScColorScaleEntry::SetColor(const Color& rColor) { maColor = rColor; @@ -339,7 +338,6 @@ void ScColorScaleEntry::SetType( ScColorScaleEntryType eType ) } } - double ScColorScaleFormat::GetMinValue() const { const_iterator itr = maColorScales.begin(); @@ -841,7 +839,6 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const double nMin = getMin(nValMin, nValMax); double nMax = getMax(nValMin, nValMax); - double nValue = mpDoc->GetValue(rAddr); ScDataBarInfo* pInfo = new ScDataBarInfo(); @@ -908,7 +905,6 @@ ScDataBarInfo* ScDataBarFormat::GetDataBarInfo(const ScAddress& rAddr) const } } - // set color if(mpFormatData->mbNeg && nValue < 0) { diff --git a/sc/source/core/data/column.cxx b/sc/source/core/data/column.cxx index 0f5bc92f5291..c32fb011b3fe 100644 --- a/sc/source/core/data/column.cxx +++ b/sc/source/core/data/column.cxx @@ -92,14 +92,12 @@ ScColumn::ScColumn() : { } - ScColumn::~ScColumn() { FreeAll(); delete pAttrArray; } - void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc) { nCol = nNewCol; @@ -108,13 +106,11 @@ void ScColumn::Init(SCCOL nNewCol, SCTAB nNewTab, ScDocument* pDoc) pAttrArray = new ScAttrArray( nCol, nTab, pDocument ); } - SCsROW ScColumn::GetNextUnprotected( SCROW nRow, bool bUp ) const { return pAttrArray->GetNextUnprotected(nRow, bUp); } - sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const { using namespace sc; @@ -192,7 +188,6 @@ sal_uInt16 ScColumn::GetBlockMatrixEdges( SCROW nRow1, SCROW nRow2, sal_uInt16 n return nEdges; } - bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const { using namespace sc; @@ -304,13 +299,11 @@ bool ScColumn::HasSelectionMatrixFragment(const ScMarkData& rMark) const return false; } - bool ScColumn::HasAttrib( SCROW nRow1, SCROW nRow2, sal_uInt16 nMask ) const { return pAttrArray->HasAttrib( nRow1, nRow2, nMask ); } - bool ScColumn::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const { bool bFound = false; @@ -331,7 +324,6 @@ bool ScColumn::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) c return bFound; } - bool ScColumn::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, SCCOL& rPaintCol, SCROW& rPaintRow, bool bRefresh ) @@ -339,7 +331,6 @@ bool ScColumn::ExtendMerge( SCCOL nThisCol, SCROW nStartRow, SCROW nEndRow, return pAttrArray->ExtendMerge( nThisCol, nStartRow, nEndRow, rPaintCol, rPaintRow, bRefresh ); } - void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, bool bDeep ) const { SCROW nTop; @@ -357,13 +348,11 @@ void ScColumn::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkD } } - void ScColumn::MergePatternArea( ScMergePatternState& rState, SCROW nRow1, SCROW nRow2, bool bDeep ) const { pAttrArray->MergePatternArea( nRow1, nRow2, rState, bDeep ); } - void ScColumn::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) const @@ -371,26 +360,22 @@ void ScColumn::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInn pAttrArray->MergeBlockFrame( pLineOuter, pLineInner, rFlags, nStartRow, nEndRow, bLeft, nDistRight ); } - void ScColumn::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCROW nStartRow, SCROW nEndRow, bool bLeft, SCCOL nDistRight ) { pAttrArray->ApplyBlockFrame( pLineOuter, pLineInner, nStartRow, nEndRow, bLeft, nDistRight ); } - const ScPatternAttr* ScColumn::GetPattern( SCROW nRow ) const { return pAttrArray->GetPattern( nRow ); } - const SfxPoolItem* ScColumn::GetAttr( SCROW nRow, sal_uInt16 nWhich ) const { return &pAttrArray->GetPattern( nRow )->GetItemSet().Get(nWhich); } - const ScPatternAttr* ScColumn::GetMostUsedPattern( SCROW nStartRow, SCROW nEndRow ) const { ::std::map< const ScPatternAttr*, size_t > aAttrMap; @@ -431,13 +416,11 @@ sal_uInt32 ScColumn::GetNumberFormat( SCROW nStartRow, SCROW nEndRow ) const return nFormat; } - sal_uInt32 ScColumn::GetNumberFormat( SCROW nRow ) const { return pAttrArray->GetPattern( nRow )->GetNumberFormat( pDocument->GetFormatTable() ); } - SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray ) { SCROW nTop = 0; @@ -462,7 +445,6 @@ SCsROW ScColumn::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData return nBottom; } - void ScColumn::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark ) { SCROW nTop; @@ -489,7 +471,6 @@ void ScColumn::ClearSelectionItems( const sal_uInt16* pWhich,const ScMarkData& r } } - void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool bBroadcast ) { SCROW nTop; @@ -503,7 +484,6 @@ void ScColumn::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bo } } - void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ) { const SfxItemSet* pSet = &rPatAttr.GetItemSet(); @@ -521,7 +501,6 @@ void ScColumn::ApplyPattern( SCROW nRow, const ScPatternAttr& rPatAttr ) pAttrArray->SetPattern( nRow, pNewPattern ); } - void ScColumn::ApplyPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, ScEditDataArray* pDataArray ) { @@ -571,7 +550,6 @@ void ScColumn::RemoveCondFormat( SCROW nStartRow, SCROW nEndRow, sal_uInt32 nInd pAttrArray->RemoveCondFormat( nStartRow, nEndRow, nIndex ); } - void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ) { const ScPatternAttr* pPattern = pAttrArray->GetPattern(nRow); @@ -583,13 +561,11 @@ void ScColumn::ApplyStyle( SCROW nRow, const ScStyleSheet& rStyle ) } } - void ScColumn::ApplyStyleArea( SCROW nStartRow, SCROW nEndRow, const ScStyleSheet& rStyle ) { pAttrArray->ApplyStyleArea(nStartRow, nEndRow, (ScStyleSheet*)&rStyle); } - void ScColumn::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark) { SCROW nTop; @@ -603,7 +579,6 @@ void ScColumn::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& } } - void ScColumn::ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, bool bColorOnly ) { @@ -621,13 +596,11 @@ void ScColumn::ApplySelectionLineStyle( const ScMarkData& rMark, } } - const ScStyleSheet* ScColumn::GetStyle( SCROW nRow ) const { return pAttrArray->GetPattern( nRow )->GetStyleSheet(); } - const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const { rFound = false; @@ -664,7 +637,6 @@ const ScStyleSheet* ScColumn::GetSelectionStyle( const ScMarkData& rMark, bool& return bEqual ? pStyle : NULL; } - const ScStyleSheet* ScColumn::GetAreaStyle( bool& rFound, SCROW nRow1, SCROW nRow2 ) const { rFound = false; @@ -700,38 +672,32 @@ bool ScColumn::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyl return pAttrArray->IsStyleSheetUsed( rStyle, bGatherAllStyles ); } - bool ScColumn::ApplyFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) { return pAttrArray->ApplyFlags( nStartRow, nEndRow, nFlags ); } - bool ScColumn::RemoveFlags( SCROW nStartRow, SCROW nEndRow, sal_Int16 nFlags ) { return pAttrArray->RemoveFlags( nStartRow, nEndRow, nFlags ); } - void ScColumn::ClearItems( SCROW nStartRow, SCROW nEndRow, const sal_uInt16* pWhich ) { pAttrArray->ClearItems( nStartRow, nEndRow, pWhich ); } - void ScColumn::SetPattern( SCROW nRow, const ScPatternAttr& rPatAttr, bool bPutToPool ) { pAttrArray->SetPattern( nRow, &rPatAttr, bPutToPool ); } - void ScColumn::SetPatternArea( SCROW nStartRow, SCROW nEndRow, const ScPatternAttr& rPatAttr, bool bPutToPool ) { pAttrArray->SetPatternArea( nStartRow, nEndRow, &rPatAttr, bPutToPool ); } - void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) { // in order to only create a new SetItem, we don't need SfxItemPoolCache. @@ -750,8 +716,6 @@ void ScColumn::ApplyAttr( SCROW nRow, const SfxPoolItem& rAttr ) pDocPool->Remove( *pNewPattern ); // free up resources } - - ScRefCellValue ScColumn::GetCellValue( SCROW nRow ) const { std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nRow); @@ -839,7 +803,6 @@ bool ScColumn::TestInsertCol( SCROW nStartRow, SCROW nEndRow) const return pAttrArray ? pAttrArray->TestInsertCol(nStartRow, nEndRow) : true; } - bool ScColumn::TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const { // AttrArray only looks for merged cells @@ -870,7 +833,6 @@ bool ScColumn::TestInsertRow( SCROW nStartRow, SCSIZE nSize ) const return pAttrArray->TestInsertRow(nSize); } - void ScColumn::InsertRow( SCROW nStartRow, SCSIZE nSize ) { pAttrArray->InsertRow( nStartRow, nSize ); @@ -1670,7 +1632,6 @@ void ScColumn::CopyToColumn( } } - void ScColumn::UndoToColumn( sc::CopyToDocContext& rCxt, SCROW nRow1, SCROW nRow2, sal_uInt16 nFlags, bool bMarked, ScColumn& rColumn, const ScMarkData* pMarkData ) const @@ -1684,7 +1645,6 @@ void ScColumn::UndoToColumn( CopyToColumn(rCxt, nRow2+1, MAXROW, IDF_FORMULA, false, rColumn); } - void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const { // Copy cells from this column to the destination column only for those @@ -1709,7 +1669,6 @@ void ScColumn::CopyUpdated( const ScColumn& rPosCol, ScColumn& rDestCol ) const rDestCol.CellStorageModified(); } - void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) { // This is the scenario table, the data is copied into it @@ -1741,7 +1700,6 @@ void ScColumn::CopyScenarioFrom( const ScColumn& rSrcCol ) } } - void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const { // This is the scenario table, the data is copied to the other @@ -1772,7 +1730,6 @@ void ScColumn::CopyScenarioTo( ScColumn& rDestCol ) const } } - bool ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const { bool bOk = true; @@ -1790,7 +1747,6 @@ bool ScColumn::TestCopyScenarioTo( const ScColumn& rDestCol ) const return bOk; } - void ScColumn::MarkScenarioIn( ScMarkData& rDestMark ) const { ScRange aRange( nCol, 0, nTab ); @@ -2924,14 +2880,12 @@ void ScColumn::UpdateTranspose( const ScRange& rSource, const ScAddress& rDest, sc::ProcessFormula(maCells, aFunc); } - void ScColumn::UpdateGrow( const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY ) { UpdateGrowHandler aFunc(*this, rArea, nGrowX, nGrowY); sc::ProcessFormula(maCells, aFunc); } - void ScColumn::UpdateInsertTab( sc::RefUpdateInsertTabContext& rCxt ) { if (nTab >= rCxt.mnInsertPos) @@ -2984,14 +2938,12 @@ void ScColumn::UpdateMoveTab( sc::RefUpdateMoveTabContext& rCxt, SCTAB nTabNo ) CellStorageModified(); } - void ScColumn::UpdateCompile( bool bForceIfNameInUse ) { UpdateCompileHandler aFunc(bForceIfNameInUse); sc::ProcessFormula(maCells, aFunc); } - void ScColumn::SetTabNo(SCTAB nNewTab) { nTab = nNewTab; @@ -3318,7 +3270,6 @@ bool ScColumn::HasEditCells(SCROW nStartRow, SCROW nEndRow, SCROW& rFirst) return true; } - SCsROW ScColumn::SearchStyle( SCsROW nRow, const ScStyleSheet* pSearchStyle, bool bUp, bool bInSelection, const ScMarkData& rMark) const @@ -3334,7 +3285,6 @@ SCsROW ScColumn::SearchStyle( return pAttrArray->SearchStyle( nRow, pSearchStyle, bUp, NULL ); } - bool ScColumn::SearchStyleRange( SCsROW& rRow, SCsROW& rEndRow, const ScStyleSheet* pSearchStyle, bool bUp, bool bInSelection, const ScMarkData& rMark) const diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 744b64d1e484..2c6c89094b24 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -79,11 +79,8 @@ inline bool IsAmbiguousScript( sal_uInt8 nScript ) nScript != SCRIPTTYPE_COMPLEX ); } - // Data operations - - long ScColumn::GetNeededSize( SCROW nRow, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index 34a9506772e0..4947d9fd63d5 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -1445,7 +1445,6 @@ void ScColumn::MixData( CellStorageModified(); } - ScAttrIterator* ScColumn::CreateAttrIterator( SCROW nStartRow, SCROW nEndRow ) const { return new ScAttrIterator( pAttrArray, nStartRow, nEndRow ); @@ -1486,7 +1485,6 @@ void ScColumn::StartAllListeners() sc::ProcessFormula(maCells, aFunc); } - void ScColumn::StartNeededListeners() { StartNeededListenerHandler aFunc(pDocument); @@ -2118,10 +2116,8 @@ public: } - // GetDataEntries - Strings from continuous Section around nRow - // DATENT_MAX - max. number of entries in list for auto entry // DATENT_SEARCH - max. number of cells that get transparent - new: only count Strings #define DATENT_MAX 200 @@ -2271,7 +2267,6 @@ void ScColumn::RemoveProtected( SCROW nStartRow, SCROW nEndRow ) aFunc.commitCells(*this); } - void ScColumn::SetError( SCROW nRow, const sal_uInt16 nError) { if (!ValidRow(nRow)) @@ -2527,7 +2522,6 @@ sal_uInt16 ScColumn::GetErrCode( SCROW nRow ) const return const_cast<ScFormulaCell*>(p)->GetErrCode(); } - bool ScColumn::HasStringData( SCROW nRow ) const { std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nRow); @@ -2548,7 +2542,6 @@ bool ScColumn::HasStringData( SCROW nRow ) const return false; } - bool ScColumn::HasValueData( SCROW nRow ) const { std::pair<sc::CellStoreType::const_iterator,size_t> aPos = maCells.position(nRow); diff --git a/sc/source/core/data/compressedarray.cxx b/sc/source/core/data/compressedarray.cxx index a14cd9d2bec9..234d96ba29dc 100644 --- a/sc/source/core/data/compressedarray.cxx +++ b/sc/source/core/data/compressedarray.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "compressedarray.hxx" #include "address.hxx" @@ -36,7 +35,6 @@ ScCompressedArray<A,D>::ScCompressedArray( A nMaxAccessP, const D& rValue, pData[0].nEnd = nMaxAccess; } - template< typename A, typename D > ScCompressedArray<A,D>::ScCompressedArray( A nMaxAccessP, const D* pDataArray, size_t nDataCount ) @@ -63,14 +61,12 @@ ScCompressedArray<A,D>::ScCompressedArray( A nMaxAccessP, const D* pDataArray, Resize( nCount); } - template< typename A, typename D > ScCompressedArray<A,D>::~ScCompressedArray() { delete[] pData; } - template< typename A, typename D > void ScCompressedArray<A,D>::Resize( size_t nNewLimit) { @@ -84,7 +80,6 @@ void ScCompressedArray<A,D>::Resize( size_t nNewLimit) } } - template< typename A, typename D > size_t ScCompressedArray<A,D>::Search( A nAccess ) const { @@ -116,7 +111,6 @@ size_t ScCompressedArray<A,D>::Search( A nAccess ) const return (bFound ? static_cast<size_t>(i) : (nAccess < 0 ? 0 : nCount-1)); } - template< typename A, typename D > void ScCompressedArray<A,D>::SetValue( A nStart, A nEnd, const D& rValue ) { @@ -243,7 +237,6 @@ void ScCompressedArray<A,D>::SetValue( A nStart, A nEnd, const D& rValue ) } } - template< typename A, typename D > void ScCompressedArray<A,D>::CopyFrom( const ScCompressedArray<A,D>& rArray, A nStart, A nEnd, long nSourceDy ) @@ -263,7 +256,6 @@ void ScCompressedArray<A,D>::CopyFrom( const ScCompressedArray<A,D>& rArray, A n } } - template< typename A, typename D > const D& ScCompressedArray<A,D>::Insert( A nStart, size_t nAccessCount ) { @@ -286,7 +278,6 @@ const D& ScCompressedArray<A,D>::Insert( A nStart, size_t nAccessCount ) return rValue; } - template< typename A, typename D > void ScCompressedArray<A,D>::Remove( A nStart, size_t nAccessCount ) { @@ -323,7 +314,6 @@ void ScCompressedArray<A,D>::Remove( A nStart, size_t nAccessCount ) pData[nCount-1].nEnd = nMaxAccess; } - // === ScBitMaskCompressedArray ============================================== template< typename A, typename D > @@ -352,7 +342,6 @@ void ScBitMaskCompressedArray<A,D>::AndValue( A nStart, A nEnd, } while (nIndex < this->nCount); } - template< typename A, typename D > void ScBitMaskCompressedArray<A,D>::OrValue( A nStart, A nEnd, const D& rValueToOr ) @@ -379,7 +368,6 @@ void ScBitMaskCompressedArray<A,D>::OrValue( A nStart, A nEnd, } while (nIndex < this->nCount); } - template< typename A, typename D > void ScBitMaskCompressedArray<A,D>::CopyFromAnded( const ScBitMaskCompressedArray<A,D>& rArray, A nStart, A nEnd, diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index 2c6bc2918d29..e04acfbd475b 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -46,7 +46,6 @@ using namespace formula; - ScFormatEntry::ScFormatEntry(ScDocument* pDoc): mpDoc(pDoc) { @@ -1775,8 +1774,6 @@ void ScCondDateFormatEntry::SetDateType( condformat::ScCondFormatDateType eType meType = eType; } - - void ScCondDateFormatEntry::SetStyleName( const OUString& rStyleName ) { maStyleName = rStyleName; diff --git a/sc/source/core/data/dbdocutl.cxx b/sc/source/core/data/dbdocutl.cxx index 2465518c53ba..66aa2e2e2c84 100644 --- a/sc/source/core/data/dbdocutl.cxx +++ b/sc/source/core/data/dbdocutl.cxx @@ -192,5 +192,4 @@ void ScDatabaseDocUtil::PutData( ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx index 06519a0569b6..568e5f5d915f 100644 --- a/sc/source/core/data/dociter.cxx +++ b/sc/source/core/data/dociter.cxx @@ -931,15 +931,11 @@ bool ScCellIterator::getCurrent() return false; } - OUString ScCellIterator::getString() { return maCurCell.getString(mpDoc); } - - - ScCellValue ScCellIterator::getCellValue() const { ScCellValue aRet; @@ -966,7 +962,6 @@ ScCellValue ScCellIterator::getCellValue() const return aRet; } - bool ScCellIterator::hasString() const { return maCurCell.hasString(); @@ -1218,7 +1213,6 @@ void ScQueryCellIterator::AdvanceQueryParamEntryField() } } - bool ScQueryCellIterator::FindEqualOrSortedLastInRange( SCCOL& nFoundCol, SCROW& nFoundRow, bool bSearchForEqualAfterMismatch, bool bIgnoreMismatchOnLeadingStringsP ) @@ -1880,7 +1874,6 @@ bool ScQueryCellIterator::BinarySearch() } } - ScHorizontalCellIterator::ScHorizontalCellIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) : pDoc( pDocument ), @@ -2481,7 +2474,6 @@ bool ScUsedAreaIterator::GetNext() return bFound; } - ScDocAttrIterator::ScDocAttrIterator(ScDocument* pDocument, SCTAB nTable, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2) : diff --git a/sc/source/core/data/docpool.cxx b/sc/source/core/data/docpool.cxx index 7027e56babac..062297e86284 100644 --- a/sc/source/core/data/docpool.cxx +++ b/sc/source/core/data/docpool.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "scitems.hxx" #include <boost/static_assert.hpp> @@ -607,7 +606,6 @@ void ScDocumentPool::DeleteVersionMaps() // als noetig, um zu erkennen, wenn der RefCount aus Versehen doch "normal" veraendert // wird (Assertions). - const SfxPoolItem& ScDocumentPool::Put( const SfxPoolItem& rItem, sal_uInt16 nWhich ) { if ( rItem.Which() != ATTR_PATTERN ) // nur Pattern ist special diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx index 2b143ff0d873..8ea270aa2ce3 100644 --- a/sc/source/core/data/documen2.cxx +++ b/sc/source/core/data/documen2.cxx @@ -294,7 +294,6 @@ void ScDocument::SetStorageGrammar( formula::FormulaGrammar::Grammar eGram ) formula::FormulaGrammar::CONV_OOO); } - void ScDocument::SetDocVisible( bool bSet ) { // called from view ctor - only for a visible document, @@ -302,7 +301,6 @@ void ScDocument::SetDocVisible( bool bSet ) bIsVisible = bSet; } - sal_uInt32 ScDocument::GetDocumentID() const { const ScDocument* pThis = this; @@ -312,7 +310,6 @@ sal_uInt32 ScDocument::GetDocumentID() const return nCrc; } - void ScDocument::StartChangeTracking() { if (!pChangeTrack) @@ -334,7 +331,6 @@ void ScDocument::SetChangeTrack( ScChangeTrack* pTrack ) pChangeTrack = pTrack; } - IMPL_LINK_NOARG(ScDocument, TrackTimeHdl) { if ( ScDdeLink::IsInUpdate() ) // nicht verschachteln @@ -368,7 +364,6 @@ void ScDocument::SetExpandRefs( bool bVal ) bExpandRefs = bVal; } - void ScDocument::StartTrackTimer() { if (!aTrackTimer.IsActive()) // nicht ewig aufschieben @@ -543,7 +538,6 @@ ScNoteEditEngine& ScDocument::GetNoteEngine() return *pNoteEngine; } - void ScDocument::ResetClip( ScDocument* pSourceDoc, const ScMarkData* pMarks ) { if (bIsClip) @@ -1392,7 +1386,6 @@ void ScDocument::SetPreviewFont( SfxItemSet* pFont ) pPreviewFont = pFont; } - void ScDocument::SetPreviewSelection( ScMarkData& rSel ) { maPreviewSelection = rSel; diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index e25a742f60c7..766125cec96e 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -229,7 +229,6 @@ const ScRangeData* ScDocument::GetRangeAtBlock( const ScRange& rBlock, OUString* return pData; } - void ScDocument::SetDBCollection( ScDBCollection* pNewDBCollection, bool bRemoveAutoFilter ) { if (pDBCollection && bRemoveAutoFilter) @@ -324,7 +323,6 @@ ScDPCollection* ScDocument::GetDPCollection() return pDPCollection; } - ScDPObject* ScDocument::GetDPAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab) const { if (!pDPCollection) @@ -354,14 +352,12 @@ ScDPObject* ScDocument::GetDPAtBlock( const ScRange & rBlock ) const return NULL; } - void ScDocument::StopTemporaryChartLock() { if( apTemporaryChartLock.get() ) apTemporaryChartLock->StopLocking(); } - void ScDocument::SetChartListenerCollection( ScChartListenerCollection* pNewChartListenerCollection, bool bSetChartRangeLists ) @@ -450,7 +446,6 @@ formula::FormulaGrammar::AddressConvention ScDocument::GetAddressConvention() co return formula::FormulaGrammar::extractRefConvention(eGrammar); } - void ScDocument::SetGrammar( formula::FormulaGrammar::Grammar eGram ) { eGrammar = eGram; @@ -960,7 +955,6 @@ void ScDocument::AddUnoRefChange( sal_Int64 nId, const ScRangeList& rOldRanges ) pUnoRefUndoList->Add( nId, rOldRanges ); } - void ScDocument::UpdateReference( sc::RefUpdateContext& rCxt, ScDocument* pUndoDoc, bool bIncludeDraw, bool bUpdateNoteCaptionPos ) { @@ -1361,7 +1355,6 @@ SCSIZE ScDocument::Query(SCTAB nTab, const ScQueryParam& rQueryParam, bool bKeep return 0; } - void ScDocument::GetUpperCellString(SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rStr) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -1425,10 +1418,8 @@ bool ScDocument::HasRowHeader( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, return ValidTab(nTab) && maTabs[nTab] && maTabs[nTab]->HasRowHeader( nStartCol, nStartRow, nEndCol, nEndRow ); } - // GetFilterEntries - Eintraege fuer AutoFilter-Listbox - bool ScDocument::GetFilterEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bFilter, std::vector<ScTypedStrData>& rStrings, bool& rHasDates) { @@ -1483,10 +1474,8 @@ bool ScDocument::GetFilterEntries( return false; } - // GetFilterEntriesArea - Eintraege fuer Filter-Dialog - bool ScDocument::GetFilterEntriesArea( SCCOL nCol, SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bCaseSens, std::vector<ScTypedStrData>& rStrings, bool& rHasDates) @@ -1501,10 +1490,8 @@ bool ScDocument::GetFilterEntriesArea( return false; } - // GetDataEntries - Eintraege fuer Auswahlliste-Listbox (keine Zahlen / Formeln) - bool ScDocument::GetDataEntries( SCCOL nCol, SCROW nRow, SCTAB nTab, bool bCaseSens, std::vector<ScTypedStrData>& rStrings, bool bLimit ) @@ -1542,16 +1529,13 @@ bool ScDocument::GetDataEntries( return bRet; } - // GetFormulaEntries - Eintraege fuer Formel-AutoEingabe - bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) { // Bereichsnamen - if ( pRangeName ) { ScRangeName::const_iterator itr = pRangeName->begin(), itrEnd = pRangeName->end(); @@ -1559,10 +1543,8 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) rStrings.insert(ScTypedStrData(itr->second->GetName(), 0.0, ScTypedStrData::Name)); } - // Datenbank-Bereiche - if ( pDBCollection ) { const ScDBCollection::NamedDBs& rDBs = pDBCollection->getNamedDBs(); @@ -1571,10 +1553,8 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) rStrings.insert(ScTypedStrData(itr->GetName(), 0.0, ScTypedStrData::DbName)); } - // Inhalte von Beschriftungsbereichen - ScRangePairList* pLists[2]; pLists[0] = GetColNameRanges(); pLists[1] = GetRowNameRanges(); @@ -1603,8 +1583,6 @@ bool ScDocument::GetFormulaEntries( ScTypedCaseStrSet& rStrings ) return true; } - - void ScDocument::GetEmbedded( ScRange& rRange ) const { rRange = aEmbedRange; @@ -1655,7 +1633,6 @@ void ScDocument::ResetEmbedded() aEmbedRange = ScRange(); } - /** Similar to ScViewData::AddPixelsWhile(), but add height twips and only while result is less than nStopTwips. @return true if advanced at least one row. @@ -1758,7 +1735,6 @@ ScRange ScDocument::GetRange( SCTAB nTab, const Rectangle& rMMRect, bool bHidden bEnd = true; } - nSize = 0; nTwips = (long) (aPosRect.Top() / HMM_PER_TWIPS); diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx index a156c3ba8529..6c92c546cb30 100644 --- a/sc/source/core/data/documen4.cxx +++ b/sc/source/core/data/documen4.cxx @@ -49,7 +49,6 @@ using namespace formula; - /** (Goal Seek) Find a value of x that is a root of f(x) This function is used internally for the goal seek operation. It uses the @@ -702,10 +701,8 @@ double ScDocument::RoundValueAsShown( double fVal, sal_uInt32 nFormat ) const return fVal; } - // bedingte Formate und Gueltigkeitsbereiche - sal_uLong ScDocument::AddCondFormat( ScConditionalFormat* pNew, SCTAB nTab ) { if(!pNew) @@ -867,7 +864,6 @@ void ScDocument::SetCondFormList( ScConditionalFormatList* pList, SCTAB nTab ) maTabs[nTab]->SetCondFormList(pList); } - const ScValidationData* ScDocument::GetValidationEntry( sal_uLong nIndex ) const { if ( pValidationList ) @@ -915,7 +911,6 @@ void ScDocument::SetDetOpList(ScDetOpList* pNew) #define SC_DOCCOMP_COLUMNS 10 #define SC_DOCCOMP_ROWS 100 - sal_uInt16 ScDocument::RowDifferences( SCROW nThisRow, SCTAB nThisTab, ScDocument& rOtherDoc, SCROW nOtherRow, SCTAB nOtherTab, SCCOL nMaxCol, SCCOLROW* pOtherCols ) @@ -1017,7 +1012,6 @@ void ScDocument::FindOrder( SCCOLROW* pOtherRows, SCCOLROW nThisEndRow, SCCOLROW } bool bUseTotal = bColumns && !pTranslate; // nur beim ersten Durchgang - SCCOLROW nOtherRow = 0; sal_uInt16 nComp; SCCOLROW nThisRow; @@ -1152,10 +1146,8 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) bInFill = true; } - // Tabellen in der gefundenen Reihenfolge vergleichen - for (nThisTab=0; nThisTab<nThisCount; nThisTab++) { SCTAB nOtherTab = pOtherTabs[nThisTab]; @@ -1236,7 +1228,6 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) // bleibt bei pOtherCols, pOtherRows } - // Change-Actions erzeugen // 1) Spalten von rechts // 2) Zeilen von unten @@ -1353,6 +1344,4 @@ void ScDocument::CompareDocument( ScDocument& rOtherDoc ) } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/documen5.cxx b/sc/source/core/data/documen5.cxx index d89be232d223..85fa41378ffe 100644 --- a/sc/source/core/data/documen5.cxx +++ b/sc/source/core/data/documen5.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -572,7 +571,6 @@ void ScDocument::UpdateChartRef( UpdateRefMode eUpdateRefMode, } } - void ScDocument::SetChartRangeList( const OUString& rChartName, const ScRangeListRef& rNewRangeListRef ) { @@ -618,7 +616,6 @@ void ScDocument::SetChartRangeList( const OUString& rChartName, } } - bool ScDocument::HasData( SCCOL nCol, SCROW nRow, SCTAB nTab ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -783,5 +780,4 @@ void ScDocument::AddOLEObjectToCollection(const OUString& rName) rNonOleObjects.insert(rName); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/documen6.cxx b/sc/source/core/data/documen6.cxx index 22b6c77cb7fe..a9a51fdfe94b 100644 --- a/sc/source/core/data/documen6.cxx +++ b/sc/source/core/data/documen6.cxx @@ -37,11 +37,9 @@ using namespace com::sun::star; - // this file is compiled with exceptions enabled // put functions here that need exceptions! - const uno::Reference< i18n::XBreakIterator >& ScDocument::GetBreakIterator() { if ( !pScriptTypeData ) diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index a4897d7f266d..d973fc73c2a1 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -41,7 +41,6 @@ #include <tools/shl.hxx> - #include "globstr.hrc" extern const ScFormulaCell* pLastFormulaTreeTop; // cellform.cxx Err527 WorkAround @@ -56,7 +55,6 @@ void ScDocument::StartListeningArea( const ScRange& rRange, pBASM->StartListeningArea( rRange, pListener ); } - void ScDocument::EndListeningArea( const ScRange& rRange, SvtListener* pListener ) @@ -201,7 +199,6 @@ void ScDocument::AreaBroadcast( const ScHint& rHint ) } } - void ScDocument::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint ) { if ( !pBASM ) @@ -250,7 +247,6 @@ void ScDocument::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHin } } - void ScDocument::DelBroadcastAreasInRange( const ScRange& rRange ) { if ( pBASM ) @@ -323,7 +319,6 @@ void ScDocument::PutInFormulaTree( ScFormulaCell* pCell ) nFormulaCodeInTree += pCell->GetCode()->GetCodeLen(); } - void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell ) { OSL_ENSURE( pCell, "RemoveFromFormulaTree: pCell Null" ); @@ -358,13 +353,11 @@ void ScDocument::RemoveFromFormulaTree( ScFormulaCell* pCell ) } } - bool ScDocument::IsInFormulaTree( ScFormulaCell* pCell ) const { return pCell->GetPrevious() || pFormulaTree == pCell; } - void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSetAllDirty ) { OSL_ENSURE( !IsCalculatingFormulaTree(), "CalcFormulaTree recursion" ); @@ -475,7 +468,6 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet mpFormulaGroupCxt.reset(); } - void ScDocument::ClearFormulaTree() { ScFormulaCell* pCell; @@ -489,7 +481,6 @@ void ScDocument::ClearFormulaTree() } } - void ScDocument::AppendToFormulaTrack( ScFormulaCell* pCell ) { OSL_ENSURE( pCell, "AppendToFormulaTrack: pCell Null" ); @@ -506,7 +497,6 @@ void ScDocument::AppendToFormulaTrack( ScFormulaCell* pCell ) ++nFormulaTrackCount; } - void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell ) { OSL_ENSURE( pCell, "RemoveFromFormulaTrack: pCell Null" ); @@ -529,13 +519,11 @@ void ScDocument::RemoveFromFormulaTrack( ScFormulaCell* pCell ) } } - bool ScDocument::IsInFormulaTrack( ScFormulaCell* pCell ) const { return pCell->GetPreviousTrack() || pFormulaTrack == pCell; } - /* Der erste wird gebroadcastet, die dadurch entstehenden werden durch das Notify an den Track gehaengt. @@ -599,7 +587,6 @@ void ScDocument::TrackFormulas( sal_uLong nHintId ) OSL_ENSURE( nFormulaTrackCount==0, "TrackFormulas: nFormulaTrackCount!=0" ); } - void ScDocument::StartAllListeners() { for ( SCTAB i = 0; i < static_cast<SCTAB>(maTabs.size()); ++i ) diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx index 54f1508f9298..584c1f543b49 100644 --- a/sc/source/core/data/documen8.cxx +++ b/sc/source/core/data/documen8.cxx @@ -1184,7 +1184,6 @@ SfxBindings* ScDocument::GetViewBindings() return NULL; } - void ScDocument::TransliterateText( const ScMarkData& rMultiMark, sal_Int32 nType ) { OSL_ENSURE( rMultiMark.IsMultiMarked(), "TransliterateText: no selection" ); diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index c9fe85bdd7f3..b1ccc46de75f 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -307,7 +307,6 @@ bool ScDocument::HasOLEObjectsInArea( const ScRange& rRange, const ScMarkData* p return false; } - void ScDocument::StartAnimations( SCTAB nTab, Window* pWin ) { if (!pDrawLayer) @@ -334,7 +333,6 @@ void ScDocument::StartAnimations( SCTAB nTab, Window* pWin ) } } - bool ScDocument::HasBackgroundDraw( SCTAB nTab, const Rectangle& rMMRect ) const { // Gibt es Objekte auf dem Hintergrund-Layer, die (teilweise) von rMMRect diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx index fa71aa0d3c66..30b9a75c5a2b 100644 --- a/sc/source/core/data/document.cxx +++ b/sc/source/core/data/document.cxx @@ -300,7 +300,6 @@ void ScDocument::SetAnonymousDBData(SCTAB nTab, ScDBData* pDBData) maTabs[nTab]->SetAnonymousDBData(pDBData); } - bool ScDocument::ValidTabName( const OUString& rName ) { if (rName.isEmpty()) @@ -340,7 +339,6 @@ bool ScDocument::ValidTabName( const OUString& rName ) return true; } - bool ScDocument::ValidNewTabName( const OUString& rName ) const { bool bValid = ValidTabName(rName); @@ -355,7 +353,6 @@ bool ScDocument::ValidNewTabName( const OUString& rName ) const return bValid; } - void ScDocument::CreateValidTabName(OUString& rName) const { if ( !ValidTabName(rName) ) @@ -564,7 +561,6 @@ bool ScDocument::InsertTab( return bValid; } - bool ScDocument::InsertTabs( SCTAB nPos, const std::vector<OUString>& rNames, bool bExternalDocument, bool bNamesValid ) { @@ -654,7 +650,6 @@ bool ScDocument::InsertTabs( SCTAB nPos, const std::vector<OUString>& rNames, return bValid; } - bool ScDocument::DeleteTab( SCTAB nTab ) { bool bValid = false; @@ -740,7 +735,6 @@ bool ScDocument::DeleteTab( SCTAB nTab ) return bValid; } - bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets ) { bool bValid = false; @@ -831,7 +825,6 @@ bool ScDocument::DeleteTabs( SCTAB nTab, SCTAB nSheets ) return bValid; } - bool ScDocument::RenameTab( SCTAB nTab, const OUString& rName, bool /* bUpdateRef */, bool bExternalDocument ) { @@ -872,7 +865,6 @@ bool ScDocument::RenameTab( SCTAB nTab, const OUString& rName, bool /* bUpdateRe return bValid; } - void ScDocument::SetVisible( SCTAB nTab, bool bVisible ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size())) @@ -880,7 +872,6 @@ void ScDocument::SetVisible( SCTAB nTab, bool bVisible ) maTabs[nTab]->SetVisible(bVisible); } - bool ScDocument::IsVisible( SCTAB nTab ) const { if (ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size())) @@ -890,7 +881,6 @@ bool ScDocument::IsVisible( SCTAB nTab ) const return false; } - bool ScDocument::IsStreamValid( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) @@ -899,20 +889,17 @@ bool ScDocument::IsStreamValid( SCTAB nTab ) const return false; } - void ScDocument::SetStreamValid( SCTAB nTab, bool bSet, bool bIgnoreLock ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetStreamValid( bSet, bIgnoreLock ); } - void ScDocument::LockStreamValid( bool bLock ) { mbStreamValidLocked = bLock; } - bool ScDocument::IsPendingRowHeights( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) @@ -921,14 +908,12 @@ bool ScDocument::IsPendingRowHeights( SCTAB nTab ) const return false; } - void ScDocument::SetPendingRowHeights( SCTAB nTab, bool bSet ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetPendingRowHeights( bSet ); } - void ScDocument::SetLayoutRTL( SCTAB nTab, bool bRTL ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) @@ -973,7 +958,6 @@ void ScDocument::SetLayoutRTL( SCTAB nTab, bool bRTL ) } } - bool ScDocument::IsLayoutRTL( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size()) && maTabs[nTab] ) @@ -982,7 +966,6 @@ bool ScDocument::IsLayoutRTL( SCTAB nTab ) const return false; } - bool ScDocument::IsNegativePage( SCTAB nTab ) const { // Negative page area is always used for RTL layout. @@ -990,7 +973,6 @@ bool ScDocument::IsNegativePage( SCTAB nTab ) const return IsLayoutRTL( nTab ); } - /* ---------------------------------------------------------------------------- used search area: @@ -1000,7 +982,6 @@ bool ScDocument::IsNegativePage( SCTAB nTab ) const sweeps attributes all the way to bottom / right ---------------------------------------------------------------------------- */ - bool ScDocument::GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const { if (ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size())) @@ -1012,7 +993,6 @@ bool ScDocument::GetCellArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const return false; } - bool ScDocument::GetTableArea( SCTAB nTab, SCCOL& rEndCol, SCROW& rEndRow ) const { if (ValidTab(nTab) && nTab < static_cast<SCTAB> (maTabs.size())) @@ -1084,7 +1064,6 @@ void ScDocument::GetDataArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, maTabs[nTab]->GetDataArea( rStartCol, rStartRow, rEndCol, rEndRow, bIncludeOld, bOnlyDown ); } - void ScDocument::LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow ) { @@ -1093,7 +1072,6 @@ void ScDocument::LimitChartArea( SCTAB nTab, SCCOL& rStartCol, SCROW& rStartRow, maTabs[nTab]->LimitChartArea( rStartCol, rStartRow, rEndCol, rEndRow ); } - void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList ) { ScRangeListRef aNew = new ScRangeList; @@ -1127,7 +1105,6 @@ void ScDocument::LimitChartIfAll( ScRangeListRef& rRangeList ) rRangeList = aNew; } - static void lcl_GetFirstTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, const ScMarkData* pTabMark, SCTAB aMaxTab ) { // without ScMarkData, leave start/end unchanged @@ -1164,7 +1141,6 @@ static bool lcl_GetNextTabRange( SCTAB& rTabRangeStart, SCTAB& rTabRangeEnd, con return false; } - bool ScDocument::CanInsertRow( const ScRange& rRange ) const { SCCOL nStartCol = rRange.aStart.Col(); @@ -1310,7 +1286,6 @@ bool ScDocument::InsertRow( SCCOL nStartCol, SCTAB nStartTab, return bRet; } - bool ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc ) { return InsertRow( rRange.aStart.Col(), rRange.aStart.Tab(), @@ -1319,7 +1294,6 @@ bool ScDocument::InsertRow( const ScRange& rRange, ScDocument* pRefUndoDoc ) pRefUndoDoc ); } - void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, SCCOL nEndCol, SCTAB nEndTab, SCROW nStartRow, SCSIZE nSize, @@ -1402,7 +1376,6 @@ void ScDocument::DeleteRow( SCCOL nStartCol, SCTAB nStartTab, pChartListenerCollection->UpdateDirtyCharts(); } - void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, bool* pUndoOutline ) { DeleteRow( rRange.aStart.Col(), rRange.aStart.Tab(), @@ -1411,7 +1384,6 @@ void ScDocument::DeleteRow( const ScRange& rRange, ScDocument* pRefUndoDoc, bool pRefUndoDoc, pUndoOutline ); } - bool ScDocument::CanInsertCol( const ScRange& rRange ) const { SCCOL nStartCol = rRange.aStart.Col(); @@ -1511,7 +1483,6 @@ bool ScDocument::InsertCol( SCROW nStartRow, SCTAB nStartTab, return bRet; } - bool ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc ) { return InsertCol( rRange.aStart.Row(), rRange.aStart.Tab(), @@ -1520,7 +1491,6 @@ bool ScDocument::InsertCol( const ScRange& rRange, ScDocument* pRefUndoDoc ) pRefUndoDoc ); } - void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTAB nEndTab, SCCOL nStartCol, SCSIZE nSize, ScDocument* pRefUndoDoc, bool* pUndoOutline, const ScMarkData* pTabMark ) @@ -1601,7 +1571,6 @@ void ScDocument::DeleteCol(SCROW nStartRow, SCTAB nStartTab, SCROW nEndRow, SCTA pChartListenerCollection->UpdateDirtyCharts(); } - void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, bool* pUndoOutline ) { DeleteCol( rRange.aStart.Row(), rRange.aStart.Tab(), @@ -1610,11 +1579,9 @@ void ScDocument::DeleteCol( const ScRange& rRange, ScDocument* pRefUndoDoc, bool pRefUndoDoc, pUndoOutline ); } - // fuer Area-Links: Zellen einuegen/loeschen, wenn sich der Bereich veraendert // (ohne Paint) - static void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, ScRange& rColRange, bool& rInsCol, bool& rDelCol, ScRange& rRowRange, bool& rInsRow, bool& rDelRow ) @@ -1663,7 +1630,6 @@ static void lcl_GetInsDelRanges( const ScRange& rOld, const ScRange& rNew, } } - bool ScDocument::HasPartOfMerged( const ScRange& rRange ) { bool bPart = false; @@ -1763,7 +1729,6 @@ bool ScDocument::CanFitBlock( const ScRange& rOld, const ScRange& rNew ) return bOk; } - void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, bool bClear ) { if (bClear) @@ -1796,7 +1761,6 @@ void ScDocument::FitBlock( const ScRange& rOld, const ScRange& rNew, bool bClear } } - void ScDocument::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, sal_uInt16 nDelFlag) @@ -1812,7 +1776,6 @@ void ScDocument::DeleteArea(SCCOL nCol1, SCROW nRow1, SetAutoCalc( bOldAutoCalc ); } - void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, SCTAB nTab, sal_uInt16 nDelFlag) @@ -1828,7 +1791,6 @@ void ScDocument::DeleteAreaTab(SCCOL nCol1, SCROW nRow1, } } - void ScDocument::DeleteAreaTab( const ScRange& rRange, sal_uInt16 nDelFlag ) { for ( SCTAB nTab = rRange.aStart.Tab(); nTab <= rRange.aEnd.Tab(); nTab++ ) @@ -1837,7 +1799,6 @@ void ScDocument::DeleteAreaTab( const ScRange& rRange, sal_uInt16 nDelFlag ) nTab, nDelFlag ); } - void ScDocument::InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSelection, bool bColInfo, bool bRowInfo ) { @@ -1871,7 +1832,6 @@ void ScDocument::InitUndoSelected( ScDocument* pSrcDoc, const ScMarkData& rTabSe } } - void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, bool bColInfo, bool bRowInfo ) { @@ -1900,7 +1860,6 @@ void ScDocument::InitUndo( ScDocument* pSrcDoc, SCTAB nTab1, SCTAB nTab2, } } - void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, bool bColInfo, bool bRowInfo ) { if (bIsUndo) @@ -1923,7 +1882,6 @@ void ScDocument::AddUndoTab( SCTAB nTab1, SCTAB nTab2, bool bColInfo, bool bRowI } } - void ScDocument::SetCutMode( bool bVal ) { if (bIsClip) @@ -1934,7 +1892,6 @@ void ScDocument::SetCutMode( bool bVal ) } } - bool ScDocument::IsCutMode() { if (bIsClip) @@ -1946,7 +1903,6 @@ bool ScDocument::IsCutMode() } } - void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nFlags, bool bOnlyMarked, ScDocument* pDestDoc, @@ -1974,7 +1930,6 @@ void ScDocument::CopyToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } } - void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nFlags, bool bOnlyMarked, ScDocument* pDestDoc, @@ -2005,7 +1960,6 @@ void ScDocument::UndoToDocument(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } } - void ScDocument::CopyToDocument(const ScRange& rRange, sal_uInt16 nFlags, bool bOnlyMarked, ScDocument* pDestDoc, const ScMarkData* pMarks, bool bColRowFlags) @@ -2032,7 +1986,6 @@ void ScDocument::CopyToDocument(const ScRange& rRange, pDestDoc->SetAutoCalc( bOldAutoCalc ); } - void ScDocument::UndoToDocument(const ScRange& rRange, sal_uInt16 nFlags, bool bOnlyMarked, ScDocument* pDestDoc, const ScMarkData* pMarks) @@ -2231,7 +2184,6 @@ void ScDocument::CopyTabToClip(SCCOL nCol1, SCROW nRow1, } } - void ScDocument::TransposeClip( ScDocument* pTransClip, sal_uInt16 nFlags, bool bAsLink ) { OSL_ENSURE( bIsClip && pTransClip && pTransClip->bIsClip, @@ -2456,7 +2408,6 @@ bool ScDocument::IsClipboardSource() const xPoolHelper->GetDocPool() == pClipDoc->xPoolHelper->GetDocPool(); } - void ScDocument::StartListeningFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, sal_uInt16 nInsFlag ) @@ -2472,7 +2423,6 @@ void ScDocument::StartListeningFromClip( SCCOL nCol1, SCROW nRow1, } } - void ScDocument::BroadcastFromClip( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, sal_uInt16 nInsFlag ) @@ -2581,7 +2531,6 @@ void ScDocument::CopyBlockFromClip( } } - void ScDocument::CopyNonFilteredFromClip( sc::CopyFromClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, const ScMarkData& rMark, SCsCOL nDx, SCROW & rClipStartRow ) @@ -2629,7 +2578,6 @@ void ScDocument::CopyNonFilteredFromClip( rClipStartRow = nSourceRow; } - void ScDocument::CopyFromClip( const ScRange& rDestRange, const ScMarkData& rMark, sal_uInt16 nInsFlag, ScDocument* pRefUndoDoc, ScDocument* pClipDoc, bool bResetCut, @@ -2929,7 +2877,6 @@ void ScDocument::SetClipArea( const ScRange& rArea, bool bCut ) } } - void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, bool bIncludeFiltered) { if (!bIsClip) @@ -2982,7 +2929,6 @@ void ScDocument::GetClipArea(SCCOL& nClipX, SCROW& nClipY, bool bIncludeFiltered } } - void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY) { if (bIsClip) @@ -3000,7 +2946,6 @@ void ScDocument::GetClipStart(SCCOL& nClipX, SCROW& nClipY) } } - bool ScDocument::HasClipFilteredRows() { // count on first used table in clipboard @@ -3022,7 +2967,6 @@ bool ScDocument::HasClipFilteredRows() return false; } - void ScDocument::MixDocument( const ScRange& rRange, sal_uInt16 nFunction, bool bSkipEmpty, ScDocument* pSrcDoc ) { @@ -3043,7 +2987,6 @@ void ScDocument::MixDocument( const ScRange& rRange, sal_uInt16 nFunction, bool } } - void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink ) @@ -3107,7 +3050,6 @@ void ScDocument::FillTab( const ScRange& rSrcArea, const ScMarkData& rMark, } } - void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, sal_uInt16 nFlags, sal_uInt16 nFunction, bool bSkipEmpty, bool bAsLink ) @@ -3170,7 +3112,6 @@ void ScDocument::FillTabMarked( SCTAB nSrcTab, const ScMarkData& rMark, } } - bool ScDocument::SetString( SCCOL nCol, SCROW nRow, SCTAB nTab, const OUString& rString, ScSetStringParam* pParam ) { @@ -3376,7 +3317,6 @@ sal_uInt16 ScDocument::GetStringForFormula( const ScAddress& rPos, OUString& rSt return nErr; } - void ScDocument::GetValue( SCCOL nCol, SCROW nRow, SCTAB nTab, double& rValue ) const { if (TableExists(nTab)) @@ -3486,7 +3426,6 @@ void ScDocument::GetNumberFormatInfo( short& nType, sal_uLong& nIndex, } } - void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rFormula ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3495,7 +3434,6 @@ void ScDocument::GetFormula( SCCOL nCol, SCROW nRow, SCTAB nTab, OUString& rForm rFormula = OUString(); } - const ScFormulaCell* ScDocument::GetFormulaCell( const ScAddress& rPos ) const { if (!TableExists(rPos.Tab())) @@ -3520,7 +3458,6 @@ CellType ScDocument::GetCellType( const ScAddress& rPos ) const return CELLTYPE_NONE; } - void ScDocument::GetCellType( SCCOL nCol, SCROW nRow, SCTAB nTab, CellType& rCellType ) const { @@ -3538,7 +3475,6 @@ bool ScDocument::HasStringData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const return false; } - bool ScDocument::HasValueData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3570,7 +3506,6 @@ bool ScDocument::HasStringCells( const ScRange& rRange ) const return false; } - bool ScDocument::HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { sal_uInt32 nValidation = static_cast< const SfxUInt32Item* >( GetAttr( nCol, nRow, nTab, ATTR_VALIDDATA ) )->GetValue(); @@ -3583,7 +3518,6 @@ bool ScDocument::HasSelectionData( SCCOL nCol, SCROW nRow, SCTAB nTab ) const return HasStringCells( ScRange( nCol, 0, nTab, nCol, MAXROW, nTab ) ); } - void ScDocument::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt ) { bool bOldAutoCalc = GetAutoCalc(); @@ -3605,7 +3539,6 @@ void ScDocument::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt ) SetAutoCalc( bOldAutoCalc ); } - void ScDocument::SetDirty( const ScRange& rRange ) { bool bOldAutoCalc = GetAutoCalc(); @@ -3619,7 +3552,6 @@ void ScDocument::SetDirty( const ScRange& rRange ) SetAutoCalc( bOldAutoCalc ); } - void ScDocument::SetTableOpDirty( const ScRange& rRange ) { bool bOldAutoCalc = GetAutoCalc(); @@ -3654,7 +3586,6 @@ void ScDocument::InterpretDirtyCells( const ScRangeList& rRanges ) mpFormulaGroupCxt.reset(); } - void ScDocument::AddTableOpFormulaCell( ScFormulaCell* pCell ) { if ( !aTableOpList.empty() ) @@ -3675,7 +3606,6 @@ void ScDocument::AddTableOpFormulaCell( ScFormulaCell* pCell ) } } - void ScDocument::CalcAll() { ClearFormulaContext(); @@ -3691,7 +3621,6 @@ void ScDocument::CalcAll() ClearFormulaTree(); } - void ScDocument::CompileAll() { sc::CompileFormulaContext aCxt(this); @@ -3704,7 +3633,6 @@ void ScDocument::CompileAll() SetAllFormulasDirty(aFormulaDirtyCxt); } - void ScDocument::CompileXML() { bool bOldAutoCalc = GetAutoCalc(); @@ -3787,7 +3715,6 @@ void ScDocument::CalcAfterLoad() } } - sal_uInt16 ScDocument::GetErrCode( const ScAddress& rPos ) const { SCTAB nTab = rPos.Tab(); @@ -3796,7 +3723,6 @@ sal_uInt16 ScDocument::GetErrCode( const ScAddress& rPos ) const return 0; } - void ScDocument::ResetChanged( const ScRange& rRange ) { SCTAB nTabSize = static_cast<SCTAB>(maTabs.size()); @@ -3807,7 +3733,6 @@ void ScDocument::ResetChanged( const ScRange& rRange ) maTabs[nTab]->ResetChanged(rRange); } - // Spaltenbreiten / Zeilenhoehen -------------------------------------- void ScDocument::SetColWidth( SCCOL nCol, SCTAB nTab, sal_uInt16 nNewWidth ) @@ -3828,7 +3753,6 @@ void ScDocument::SetRowHeight( SCROW nRow, SCTAB nTab, sal_uInt16 nNewHeight ) maTabs[nTab]->SetRowHeight( nRow, nNewHeight ); } - void ScDocument::SetRowHeightRange( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt16 nNewHeight ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3848,7 +3772,6 @@ void ScDocument::SetManualHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bo maTabs[nTab]->SetManualHeight( nStartRow, nEndRow, bManual ); } - sal_uInt16 ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3857,7 +3780,6 @@ sal_uInt16 ScDocument::GetColWidth( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) return 0; } - sal_uInt16 ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3866,7 +3788,6 @@ sal_uInt16 ScDocument::GetOriginalWidth( SCCOL nCol, SCTAB nTab ) const return 0; } - sal_uInt16 ScDocument::GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3875,7 +3796,6 @@ sal_uInt16 ScDocument::GetCommonWidth( SCCOL nEndCol, SCTAB nTab ) const return 0; } - sal_uInt16 ScDocument::GetOriginalHeight( SCROW nRow, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3884,7 +3804,6 @@ sal_uInt16 ScDocument::GetOriginalHeight( SCROW nRow, SCTAB nTab ) const return 0; } - sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3893,7 +3812,6 @@ sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, bool bHiddenAsZero return 0; } - sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3902,7 +3820,6 @@ sal_uInt16 ScDocument::GetRowHeight( SCROW nRow, SCTAB nTab, SCROW* pStartRow, S return 0; } - sal_uLong ScDocument::GetRowHeight( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool bHiddenAsZero ) const { if (nStartRow == nEndRow) @@ -3950,7 +3867,6 @@ SCROW ScDocument::GetHiddenRowCount( SCROW nRow, SCTAB nTab ) const return 0; } - sal_uLong ScDocument::GetColOffset( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3959,7 +3875,6 @@ sal_uLong ScDocument::GetColOffset( SCCOL nCol, SCTAB nTab, bool bHiddenAsZero ) return 0; } - sal_uLong ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -3968,7 +3883,6 @@ sal_uLong ScDocument::GetRowOffset( SCROW nRow, SCTAB nTab, bool bHiddenAsZero ) return 0; } - sal_uInt16 ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, const Fraction& rZoomX, const Fraction& rZoomY, @@ -3982,7 +3896,6 @@ sal_uInt16 ScDocument::GetOptimalColWidth( SCCOL nCol, SCTAB nTab, OutputDevice* return 0; } - long ScDocument::GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, OutputDevice* pDev, double nPPTX, double nPPTY, @@ -3996,7 +3909,6 @@ long ScDocument::GetNeededSize( SCCOL nCol, SCROW nRow, SCTAB nTab, return 0; } - bool ScDocument::SetOptimalHeight( sc::RowHeightContext& rCxt, SCROW nStartRow, SCROW nEndRow, SCTAB nTab ) { ScTable* pTab = FetchTable(nTab); @@ -4006,7 +3918,6 @@ bool ScDocument::SetOptimalHeight( sc::RowHeightContext& rCxt, SCROW nStartRow, return pTab->SetOptimalHeight(rCxt, nStartRow, nEndRow); } - void ScDocument::UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkData* pTabMark ) { // one progress across all (selected) sheets @@ -4030,42 +3941,36 @@ void ScDocument::UpdateAllRowHeights( sc::RowHeightContext& rCxt, const ScMarkDa // Spalten-/Zeilen-Flags ---------------------------------------------- - void ScDocument::ShowCol(SCCOL nCol, SCTAB nTab, bool bShow) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ShowCol( nCol, bShow ); } - void ScDocument::ShowRow(SCROW nRow, SCTAB nTab, bool bShow) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ShowRow( nRow, bShow ); } - void ScDocument::ShowRows(SCROW nRow1, SCROW nRow2, SCTAB nTab, bool bShow) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ShowRows( nRow1, nRow2, bShow ); } - void ScDocument::SetRowFlags( SCROW nRow, SCTAB nTab, sal_uInt8 nNewFlags ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetRowFlags( nRow, nNewFlags ); } - void ScDocument::SetRowFlags( SCROW nStartRow, SCROW nEndRow, SCTAB nTab, sal_uInt8 nNewFlags ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetRowFlags( nStartRow, nEndRow, nNewFlags ); } - sal_uInt8 ScDocument::GetColFlags( SCCOL nCol, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4269,7 +4174,6 @@ void ScDocument::SetRowFiltered(SCROW nStartRow, SCROW nEndRow, SCTAB nTab, bool maTabs[nTab]->SetRowFiltered(nStartRow, nEndRow, bFiltered); } - SCROW ScDocument::FirstNonFilteredRow(SCROW nStartRow, SCROW nEndRow, SCTAB nTab) const { if (!ValidTab(nTab) || nTab >= static_cast<SCTAB>(maTabs.size()) || !maTabs[nTab]) @@ -4319,7 +4223,6 @@ SCROW ScDocument::GetLastFlaggedRow( SCTAB nTab ) const return 0; } - SCCOL ScDocument::GetLastChangedCol( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4334,7 +4237,6 @@ SCROW ScDocument::GetLastChangedRow( SCTAB nTab ) const return 0; } - SCCOL ScDocument::GetNextDifferentChangedCol( SCTAB nTab, SCCOL nStart) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4454,17 +4356,14 @@ void ScDocument::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SC maTabs[nTab]->StripHidden( rX1, rY1, rX2, rY2 ); } - void ScDocument::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2, SCTAB nTab ) { if ( ValidTab(nTab) && maTabs[nTab] ) maTabs[nTab]->ExtendHidden( rX1, rY1, rX2, rY2 ); } - // Attribute ---------------------------------------------------------- - const SfxPoolItem* ScDocument::GetAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, sal_uInt16 nWhich ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4507,22 +4406,18 @@ const ScPatternAttr* ScDocument::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow return NULL; } - - void ScDocument::ApplyAttr( SCCOL nCol, SCROW nRow, SCTAB nTab, const SfxPoolItem& rAttr ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ApplyAttr( nCol, nRow, rAttr ); } - void ScDocument::ApplyPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->ApplyPattern( nCol, nRow, rAttr ); } - void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark, @@ -4536,7 +4431,6 @@ void ScDocument::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, maTabs[*itr]->ApplyPatternArea( nStartCol, nStartRow, nEndCol, nEndRow, rAttr, pDataArray ); } - void ScDocument::ApplyPatternAreaTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, const ScPatternAttr& rAttr ) { @@ -4585,7 +4479,6 @@ void ScDocument::RemoveCondFormatData( const ScRangeList& rRange, SCTAB nTab, sa maTabs[nTab]->RemoveCondFormatData(rRange, nIndex); } - void ScDocument::ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScStyleSheet& rStyle) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size())) @@ -4593,7 +4486,6 @@ void ScDocument::ApplyStyle( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScStyleSh maTabs[nTab]->ApplyStyle( nCol, nRow, rStyle ); } - void ScDocument::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark, @@ -4606,7 +4498,6 @@ void ScDocument::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, maTabs[*itr]->ApplyStyleArea( nStartCol, nStartRow, nEndCol, nEndRow, rStyle ); } - void ScDocument::ApplyStyleAreaTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, const ScStyleSheet& rStyle) { @@ -4615,7 +4506,6 @@ void ScDocument::ApplyStyleAreaTab( SCCOL nStartCol, SCROW nStartRow, maTabs[nTab]->ApplyStyleArea( nStartCol, nStartRow, nEndCol, nEndRow, rStyle ); } - void ScDocument::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark) { // ApplySelectionStyle needs multi mark @@ -4636,7 +4526,6 @@ void ScDocument::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkDat } } - void ScDocument::ApplySelectionLineStyle( const ScMarkData& rMark, const SvxBorderLine* pLine, bool bColorOnly ) { @@ -4650,7 +4539,6 @@ void ScDocument::ApplySelectionLineStyle( const ScMarkData& rMark, maTabs[*itr]->ApplySelectionLineStyle( rMark, pLine, bColorOnly ); } - const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -4659,7 +4547,6 @@ const ScStyleSheet* ScDocument::GetStyle( SCCOL nCol, SCROW nRow, SCTAB nTab ) c return NULL; } - const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) const { bool bEqual = true; @@ -4706,7 +4593,6 @@ const ScStyleSheet* ScDocument::GetSelectionStyle( const ScMarkData& rMark ) con return bEqual ? pStyle : NULL; } - void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, @@ -4725,7 +4611,6 @@ void ScDocument::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool b } } - bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const { if ( bStyleSheetUsageInvalid || rStyle.GetUsage() == ScStyleSheet::UNKNOWN ) @@ -4766,7 +4651,6 @@ bool ScDocument::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllSt return rStyle.GetUsage() == ScStyleSheet::USED; } - bool ScDocument::ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, sal_Int16 nFlags ) { @@ -4778,7 +4662,6 @@ bool ScDocument::ApplyFlagsTab( SCCOL nStartCol, SCROW nStartRow, return false; } - bool ScDocument::RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab, sal_Int16 nFlags ) { @@ -4790,7 +4673,6 @@ bool ScDocument::RemoveFlagsTab( SCCOL nStartCol, SCROW nStartRow, return false; } - void ScDocument::SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPatternAttr& rAttr, bool bPutToPool ) { @@ -4799,7 +4681,6 @@ void ScDocument::SetPattern( SCCOL nCol, SCROW nRow, SCTAB nTab, const ScPattern maTabs[nTab]->SetPattern( nCol, nRow, rAttr, bPutToPool ); } - void ScDocument::SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, bool bPutToPool ) { @@ -4808,7 +4689,6 @@ void ScDocument::SetPattern( const ScAddress& rPos, const ScPatternAttr& rAttr, maTabs[nTab]->SetPattern( rPos, rAttr, bPutToPool ); } - ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, bool bDeep ) { ScMergePatternState aState; @@ -4841,7 +4721,6 @@ ScPatternAttr* ScDocument::CreateSelectionPattern( const ScMarkData& rMark, bool return new ScPatternAttr( GetPool() ); // empty } - const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, bool bDeep ) { delete pSelectionAttr; @@ -4849,7 +4728,6 @@ const ScPatternAttr* ScDocument::GetSelectionPattern( const ScMarkData& rMark, b return pSelectionAttr; } - void ScDocument::GetSelectionFrame( const ScMarkData& rMark, SvxBoxItem& rLineOuter, SvxBoxInfoItem& rLineInner ) @@ -4893,7 +4771,6 @@ void ScDocument::GetSelectionFrame( const ScMarkData& rMark, rLineInner.SetValid( VALID_VERT, ( aFlags.nVert != SC_LINE_DONTCARE ) ); } - bool ScDocument::HasAttrib( SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt16 nMask ) const { @@ -5058,7 +4935,6 @@ bool ScDocument::IsBlockEmpty( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, return false; } - void ScDocument::LockTable(SCTAB nTab) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5069,7 +4945,6 @@ void ScDocument::LockTable(SCTAB nTab) } } - void ScDocument::UnlockTable(SCTAB nTab) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5080,7 +4955,6 @@ void ScDocument::UnlockTable(SCTAB nTab) } } - bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const @@ -5104,7 +4978,6 @@ bool ScDocument::IsBlockEditable( SCTAB nTab, SCCOL nStartCol, SCROW nStartRow, return false; } - bool ScDocument::IsSelectionEditable( const ScMarkData& rMark, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const { @@ -5156,7 +5029,6 @@ bool ScDocument::IsSelectionEditable( const ScMarkData& rMark, return bOk; } - bool ScDocument::HasSelectedBlockMatrixFragment( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScMarkData& rMark ) const @@ -5222,7 +5094,6 @@ bool ScDocument::GetMatrixFormulaRange( const ScAddress& rCellPos, ScRange& rMat return true; } - bool ScDocument::ExtendOverlapped( SCCOL& rStartCol, SCROW& rStartRow, SCCOL nEndCol, SCROW nEndRow, SCTAB nTab ) const { @@ -5305,7 +5176,6 @@ bool ScDocument::ExtendMergeSel( SCCOL nStartCol, SCROW nStartRow, return bFound; } - bool ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, SCTAB nTab, bool bRefresh ) @@ -5327,7 +5197,6 @@ bool ScDocument::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, return bFound; } - bool ScDocument::ExtendMerge( ScRange& rRange, bool bRefresh ) { bool bFound = false; @@ -5495,7 +5364,6 @@ bool ScDocument::IsHorOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const } } - bool ScDocument::IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const { const ScMergeFlagAttr* pAttr = (const ScMergeFlagAttr*) @@ -5509,7 +5377,6 @@ bool ScDocument::IsVerOverlapped( SCCOL nCol, SCROW nRow, SCTAB nTab ) const } } - void ScDocument::ApplySelectionFrame( const ScMarkData& rMark, const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ) @@ -5534,7 +5401,6 @@ void ScDocument::ApplySelectionFrame( const ScMarkData& rMark, } } - void ScDocument::ApplyFrameAreaTab( const ScRange& rRange, const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner ) @@ -5548,7 +5414,6 @@ void ScDocument::ApplyFrameAreaTab( const ScRange& rRange, rRange.aEnd.Col(), rRange.aEnd.Row() ); } - void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMarkData& rMark, ScEditDataArray* pDataArray ) { const SfxItemSet* pSet = &rAttr.GetItemSet(); @@ -5580,7 +5445,6 @@ void ScDocument::ApplySelectionPattern( const ScPatternAttr& rAttr, const ScMark } } - void ScDocument::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark ) { SCTAB nMax = static_cast<SCTAB>(maTabs.size()); @@ -5590,7 +5454,6 @@ void ScDocument::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark maTabs[*itr]->ChangeSelectionIndent( bIncrement, rMark ); } - void ScDocument::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ) { SCTAB nMax = static_cast<SCTAB>(maTabs.size()); @@ -5600,7 +5463,6 @@ void ScDocument::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData maTabs[*itr]->ClearSelectionItems( pWhich, rMark ); } - void ScDocument::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool bBroadcast ) { SCTAB nMax = static_cast<SCTAB>(maTabs.size()); @@ -5610,7 +5472,6 @@ void ScDocument::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, maTabs[*itr]->DeleteSelection(nDelFlag, rMark, bBroadcast); } - void ScDocument::DeleteSelectionTab( SCTAB nTab, sal_uInt16 nDelFlag, const ScMarkData& rMark, bool bBroadcast ) { @@ -5622,13 +5483,11 @@ void ScDocument::DeleteSelectionTab( } } - ScPatternAttr* ScDocument::GetDefPattern() const { return (ScPatternAttr*) &xPoolHelper->GetDocPool()->GetDefaultItem(ATTR_PATTERN); } - ScDocumentPool* ScDocument::GetPool() { return xPoolHelper->GetDocPool(); @@ -5639,7 +5498,6 @@ ScStyleSheetPool* ScDocument::GetStyleSheetPool() const return xPoolHelper->GetStylePool(); } - SCSIZE ScDocument::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCTAB nStartTab, SCCOL nEndCol, SCROW nEndRow, SCTAB nEndTab, ScDirection eDir ) { @@ -5657,14 +5515,12 @@ SCSIZE ScDocument::GetEmptyLinesInBlock( SCCOL nStartCol, SCROW nStartRow, SCTAB return 0; } - void ScDocument::FindAreaPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, ScMoveDirection eDirection ) const { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->FindAreaPos( rCol, rRow, eDirection ); } - void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, SCsROW nMovY, bool bMarked, bool bUnprotected, const ScMarkData& rMark ) const { @@ -5678,7 +5534,6 @@ void ScDocument::GetNextPos( SCCOL& rCol, SCROW& rRow, SCTAB nTab, SCsCOL nMovX, maTabs[nTab]->GetNextPos( rCol, rRow, nMovX, nMovY, bMarked, bUnprotected, aCopyMark ); } - // Datei-Operationen void ScDocument::UpdStlShtPtrsFrmNms() @@ -5698,7 +5553,6 @@ void ScDocument::UpdStlShtPtrsFrmNms() ((ScPatternAttr&)pPool->GetDefaultItem(ATTR_PATTERN)).UpdateStyleSheet(); } - void ScDocument::StylesToNames() { ScPatternAttr::pDoc = this; @@ -5716,7 +5570,6 @@ void ScDocument::StylesToNames() ((ScPatternAttr&)pPool->GetDefaultItem(ATTR_PATTERN)).StyleToName(); } - sal_uLong ScDocument::GetCellCount() const { sal_uLong nCellCount = 0L; @@ -5741,21 +5594,18 @@ sal_uLong ScDocument::GetCodeCount() const return nCodeCount; } - void ScDocument::PageStyleModified( SCTAB nTab, const OUString& rNewName ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->PageStyleModified( rNewName ); } - void ScDocument::SetPageStyle( SCTAB nTab, const OUString& rName ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) maTabs[nTab]->SetPageStyle( rName ); } - const OUString ScDocument::GetPageStyle( SCTAB nTab ) const { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5764,7 +5614,6 @@ const OUString ScDocument::GetPageStyle( SCTAB nTab ) const return OUString(); } - void ScDocument::SetPageSize( SCTAB nTab, const Size& rSize ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5780,7 +5629,6 @@ Size ScDocument::GetPageSize( SCTAB nTab ) const return Size(); } - void ScDocument::SetRepeatArea( SCTAB nTab, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCROW nEndRow ) { if ( ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] ) @@ -5814,7 +5662,6 @@ bool ScDocument::HasManualBreaks( SCTAB nTab ) const return false; } - void ScDocument::GetDocStat( ScDocStat& rDocStat ) { rDocStat.nTableCount = GetTableCount(); @@ -5822,7 +5669,6 @@ void ScDocument::GetDocStat( ScDocStat& rDocStat ) rDocStat.nCellCount = GetCellCount(); } - bool ScDocument::HasPrintRange() { bool bResult = false; @@ -5835,13 +5681,11 @@ bool ScDocument::HasPrintRange() return bResult; } - bool ScDocument::IsPrintEntireSheet( SCTAB nTab ) const { return (ValidTab(nTab) ) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab] && maTabs[nTab]->IsPrintEntireSheet(); } - sal_uInt16 ScDocument::GetPrintRangeCount( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -5850,7 +5694,6 @@ sal_uInt16 ScDocument::GetPrintRangeCount( SCTAB nTab ) return 0; } - const ScRange* ScDocument::GetPrintRange( SCTAB nTab, sal_uInt16 nPos ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -5859,7 +5702,6 @@ const ScRange* ScDocument::GetPrintRange( SCTAB nTab, sal_uInt16 nPos ) return NULL; } - const ScRange* ScDocument::GetRepeatColRange( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -5868,7 +5710,6 @@ const ScRange* ScDocument::GetRepeatColRange( SCTAB nTab ) return NULL; } - const ScRange* ScDocument::GetRepeatRowRange( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) @@ -5877,42 +5718,36 @@ const ScRange* ScDocument::GetRepeatRowRange( SCTAB nTab ) return NULL; } - void ScDocument::ClearPrintRanges( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->ClearPrintRanges(); } - void ScDocument::AddPrintRange( SCTAB nTab, const ScRange& rNew ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->AddPrintRange( rNew ); } - void ScDocument::SetPrintEntireSheet( SCTAB nTab ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->SetPrintEntireSheet(); } - void ScDocument::SetRepeatColRange( SCTAB nTab, const ScRange* pNew ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->SetRepeatColRange( pNew ); } - void ScDocument::SetRepeatRowRange( SCTAB nTab, const ScRange* pNew ) { if (ValidTab(nTab) && nTab < static_cast<SCTAB>(maTabs.size()) && maTabs[nTab]) maTabs[nTab]->SetRepeatRowRange( pNew ); } - ScPrintRangeSaver* ScDocument::CreatePrintRangeSaver() const { SCTAB nCount = static_cast<SCTAB>(maTabs.size()); @@ -5923,7 +5758,6 @@ ScPrintRangeSaver* ScDocument::CreatePrintRangeSaver() const return pNew; } - void ScDocument::RestorePrintRanges( const ScPrintRangeSaver& rSaver ) { SCTAB nCount = rSaver.GetTabCount(); @@ -5932,7 +5766,6 @@ void ScDocument::RestorePrintRanges( const ScPrintRangeSaver& rSaver ) maTabs[i]->RestorePrintRanges( rSaver.GetTabData(i) ); } - bool ScDocument::NeedPageResetAfterTab( SCTAB nTab ) const { // Die Seitennummern-Zaehlung faengt bei einer Tabelle neu an, wenn eine @@ -6079,7 +5912,6 @@ void ScDocument::EnableUndo( bool bVal ) mbUndoEnabled = bVal; } - void ScDocument::EnableUserInteraction( bool bVal ) { mbUserInteractionEnabled = bVal; diff --git a/sc/source/core/data/document10.cxx b/sc/source/core/data/document10.cxx index a2aac0ac1a93..a1733629d790 100644 --- a/sc/source/core/data/document10.cxx +++ b/sc/source/core/data/document10.cxx @@ -239,7 +239,6 @@ void ScDocument::SetCalcConfig( const ScCalcConfig& rConfig ) maCalcConfig = rConfig; } - void ScDocument::PreprocessRangeNameUpdate() { sc::EndListeningContext aEndListenCxt(*this); diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx index bf402f5beb4d..96435573617c 100644 --- a/sc/source/core/data/dpcache.cxx +++ b/sc/source/core/data/dpcache.cxx @@ -829,7 +829,6 @@ size_t ScDPCache::GetGroupFieldCount() const return maGroupFields.size(); } - SCROW ScDPCache::GetDataSize() const { OSL_ENSURE(mnDataSize <= GetRowCount(), "Data size should never be larger than the row count."); @@ -908,7 +907,6 @@ void ScDPCache::RemoveReference(ScDPObject* pObj) const mpDoc->GetDPCollection()->RemoveCache(this); } - SCROW ScDPCache::GetIdByItemData(long nDim, const ScDPItemData& rItem) const { if (nDim < 0) @@ -1148,7 +1146,6 @@ SCROW ScDPCache::GetOrder(long /*nDim*/, SCROW nIndex) const ; - #if DEBUG_PIVOT_TABLE namespace { diff --git a/sc/source/core/data/dpdimsave.cxx b/sc/source/core/data/dpdimsave.cxx index 9deb8a92909d..7579a16923e5 100644 --- a/sc/source/core/data/dpdimsave.cxx +++ b/sc/source/core/data/dpdimsave.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "dpdimsave.hxx" #include "dpgroup.hxx" #include "dpobject.hxx" diff --git a/sc/source/core/data/dpfilteredcache.cxx b/sc/source/core/data/dpfilteredcache.cxx index 1569034291ac..44efca627033 100644 --- a/sc/source/core/data/dpfilteredcache.cxx +++ b/sc/source/core/data/dpfilteredcache.cxx @@ -410,7 +410,6 @@ bool ScDPFilteredCache::isRowQualified(sal_Int32 nRow, const vector<Criterion>& return true; } - #if DEBUG_PIVOT_TABLE using std::cout; using std::endl; diff --git a/sc/source/core/data/dpgroup.cxx b/sc/source/core/data/dpgroup.cxx index 2b38717f54f5..f59a4ba97d08 100644 --- a/sc/source/core/data/dpgroup.cxx +++ b/sc/source/core/data/dpgroup.cxx @@ -434,7 +434,6 @@ void ScDPGroupDimension::SetDateDimension() mbDateDimension = true; } - ScDPNumGroupDimension::ScDPNumGroupDimension() : mbDateDimension(false) {} ScDPNumGroupDimension::ScDPNumGroupDimension( const ScDPNumGroupInfo& rInfo ) : @@ -456,7 +455,6 @@ void ScDPNumGroupDimension::DisposeData() maMemberEntries.clear(); } - ScDPNumGroupDimension::~ScDPNumGroupDimension() { } @@ -494,7 +492,6 @@ ScDPGroupTableData::~ScDPGroupTableData() delete[] pNumGroups; } - void ScDPGroupTableData::AddGroupDimension( const ScDPGroupDimension& rGroup ) { ScDPGroupDimension aNewGroup( rGroup ); diff --git a/sc/source/core/data/dpobject.cxx b/sc/source/core/data/dpobject.cxx index 98e6fa29a898..481541e3c881 100644 --- a/sc/source/core/data/dpobject.cxx +++ b/sc/source/core/data/dpobject.cxx @@ -408,7 +408,6 @@ void ScDPObject::SetHeaderLayout (bool bUseGrid) mbHeaderLayout = bUseGrid; } - void ScDPObject::SetOutRange(const ScRange& rRange) { aOutRange = rRange; @@ -1677,10 +1676,8 @@ bool ScDPObject::ParseFilters( std::vector<OUString> aFieldNames; // column/row/data fields std::vector< uno::Sequence<OUString> > aFieldValues; - // get all the field and item names - uno::Reference<container::XNameAccess> xDimsName = xSource->getDimensions(); uno::Reference<container::XIndexAccess> xIntDims = new ScNameToIndexAccess( xDimsName ); sal_Int32 nDimCount = xIntDims->getCount(); @@ -1744,10 +1741,8 @@ bool ScDPObject::ParseFilters( } } - // compare and build filters - SCSIZE nDataFields = aDataNames.size(); SCSIZE nFieldCount = aFieldNames.size(); OSL_ENSURE( aGivenNames.size() == nDataFields && aFieldValues.size() == nFieldCount, "wrong count" ); @@ -2465,7 +2460,6 @@ bool ScDPObject::GetMembersNA( sal_Int32 nDim, sal_Int32 nHier, uno::Reference< return bRet; } - // convert old pivot tables into new datapilot tables namespace { @@ -3146,7 +3140,6 @@ uno::Reference<sdbc::XRowSet> ScDPCollection::DBCaches::createRowSet( return xRowSet; } - // set source parameters uno::Any aAny; @@ -3618,9 +3611,6 @@ bool ScDPCollection::InsertNewTable(ScDPObject* pDPObj) return true; } - - - ScRangeList ScDPCollection::GetAllTableRanges( SCTAB nTab ) const { return std::for_each(maTables.begin(), maTables.end(), AccumulateOutputRanges(nTab)).getRanges(); diff --git a/sc/source/core/data/dpoutput.cxx b/sc/source/core/data/dpoutput.cxx index 0cec6affe9ac..a23110bf73f8 100644 --- a/sc/source/core/data/dpoutput.cxx +++ b/sc/source/core/data/dpoutput.cxx @@ -259,7 +259,6 @@ void ScDPOutputImpl::OutputBlockFrame ( SCCOL nStartCol, SCROW nStartRow, SCCOL else aBox.SetLine(&aLine, BOX_LINE_BOTTOM); - SvxBoxInfoItem aBoxInfo( ATTR_BORDER_INNER ); aBoxInfo.SetValid(VALID_VERT,false ); if ( bHori ) @@ -860,7 +859,6 @@ void ScDPOutput::FieldCell( pDoc->ApplyFlagsTab(nCol, nRow, nCol, nRow, nTab, nMergeFlag); } - lcl_SetStyleById( pDoc,nTab, nCol,nRow, nCol,nRow, STR_PIVOT_STYLE_FIELDNAME ); } @@ -1229,7 +1227,6 @@ void ScDPOutput::SetHeaderLayout(bool bUseGrid) bSizesValid = false; } - namespace { void lcl_GetTableVars( sal_Int32& rGrandTotalCols, sal_Int32& rGrandTotalRows, sal_Int32& rDataLayoutIndex, @@ -1812,5 +1809,4 @@ bool ScDPOutput::GetHeaderDrag( const ScAddress& rPos, bool bMouseLeft, bool bMo return false; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpsave.cxx b/sc/source/core/data/dpsave.cxx index 91fab1cca7e6..51b524f71246 100644 --- a/sc/source/core/data/dpsave.cxx +++ b/sc/source/core/data/dpsave.cxx @@ -865,7 +865,6 @@ const OUString* ScDPSaveData::GetGrandTotalName() const return mpGrandTotalName.get(); } - namespace { class DimOrderInserter : std::unary_function<const ScDPSaveDimension*, void> diff --git a/sc/source/core/data/dpsdbtab.cxx b/sc/source/core/data/dpsdbtab.cxx index efbdccf506ff..4cc16c51546e 100644 --- a/sc/source/core/data/dpsdbtab.cxx +++ b/sc/source/core/data/dpsdbtab.cxx @@ -85,7 +85,6 @@ long ScDatabaseDPData::GetColumnCount() return GetCacheTable().getColSize(); } - OUString ScDatabaseDPData::getDimensionName(long nColumn) { if (getIsDataLayoutDimension(nColumn)) @@ -160,5 +159,4 @@ void ScDatabaseDPData::ReloadCacheTable() CreateCacheTable(); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/dpshttab.cxx b/sc/source/core/data/dpshttab.cxx index 329dc7c49f49..679fbae307c5 100644 --- a/sc/source/core/data/dpshttab.cxx +++ b/sc/source/core/data/dpshttab.cxx @@ -252,7 +252,6 @@ void ScSheetSourceDesc::SetRangeName(const OUString& rName) maRangeName = rName; } - bool ScSheetSourceDesc::HasRangeName() const { return !maRangeName.isEmpty(); @@ -263,7 +262,6 @@ void ScSheetSourceDesc::SetQueryParam(const ScQueryParam& rParam) maQueryParam = rParam; } - bool ScSheetSourceDesc::operator== (const ScSheetSourceDesc& rOther) const { return maSourceRange == rOther.maSourceRange && diff --git a/sc/source/core/data/dptabres.cxx b/sc/source/core/data/dptabres.cxx index 976c991099bf..154e266effcf 100644 --- a/sc/source/core/data/dptabres.cxx +++ b/sc/source/core/data/dptabres.cxx @@ -129,10 +129,8 @@ public: } - // function objects for sorting of the column and row members: - class ScDPRowMembersOrder { ScDPResultDimension& rDimension; @@ -315,10 +313,6 @@ ScDPRunningTotalState::ScDPRunningTotalState( ScDPResultMember* pColRoot, ScDPRe maRowSorted.push_back(-1); } - - - - void ScDPRunningTotalState::AddColIndex( long nVisible, long nSorted ) { maColVisible.back() = nVisible; @@ -891,7 +885,6 @@ bool ScDPResultData::HasCommonElement( SCROW nFirstDataId, long nFirstIndex, return false; } - ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDim, ScDPLevel* pLevel) const { if (nDim < static_cast<long>(maDimMembers.size()) && maDimMembers[nDim]) @@ -920,7 +913,6 @@ ResultMembers* ScDPResultData::GetDimResultMembers(long nDim, ScDPDimension* pDi return maDimMembers[nDim]; } - ScDPResultMember::ScDPResultMember( const ScDPResultData* pData, const ScDPParentDimData& rParentDimData, bool bForceSub ) : pResultData( pData ), @@ -2315,10 +2307,8 @@ void ScDPDataMember::UpdateRunningTotals( long nRowPos = 0; long nColPos = 0; - // find the reference field in column or row dimensions - if ( bRefDimInRow ) // look in row dimensions { pSelectDim = rRunning.GetRowResRoot()->GetChildDimension(); @@ -2399,10 +2389,8 @@ void ScDPDataMember::UpdateRunningTotals( if ( !bRefDimInCol && !bRefDimInRow ) // invalid dimension specified bNoDetailsInRef = true; // pSelectDim is then already NULL - // get the member for the reference item and do the calculation - if ( bRunningTotal ) { // running total in (dimension) -> find first existing member @@ -2551,7 +2539,6 @@ void ScDPDataMember::UpdateRunningTotals( // set total values when they are encountered (always before their use) - ScDPAggData* pColTotalData = pRefMember->GetColTotal( nMemberMeasure ); ScDPAggData* pRowTotalData = rTotals.GetRowTotal( nMemberMeasure ); ScDPAggData* pGrandTotalData = rTotals.GetGrandTotal( nMemberMeasure ); @@ -2567,10 +2554,8 @@ void ScDPDataMember::UpdateRunningTotals( if ( rTotals.IsInColRoot() && pColTotalData ) pColTotalData->SetAuxiliary( fTotalValue ); - // find relation to total values - switch ( eRefType ) { case sheet::DataPilotFieldReferenceType::ROW_PERCENTAGE: diff --git a/sc/source/core/data/dptabsrc.cxx b/sc/source/core/data/dptabsrc.cxx index 6490b2904554..dc10d439e2ee 100644 --- a/sc/source/core/data/dptabsrc.cxx +++ b/sc/source/core/data/dptabsrc.cxx @@ -805,7 +805,6 @@ 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 bool bLateInit = true; @@ -998,7 +997,6 @@ void ScDPSource::CreateRes_Impl() pRowResRoot->UpdateRunningTotals( pColResRoot, pResData->GetRowStartMeasure(), aRunning, aTotals ); } - void ScDPSource::FillLevelList( sal_uInt16 nOrientation, std::vector<ScDPLevel*> &rList ) { rList.clear(); @@ -1426,13 +1424,11 @@ bool ScDPDimension::getIsDataLayoutDimension() const return pSource->GetData()->getIsDataLayoutDimension( nDim ); } - void ScDPDimension::setFunction(sal_uInt16 nNew) { nFunction = nNew; } - void ScDPDimension::setUsedHierarchy(long /* nNew */) { // #i52547# don't use the incomplete date hierarchy implementation - ignore the call @@ -1458,7 +1454,6 @@ uno::Reference<util::XCloneable> SAL_CALL ScDPDimension::createClone() throw(uno return CreateCloneObject(); } - const ScDPItemData& ScDPDimension::GetSelectedData() { if ( !pSelectedData ) @@ -2195,7 +2190,6 @@ uno::Sequence<sheet::GeneralFunction> ScDPLevel::getSubTotals() const return aSubTotals; } - // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPLevel::getPropertySetInfo() @@ -2431,7 +2425,6 @@ sal_Bool SAL_CALL ScDPMembers::hasElements() throw(uno::RuntimeException, std::e // end of XNameAccess implementation - long ScDPMembers::getMinMembers() const { // used in lcl_CountMinMembers @@ -2625,7 +2618,6 @@ const OUString* ScDPMember::GetLayoutName() const return mpLayoutName.get(); } - OUString ScDPMember::GetNameStr() const { const ScDPItemData* pData = GetItemData(); @@ -2644,8 +2636,6 @@ void SAL_CALL ScDPMember::setName( const OUString& /* rNewName */ ) throw(uno::R OSL_FAIL("not implemented"); //! exception? } - - // XPropertySet uno::Reference<beans::XPropertySetInfo> SAL_CALL ScDPMember::getPropertySetInfo() @@ -2711,7 +2701,6 @@ uno::Any SAL_CALL ScDPMember::getPropertyValue( const OUString& aPropertyName ) SC_IMPL_DUMMY_PROPERTY_LISTENER( ScDPMember ) - const ScDPCache* ScDPSource::GetCache() { OSL_ENSURE( GetData() , "empty ScDPTableData pointer"); diff --git a/sc/source/core/data/drawpage.cxx b/sc/source/core/data/drawpage.cxx index 63ac4fddac24..0c2eceed069e 100644 --- a/sc/source/core/data/drawpage.cxx +++ b/sc/source/core/data/drawpage.cxx @@ -41,5 +41,4 @@ ScDrawPage::~ScDrawPage() return static_cast<cppu::OWeakObject*>( new ScPageObj( this ) ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index 073508af58cf..79c989ebd98d 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -182,7 +182,6 @@ static void lcl_ReverseTwipsToMM( Rectangle& rRect ) ReverseTwipsToMM( rRect.Bottom() ); } - ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const OUString& rName ) : FmFormModel( SvtPathOptions().GetPalettePath(), NULL, // SfxItemPool* Pool @@ -1076,10 +1075,8 @@ void ScDrawLayer::MoveArea( SCTAB nTab, SCCOL nCol1,SCROW nRow1, SCCOL nCol2,SCR aTopLeft.Y() += aMove.Y(); } - // Detektiv-Pfeile: Zellpositionen anpassen - MoveCells( nTab, nCol1,nRow1, nCol2,nRow2, nDx,nDy, bUpdateNoteCaptionPos ); } @@ -1791,7 +1788,6 @@ void ScDrawLayer::SetCellAnchored( SdrObject &rObj, const ScDrawObjData &rAnchor pAnchor->maEndOffset = rAnchor.maEndOffset; } - void ScDrawLayer::SetCellAnchoredFromPosition( SdrObject &rObj, const ScDocument &rDoc, SCTAB nTab ) { ScDrawObjData aAnchor; @@ -1839,7 +1835,6 @@ void ScDrawLayer::GetCellAnchorFromPosition( SdrObject &rObj, ScDrawObjData &rAn } - void ScDrawLayer::UpdateCellAnchorFromPositionEnd( SdrObject &rObj, ScDrawObjData &rAnchor, const ScDocument &rDoc, SCTAB nTab, bool bUseLogicRect ) { Rectangle aObjRect(bUseLogicRect ? rObj.GetLogicRect() : rObj.GetSnapRect()); @@ -1976,7 +1971,6 @@ IMapObject* ScDrawLayer::GetHitIMapObject( SdrObject* pObj, if ( rGeo.nShearWink ) ShearPoint( aRelPoint, aLogRect.TopLeft(), -rGeo.nTan ); - if ( rGraphic.GetPrefMapMode().GetMapUnit() == MAP_PIXEL ) aGraphSize = rCmpWnd.PixelToLogic( rGraphic.GetPrefSize(), aMap100 ); diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx index f30f8ab0e717..a6b7b90f62a0 100644 --- a/sc/source/core/data/fillinfo.cxx +++ b/sc/source/core/data/fillinfo.cxx @@ -44,7 +44,6 @@ const sal_uInt16 ROWINFO_MAX = 1024; - enum FillInfoLinePos { FILP_TOP, @@ -53,7 +52,6 @@ enum FillInfoLinePos FILP_RIGHT }; - // aehnlich wie in output.cxx static void lcl_GetMergeRange( SCsCOL nX, SCsROW nY, SCSIZE nArrY, @@ -450,7 +448,6 @@ void ScDocument::FillInfo( SCSIZE nIndex; (void) pThisAttrArr->Search( nCurRow, nIndex ); - do { nThisRow=pThisAttrArr->pData[nIndex].nRow; // Ende des Bereichs @@ -613,7 +610,6 @@ void ScDocument::FillInfo( } while ( nIndex < pThisAttrArr->nCount && nThisRow < nYExtra ); - if (pMarkData && pMarkData->IsMultiMarked()) { // Blockmarken @@ -744,7 +740,6 @@ void ScDocument::FillInfo( // Daten von zusammengefassten Zellen anpassen - if (bAnyMerged) { for (nArrRow=0; nArrRow<nArrCount; nArrRow++) @@ -952,7 +947,6 @@ void ScDocument::FillInfo( rTabInfo.mnArrCount = sal::static_int_cast<sal_uInt16>(nArrCount); rTabInfo.mbPageMode = bPageMode; - // *** create the frame border array *** // RowInfo structs are filled in the range [ 0 , nArrCount-1 ] diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index ea2eadc8a7e9..f36eea3c149a 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -80,25 +80,21 @@ using std::deque; typedef SCCOLROW(*DimensionSelector)(const ScAddress&, const ScSingleRefData&); - static SCCOLROW lcl_GetCol(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Col(); } - static SCCOLROW lcl_GetRow(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Row(); } - static SCCOLROW lcl_GetTab(const ScAddress& rPos, const ScSingleRefData& rData) { return rData.toAbs(rPos).Tab(); } - /** Check if both references span the same range in selected dimension. */ static bool @@ -110,7 +106,6 @@ lcl_checkRangeDimension( aWhich(rPos, rRef1.Ref2) == aWhich(rPos, rRef2.Ref2); } - static bool lcl_checkRangeDimensions( const ScAddress& rPos, const SingleDoubleRefProvider& rRef1, const SingleDoubleRefProvider& rRef2, @@ -131,7 +126,6 @@ lcl_checkRangeDimensions( return false; } - /** Check if references in given reference list can possibly form a range. To do that, two of their dimensions must be the same. */ @@ -217,7 +211,6 @@ lcl_checkIfAdjacent( return std::equal(aBegin, aEnd, aBegin1, AdjacentByReference(rPos, aWhich)); } - static void lcl_fillRangeFromRefList( const ScAddress& aPos, const deque<ScToken*>& rReferences, ScRange& rRange) @@ -230,7 +223,6 @@ lcl_fillRangeFromRefList( rRange.aEnd = aEnd.toAbs(aPos); } - static bool lcl_refListFormsOneRange( const ScAddress& rPos, deque<ScToken*>& rReferences, @@ -277,7 +269,6 @@ lcl_refListFormsOneRange( return false; } - bool lcl_isReference(const FormulaToken& rToken) { return @@ -1001,8 +992,6 @@ void ScFormulaCell::SetNeedsDirty( bool bVar ) void ScFormulaCell::SetNeedNumberFormat( bool bVal ) { mbNeedsNumberFormat = bVal; } - - void ScFormulaCell::Compile( const OUString& rFormula, bool bNoListening, const FormulaGrammar::Grammar eGrammar ) { @@ -1274,7 +1263,6 @@ void ScFormulaCell::CompileXML( sc::CompileFormulaContext& rCxt, ScProgress& rPr pDocument->PutInFormulaTree(this); } - void ScFormulaCell::CalcAfterLoad( sc::CompileFormulaContext& rCxt ) { bool bNewCompiled = false; @@ -1336,13 +1324,11 @@ void ScFormulaCell::CalcAfterLoad( sc::CompileFormulaContext& rCxt ) // No SetDirty yet, as no all Listeners are known yet (only in SetDirtyAfterLoad) } - bool ScFormulaCell::MarkUsedExternalReferences() { return pCode && pDocument->MarkUsedExternalReferences(*pCode, aPos); } - void ScFormulaCell::Interpret() { if (!IsDirtyOrInTableOpDirty() || pDocument->GetRecursionHelper().IsInReturn()) @@ -1575,7 +1561,6 @@ void ScFormulaCell::Interpret() } } - void ScFormulaCell::InterpretTail( ScInterpretTailParameter eTailParam ) { class RecursionCounter @@ -1899,7 +1884,6 @@ void ScFormulaCell::SetCompile( bool bVal ) bCompile = bVal; } - void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag ) { ScMatrixFormulaCellToken* pMat = aResult.GetMatrixFormulaCellTokenNonConst(); @@ -1914,7 +1898,6 @@ void ScFormulaCell::SetMatColsRows( SCCOL nCols, SCROW nRows, bool bDirtyFlag ) } } - void ScFormulaCell::GetMatColsRows( SCCOL & nCols, SCROW & nRows ) const { const ScMatrixFormulaCellToken* pMat = aResult.GetMatrixFormulaCellToken(); @@ -1932,7 +1915,6 @@ void ScFormulaCell::SetInChangeTrack( bool bVal ) bInChangeTrack = bVal; } - void ScFormulaCell::Notify( const SfxHint& rHint ) { const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>(&rHint); @@ -2313,7 +2295,6 @@ bool ScFormulaCell::GetMatrixOrigin( ScAddress& rPos ) const return false; } - /* Edge-Values: @@ -3381,16 +3362,11 @@ void ScFormulaCell::FindRangeNamesInUse(std::set<sal_uInt16>& rIndexes) const lcl_FindRangeNamesInUse( rIndexes, pCode, pDocument->GetRangeName() ); } - - void ScFormulaCell::SetChanged(bool b) { bChanged = b; } - - - void ScFormulaCell::SetCode( ScTokenArray* pNew ) { assert(!mxGroup); // Don't call this if it's shared. @@ -3398,7 +3374,6 @@ void ScFormulaCell::SetCode( ScTokenArray* pNew ) pCode = pNew; // takes ownership. } - void ScFormulaCell::SetRunning( bool bVal ) { bRunning = bVal; @@ -3512,7 +3487,6 @@ ScFormulaCellGroupRef ScFormulaCell::CreateCellGroup( SCROW nLen, bool bInvarian return mxGroup; } - void ScFormulaCell::SetCellGroup( const ScFormulaCellGroupRef &xRef ) { if (!xRef) @@ -4041,5 +4015,4 @@ void ScFormulaCell::SyncSharedCode() pCode = mxGroup->mpCode; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/funcdesc.cxx b/sc/source/core/data/funcdesc.cxx index d7d1f9f96405..df48b13878e4 100644 --- a/sc/source/core/data/funcdesc.cxx +++ b/sc/source/core/data/funcdesc.cxx @@ -46,7 +46,6 @@ private: sal_uInt16 GetNum(); }; - class ScResourcePublisher : public Resource { private: @@ -59,10 +58,8 @@ public: }; - // class ScFuncDesc: - ScFuncDesc::ScFuncDesc() : pFuncName (NULL), pFuncDesc (NULL), @@ -382,10 +379,8 @@ bool ScFuncDesc::compareByName(const ScFuncDesc* a, const ScFuncDesc* b) return (ScGlobal::GetCaseCollator()->compareString(*a->pFuncName, *b->pFuncName ) < 0); } - // class ScFunctionList: - ScFunctionList::ScFunctionList() : nMaxFuncNameLen ( 0 ) { @@ -612,10 +607,8 @@ const ScFuncDesc* ScFunctionList::GetFunction( sal_uInt32 nIndex ) const return pDesc; } - // class ScFunctionCategory: - sal_uInt32 ScFunctionCategory::getCount() const { return m_pCategory->size(); @@ -646,10 +639,8 @@ sal_uInt32 ScFunctionCategory::getNumber() const return m_nCategory; } - // class ScFunctionMgr: - ScFunctionMgr::ScFunctionMgr() : pFuncList( ScGlobal::GetStarCalcFunctionList() ) { @@ -817,10 +808,8 @@ sal_Unicode ScFunctionMgr::getSingleToken(const formula::IFunctionManager::EToke return 0; } - // class ScFuncRes: - ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) : Resource(aRes) { diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 5e081a00e12d..a0fc55d888d0 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -45,7 +45,6 @@ #include <ctype.h> #include <numeric> - #include <i18nlangtag/mslangid.hxx> #include <com/sun/star/lang/Locale.hpp> #include <comphelper/processfactory.hxx> @@ -80,7 +79,6 @@ #include "appoptio.hxx" #include "editutil.hxx" - tools::SvRef<ScDocShell>* ScGlobal::pDrawClipDocShellRef = NULL; SvxSearchItem* ScGlobal::pSearchItem = NULL; ScAutoFormat* ScGlobal::pAutoFormat = NULL; @@ -129,7 +127,6 @@ long ScGlobal::nLastColWidthExtra = STD_EXTRA_WIDTH; static sal_uInt16 nPPTZoom = 0; // ScreenZoom used to determine nScreenPPTX/Y - class SfxViewShell; SfxViewShell* pScActiveViewShell = NULL; //! als Member !!!!! sal_uInt16 nScClickMouseModifier = 0; //! dito @@ -196,7 +193,6 @@ SvNumberFormatter* ScGlobal::GetEnglishFormatter() return pEnglishFormatter; } - bool ScGlobal::CheckWidthInvalidate( bool& bNumFormatChanged, const SfxItemSet& rNewAttrs, const SfxItemSet& rOldAttrs ) @@ -568,7 +564,6 @@ void ScGlobal::SetClipDocName( const OUString& rNew ) *pStrClipDocName = rNew; } - void ScGlobal::InitTextHeight(SfxItemPool* pPool) { if (!pPool) @@ -742,7 +737,6 @@ ScUnitConverter* ScGlobal::GetUnitConverter() return pUnitConverter; } - const sal_Unicode* ScGlobal::UnicodeStrChr( const sal_Unicode* pStr, sal_Unicode c ) { @@ -1061,9 +1055,6 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, SvNumberFormatter& rFormatter ) } } - - - utl::TransliterationWrapper* ScGlobal::GetpTransliteration() { if ( !pTransliteration ) diff --git a/sc/source/core/data/global2.cxx b/sc/source/core/data/global2.cxx index 4d7ab25865a9..93da6d3d533a 100644 --- a/sc/source/core/data/global2.cxx +++ b/sc/source/core/data/global2.cxx @@ -38,7 +38,6 @@ using ::std::vector; - // struct ScImportParam: ScImportParam::ScImportParam() : @@ -103,7 +102,6 @@ bool ScImportParam::operator==( const ScImportParam& rOther ) const //! nQuerySh und pConnection sind gleich ? } - // struct ScConsolidateParam: ScConsolidateParam::ScConsolidateParam() : @@ -204,7 +202,6 @@ void ScConsolidateParam::SetAreas( ScArea* const* ppAreas, sal_uInt16 nCount ) } } - // struct ScSolveParam ScSolveParam::ScSolveParam() @@ -265,7 +262,6 @@ bool ScSolveParam::operator==( const ScSolveParam& r ) const return bEqual; } - // struct ScTabOpParam ScTabOpParam::ScTabOpParam() : meMode(Column) {} diff --git a/sc/source/core/data/globalx.cxx b/sc/source/core/data/globalx.cxx index 15e484ad5ee3..8dc24d421ba2 100644 --- a/sc/source/core/data/globalx.cxx +++ b/sc/source/core/data/globalx.cxx @@ -36,12 +36,10 @@ #include <comphelper/string.hxx> #include <unotools/localedatawrapper.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::ucb; - void ScGlobal::InitAddIns() { // multi paths separated by semicolons @@ -118,7 +116,6 @@ void ScGlobal::InitAddIns() } } - OUString ScGlobal::GetOrdinalSuffix( sal_Int32 nNumber) { try diff --git a/sc/source/core/data/listenercontext.cxx b/sc/source/core/data/listenercontext.cxx index 0463e7baa75a..2745749e18c4 100644 --- a/sc/source/core/data/listenercontext.cxx +++ b/sc/source/core/data/listenercontext.cxx @@ -20,7 +20,6 @@ StartListeningContext::StartListeningContext( ScDocument& rDoc, const boost::shared_ptr<ColumnBlockPositionSet>& pSet) : mrDoc(rDoc), mpSet(pSet) {} - ColumnBlockPosition* StartListeningContext::getBlockPosition(SCTAB nTab, SCCOL nCol) { return mpSet->getBlockPosition(nTab, nCol); @@ -40,8 +39,6 @@ void EndListeningContext::setPositionDelta( const ScAddress& rDelta ) maPosDelta = rDelta; } - - ScAddress EndListeningContext::getOldPosition( const ScAddress& rPos ) const { ScAddress aOldPos = rPos; diff --git a/sc/source/core/data/markarr.cxx b/sc/source/core/data/markarr.cxx index 2b1cfec80f72..00e3ce004540 100644 --- a/sc/source/core/data/markarr.cxx +++ b/sc/source/core/data/markarr.cxx @@ -337,10 +337,8 @@ SCROW ScMarkArray::GetMarkEnd( SCROW nRow, bool bUp ) const return nRet; } - // -------------- Iterator ---------------------------------------------- - ScMarkArrayIter::ScMarkArrayIter( const ScMarkArray* pNewArray ) : pArray( pNewArray ), nPos( 0 ) @@ -370,6 +368,4 @@ bool ScMarkArrayIter::Next( SCROW& rTop, SCROW& rBottom ) return true; } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/markdata.cxx b/sc/source/core/data/markdata.cxx index fc200b23f132..482882e1e435 100644 --- a/sc/source/core/data/markdata.cxx +++ b/sc/source/core/data/markdata.cxx @@ -216,7 +216,6 @@ SCTAB ScMarkData::GetLastSelected() const return 0; } - void ScMarkData::SetSelectedTabs(const MarkedTabsType& rTabs) { MarkedTabsType aTabs(rTabs.begin(), rTabs.end()); @@ -558,6 +557,4 @@ ScMarkData::const_iterator ScMarkData::end() const return maTabMarked.end(); } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/olinetab.cxx b/sc/source/core/data/olinetab.cxx index fb420674283a..3c24a6c5675a 100644 --- a/sc/source/core/data/olinetab.cxx +++ b/sc/source/core/data/olinetab.cxx @@ -41,14 +41,11 @@ ScOutlineEntry::ScOutlineEntry( const ScOutlineEntry& rEntry ) : { } - - SCCOLROW ScOutlineEntry::GetEnd() const { return nStart+nSize-1; } - void ScOutlineEntry::Move( SCsCOLROW nDelta ) { SCCOLROW nNewPos = nStart + nDelta; @@ -289,7 +286,6 @@ bool ScOutlineArray::Insert( return true; } - bool ScOutlineArray::FindTouchedLevel( SCCOLROW nBlockStart, SCCOLROW nBlockEnd, size_t& rFindLevel) const { @@ -864,7 +860,6 @@ ScOutlineEntry* ScSubOutlineIterator::GetNext() return pEntry; // nSubLevel gueltig, wenn pEntry != 0 } - size_t ScSubOutlineIterator::LastEntry() const { if (nSubEntry == 0) @@ -896,5 +891,4 @@ void ScSubOutlineIterator::DeleteLast() rColl.erase(it); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/pagepar.cxx b/sc/source/core/data/pagepar.cxx index 2e64611f07c4..18b04dd7b210 100644 --- a/sc/source/core/data/pagepar.cxx +++ b/sc/source/core/data/pagepar.cxx @@ -49,7 +49,6 @@ bool ScPageTableParam::operator==( const ScPageTableParam& r ) const return ( memcmp( this, &r, sizeof(ScPageTableParam) ) == 0 ); } - // struct ScPageAreaParam: ScPageAreaParam::ScPageAreaParam() diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx index 0599896315a1..bca6a4ba770c 100644 --- a/sc/source/core/data/patattr.cxx +++ b/sc/source/core/data/patattr.cxx @@ -491,7 +491,6 @@ void ScPatternAttr::GetFont( GetFont( rFont, GetItemSet(), eAutoMode, pOutDev, pScale, pCondSet, nScript, pBackConfigColor, pTextConfigColor ); } - void ScPatternAttr::FillToEditItemSet( SfxItemSet& rEditSet, const SfxItemSet& rSrcSet, const SfxItemSet* pCondSet ) { // Items auslesen @@ -731,7 +730,6 @@ void ScPatternAttr::FillEditItemSet( SfxItemSet* pEditSet, const SfxItemSet* pCo FillToEditItemSet( *pEditSet, GetItemSet(), pCondSet ); } - void ScPatternAttr::GetFromEditItemSet( SfxItemSet& rDestSet, const SfxItemSet& rEditSet ) { const SfxPoolItem* pItem; @@ -1116,7 +1114,6 @@ const OUString* ScPatternAttr::GetStyleName() const return pName ? pName : ( pStyle ? &pStyle->GetName() : NULL ); } - void ScPatternAttr::SetStyleSheet( ScStyleSheet* pNewStyle, bool bClearDirectFormat ) { if (pNewStyle) @@ -1194,7 +1191,6 @@ bool ScPatternAttr::IsSymbolFont() const return false; } - sal_uLong ScPatternAttr::GetNumberFormat( SvNumberFormatter* pFormatter ) const { sal_uLong nFormat = @@ -1287,5 +1283,4 @@ sal_uInt8 ScPatternAttr::GetRotateDir( const SfxItemSet* pCondSet ) const return nRet; } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index 699b8133a21c..2afb10989b12 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -118,5 +118,4 @@ void ScPoolHelper::SourceDocumentGone() pFormTable->SetColorLink( Link() ); } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index 141de43276e5..49f04cdc1814 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "postit.hxx" #include <rtl/ustrbuf.hxx> @@ -49,7 +48,6 @@ #include <utility> - namespace { const long SC_NOTECAPTION_WIDTH = 2900; /// Default width of note caption textbox. @@ -509,14 +507,11 @@ ScPostIt* ScPostIt::Clone( const ScAddress& rOwnPos, ScDocument& rDestDoc, const return bCloneCaption ? new ScPostIt( rDestDoc, rDestPos, *this ) : new ScPostIt( rDestDoc, rDestPos, maNoteData, false ); } - - void ScPostIt::SetDate( const OUString& rDate ) { maNoteData.maDate = rDate; } - void ScPostIt::SetAuthor( const OUString& rAuthor ) { maNoteData.maAuthor = rAuthor; @@ -568,7 +563,6 @@ void ScPostIt::SetText( const ScAddress& rPos, const OUString& rText ) maNoteData.mpCaption->SetText( rText ); } - SdrCaptionObj* ScPostIt::GetOrCreateCaption( const ScAddress& rPos ) const { CreateCaptionFromInitData( rPos ); @@ -592,7 +586,6 @@ void ScPostIt::ShowCaption( const ScAddress& rPos, bool bShow ) ScCaptionUtil::SetCaptionLayer( *maNoteData.mpCaption, bShow ); } - void ScPostIt::ShowCaptionTemp( const ScAddress& rPos, bool bShow ) { CreateCaptionFromInitData( rPos ); diff --git a/sc/source/core/data/refupdatecontext.cxx b/sc/source/core/data/refupdatecontext.cxx index 8bf52985953d..d63c745c961a 100644 --- a/sc/source/core/data/refupdatecontext.cxx +++ b/sc/source/core/data/refupdatecontext.cxx @@ -99,5 +99,4 @@ SetFormulaDirtyContext::SetFormulaDirtyContext() : } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/rowheightcontext.cxx b/sc/source/core/data/rowheightcontext.cxx index 08466ae2acad..5f51dfab0878 100644 --- a/sc/source/core/data/rowheightcontext.cxx +++ b/sc/source/core/data/rowheightcontext.cxx @@ -22,23 +22,16 @@ RowHeightContext::RowHeightContext( RowHeightContext::~RowHeightContext() {} - - - - - void RowHeightContext::setExtraHeight( sal_uInt16 nH ) { mnExtraHeight = nH; } - void RowHeightContext::setForceAutoSize( bool b ) { mbForceAutoSize = b; } - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/segmenttree.cxx b/sc/source/core/data/segmenttree.cxx index a5bf3c833d4e..14b051852448 100644 --- a/sc/source/core/data/segmenttree.cxx +++ b/sc/source/core/data/segmenttree.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "segmenttree.hxx" #include <mdds/flat_segment_tree.hpp> @@ -291,7 +290,6 @@ bool ScFlatBoolRowSegments::ForwardIterator::getValue(SCROW nPos, bool& rVal) return true; } - ScFlatBoolRowSegments::RangeIterator::RangeIterator(ScFlatBoolRowSegments& rSegs) : mrSegs(rSegs) { @@ -456,7 +454,6 @@ bool ScFlatUInt16RowSegments::ForwardIterator::getValue(SCROW nPos, sal_uInt16& return true; } - ScFlatUInt16RowSegments::ScFlatUInt16RowSegments(sal_uInt16 nDefault) : mpImpl(new ScFlatUInt16SegmentsImpl(static_cast<SCCOLROW>(MAXROW), nDefault)) { diff --git a/sc/source/core/data/sheetevents.cxx b/sc/source/core/data/sheetevents.cxx index d7a19d5a8713..4bdb61f53e89 100644 --- a/sc/source/core/data/sheetevents.cxx +++ b/sc/source/core/data/sheetevents.cxx @@ -20,7 +20,6 @@ #include "sheetevents.hxx" #include <com/sun/star/script/vba/VBAEventId.hpp> - OUString ScSheetEvents::GetEventName(sal_Int32 nEvent) { if (nEvent<0 || nEvent>=SC_SHEETEVENT_COUNT) diff --git a/sc/source/core/data/simpleformulacalc.cxx b/sc/source/core/data/simpleformulacalc.cxx index b1d56f36f55d..c17313d512bd 100644 --- a/sc/source/core/data/simpleformulacalc.cxx +++ b/sc/source/core/data/simpleformulacalc.cxx @@ -13,7 +13,6 @@ #include "interpre.hxx" #include "compiler.hxx" - ScSimpleFormulaCalculator::ScSimpleFormulaCalculator( ScDocument* pDoc, const ScAddress& rAddr, const OUString& rFormula, formula::FormulaGrammar::Grammar eGram ) : mnFormatType(0) @@ -65,7 +64,6 @@ sal_uInt16 ScSimpleFormulaCalculator::GetErrCode() return maResult.GetResultError(); } - double ScSimpleFormulaCalculator::GetValue() { Calculate(); diff --git a/sc/source/core/data/sortparam.cxx b/sc/source/core/data/sortparam.cxx index 34392e06d013..56448cf7d0a9 100644 --- a/sc/source/core/data/sortparam.cxx +++ b/sc/source/core/data/sortparam.cxx @@ -23,7 +23,6 @@ #include "queryparam.hxx" #include "subtotalparam.hxx" - ScSortParam::ScSortParam() { Clear(); diff --git a/sc/source/core/data/stlpool.cxx b/sc/source/core/data/stlpool.cxx index 3e0fc00e21c9..c21d613b5f72 100644 --- a/sc/source/core/data/stlpool.cxx +++ b/sc/source/core/data/stlpool.cxx @@ -55,7 +55,6 @@ #include "editutil.hxx" #include "patattr.hxx" - ScStyleSheetPool::ScStyleSheetPool( SfxItemPool& rPoolP, ScDocument* pDocument ) : SfxStyleSheetPool( rPoolP ), @@ -238,7 +237,6 @@ void ScStyleSheetPool::CreateStandardStyles() OUString aStrStandard = ScGlobal::GetRscString(STR_STYLENAME_STANDARD); - // Zellformatvorlagen: // 1. Standard @@ -272,10 +270,8 @@ void ScStyleSheetPool::CreateStandardStyles() // if ( eCtl == LANGUAGE_THAI ) // pSet->Put( SvxFontHeightItem( 300, 100, ATTR_CTL_FONT_HEIGHT ) ); // 15 pt - // 2. Ergebnis - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT ), SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -286,10 +282,8 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); pSet->Put( SvxUnderlineItem( UNDERLINE_SINGLE, ATTR_FONT_UNDERLINE ) ); - // 3. Ergebnis1 - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_RESULT1 ), SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -297,10 +291,8 @@ void ScStyleSheetPool::CreateStandardStyles() pSheet->SetParent( SCSTR( STR_STYLENAME_RESULT ) ); pSheet->SetHelpId( aHelpFile, HID_SC_SHEET_CELL_ERG1 ); - // 4. Ueberschrift - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE ), SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -313,10 +305,8 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( SvxPostureItem( ITALIC_NORMAL, ATTR_FONT_POSTURE ) ); pSet->Put( SvxHorJustifyItem( SVX_HOR_JUSTIFY_CENTER, ATTR_HOR_JUSTIFY ) ); - // 5. Ueberschrift1 - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_HEADLINE1 ), SFX_STYLE_FAMILY_PARA, SCSTYLEBIT_STANDARD ); @@ -326,12 +316,10 @@ void ScStyleSheetPool::CreateStandardStyles() pSet = &pSheet->GetItemSet(); pSet->Put( SfxInt32Item( ATTR_ROTATE_VALUE, 9000 ) ); - // Seitenformat-Vorlagen: // 1. Standard - pSheet = (ScStyleSheet*) &Make( aStrStandard, SFX_STYLE_FAMILY_PAGE, SCSTYLEBIT_STANDARD ); @@ -345,7 +333,6 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); - // Kopfzeile: // [leer][\TABELLE\][leer] @@ -358,7 +345,6 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHeaderItem ); DELETEZ( pTxtObj ); - // Fusszeile: // [leer][Seite \SEITE\][leer] @@ -373,10 +359,8 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pFooterItem ); DELETEZ( pTxtObj ); - // 2. Report - pSheet = (ScStyleSheet*) &Make( SCSTR( STR_STYLENAME_REPORT ), SFX_STYLE_FAMILY_PAGE, SCSTYLEBIT_STANDARD ); @@ -407,7 +391,6 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pHFSetItem, ATTR_PAGE_FOOTERSET ); DELETEZ( pHFSetItem ); - // Kopfzeile: // [\TABELLE\ (\DATEI\)][leer][\DATUM\, \ZEIT\] @@ -429,7 +412,6 @@ void ScStyleSheetPool::CreateStandardStyles() DELETEZ( pTxtObj ); pSet->Put( *pHeaderItem ); - // Fusszeile: // [leer][Seite: \SEITE\ / \SEITEN\][leer] @@ -447,7 +429,6 @@ void ScStyleSheetPool::CreateStandardStyles() pSet->Put( *pFooterItem ); DELETEZ( pTxtObj ); - DELETEZ( pEmptyTxtObj ); DELETEZ( pHeaderItem ); DELETEZ( pFooterItem ); diff --git a/sc/source/core/data/stlsheet.cxx b/sc/source/core/data/stlsheet.cxx index cac09e9d085a..68e70950075b 100644 --- a/sc/source/core/data/stlsheet.cxx +++ b/sc/source/core/data/stlsheet.cxx @@ -36,13 +36,11 @@ #include <svl/smplhint.hxx> #include "attrib.hxx" - #include <vcl/svapp.hxx> #include "globstr.hrc" #include "sc.hrc" - TYPEINIT1(ScStyleSheet, SfxStyleSheet); #define TWO_CM 1134 diff --git a/sc/source/core/data/subtotalparam.cxx b/sc/source/core/data/subtotalparam.cxx index e066c6e2e596..27bbeb361b24 100644 --- a/sc/source/core/data/subtotalparam.cxx +++ b/sc/source/core/data/subtotalparam.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - #include "subtotalparam.hxx" ScSubTotalParam::ScSubTotalParam() diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx index 5cba042224ed..daaaf8b4d0ba 100644 --- a/sc/source/core/data/table1.cxx +++ b/sc/source/core/data/table1.cxx @@ -394,7 +394,6 @@ void ScTable::SetLoadingRTL( bool bSet ) bLoadingRTL = bSet; } - void ScTable::SetTabBgColor(const Color& rColor) { if (aTabBgColor != rColor) @@ -903,7 +902,6 @@ void ScTable::GetDataArea( SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, S } } - bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bColumnsOnly ) const { @@ -1944,7 +1942,6 @@ void ScTable::AddPrintRange( const ScRange& rNew ) InvalidatePageBreaks(); } - void ScTable::SetPrintEntireSheet() { if( !IsPrintEntireSheet() ) @@ -2072,14 +2069,12 @@ ScRefCellValue ScTable::VisibleDataCellIterator::next() return ScRefCellValue(); } - void ScTable::SetAnonymousDBData(ScDBData* pDBData) { delete pDBDataNoName; pDBDataNoName = pDBData; } - sal_uLong ScTable::AddCondFormat( ScConditionalFormat* pNew ) { if(!mpCondFormatList) diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx index 1d38126a2e0f..ce14a5f9fcf8 100644 --- a/sc/source/core/data/table2.cxx +++ b/sc/source/core/data/table2.cxx @@ -109,14 +109,12 @@ bool ScTable::SetOutlineTable( const ScOutlineTable* pNewOutline ) return ( nNewSizeX != nOldSizeX || nNewSizeY != nOldSizeY ); // Groesse geaendert ? } - void ScTable::StartOutlineTable() { if (!pOutlineTable) pOutlineTable = new ScOutlineTable; } - void ScTable::SetSheetEvents( const ScSheetEvents* pNew ) { delete pSheetEvents; @@ -131,13 +129,11 @@ void ScTable::SetSheetEvents( const ScSheetEvents* pNew ) SetStreamValid(false); } - void ScTable::SetCalcNotification( bool bSet ) { bCalcNotification = bSet; } - bool ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ) const { bool bTest = true; @@ -151,7 +147,6 @@ bool ScTable::TestInsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SC return bTest; } - void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize ) { if (nStartCol==0 && nEndCol==MAXCOL) @@ -201,7 +196,6 @@ void ScTable::InsertRow( SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE SetStreamValid(false); } - void ScTable::DeleteRow( const sc::ColumnSet& rRegroupCols, SCCOL nStartCol, SCCOL nEndCol, SCROW nStartRow, SCSIZE nSize, bool* pUndoOutline ) @@ -260,7 +254,6 @@ void ScTable::DeleteRow( SetStreamValid(false); } - bool ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ) const { bool bTest = true; @@ -277,7 +270,6 @@ bool ScTable::TestInsertCol( SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ) cons return bTest; } - void ScTable::InsertCol( const sc::ColumnSet& rRegroupCols, SCCOL nStartCol, SCROW nStartRow, SCROW nEndRow, SCSIZE nSize ) { @@ -313,7 +305,6 @@ void ScTable::InsertCol( } } - if ((nStartRow == 0) && (nEndRow == MAXROW)) { for (SCSIZE i=0; i < nSize; i++) @@ -421,7 +412,6 @@ void ScTable::DeleteCol( SetStreamValid(false); } - void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nDelFlag) { if (nCol2 > MAXCOL) nCol2 = MAXCOL; @@ -434,10 +424,8 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal aCol[i].DeleteArea(nRow1, nRow2, nDelFlag); } - // Zellschutz auf geschuetzter Tabelle nicht setzen - if ( IsProtected() && (nDelFlag & IDF_ATTRIB) ) { ScPatternAttr aPattern(pDocument->GetPool()); @@ -455,7 +443,6 @@ void ScTable::DeleteArea(SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal SetStreamValid(false); } - void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, bool bBroadcast ) { { // scope for bulk broadcast @@ -475,10 +462,8 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, boo mpCondFormatList->DeleteArea( pRange->aStart.Col(), pRange->aStart.Row(), pRange->aEnd.Col(), pRange->aEnd.Row() ); } - // Zellschutz auf geschuetzter Tabelle nicht setzen - if ( IsProtected() && (nDelFlag & IDF_ATTRIB) ) { ScDocumentPool* pPool = pDocument->GetPool(); @@ -494,7 +479,6 @@ void ScTable::DeleteSelection( sal_uInt16 nDelFlag, const ScMarkData& rMark, boo SetStreamValid(false); } - // pTable = Clipboard void ScTable::CopyToClip( sc::CopyToClipContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, @@ -524,7 +508,6 @@ void ScTable::CopyToClip( if (pDBDataNoName) pTable->SetAnonymousDBData(new ScDBData(*pDBDataNoName)); - if (pRowFlags && pTable->pRowFlags && mpRowHeights && pTable->mpRowHeights) { pTable->pRowFlags->CopyFromAnded( *pRowFlags, 0, nRow2, CR_MANUALSIZE); @@ -710,7 +693,6 @@ void ScTable::CopyFromClip( } } - void ScTable::MixData( sc::MixDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nFunction, bool bSkipEmpty, const ScTable* pSrcTab ) @@ -719,7 +701,6 @@ void ScTable::MixData( aCol[i].MixData(rCxt, nRow1, nRow2, nFunction, bSkipEmpty, pSrcTab->aCol[i]); } - // Markierung von diesem Dokument void ScTable::MixMarked( sc::MixDocContext& rCxt, const ScMarkData& rMark, sal_uInt16 nFunction, @@ -1052,7 +1033,6 @@ void ScTable::StartNeededListeners() aCol[i].StartNeededListeners(); } - void ScTable::BroadcastInArea( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { @@ -1063,7 +1043,6 @@ void ScTable::BroadcastInArea( SCCOL nCol1, SCROW nRow1, aCol[i].SetDirty(nRow1, nRow2); } - void ScTable::StartListeningInArea( sc::StartListeningContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) { @@ -1074,7 +1053,6 @@ void ScTable::StartListeningInArea( aCol[i].StartListeningInArea(rCxt, nRow1, nRow2); } - void ScTable::CopyToTable( sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData, @@ -1195,7 +1173,6 @@ void ScTable::CopyToTable( pDestTab->SetOutlineTable( pOutlineTable ); } - void ScTable::UndoToTable( sc::CopyToDocContext& rCxt, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nFlags, bool bMarked, ScTable* pDestTab, const ScMarkData* pMarkData ) @@ -1216,7 +1193,6 @@ void ScTable::UndoToTable( if (nFlags & IDF_ATTRIB) pDestTab->mpCondFormatList.reset(new ScConditionalFormatList(pDestTab->pDocument, *mpCondFormatList)); - if (bWidth||bHeight) { if (bWidth) @@ -1234,7 +1210,6 @@ void ScTable::UndoToTable( } } - void ScTable::CopyUpdated( const ScTable* pPosTab, ScTable* pDestTab ) const { for (SCCOL i=0; i<=MAXCOL; i++) @@ -1478,7 +1453,6 @@ void ScTable::GetInputString( SCCOL nCol, SCROW nRow, OUString& rString ) const rString = OUString(); } - double ScTable::GetValue( SCCOL nCol, SCROW nRow ) const { if (ValidColRow( nCol, nRow )) @@ -1636,7 +1610,6 @@ void ScTable::GetLastDataPos(SCCOL& rCol, SCROW& rRow) const rRow = ::std::max( rRow, aCol[nCol--].GetLastDataPos()); } - bool ScTable::HasData( SCCOL nCol, SCROW nRow ) const { if (ValidColRow(nCol,nRow)) @@ -1645,7 +1618,6 @@ bool ScTable::HasData( SCCOL nCol, SCROW nRow ) const return false; } - bool ScTable::HasStringData( SCCOL nCol, SCROW nRow ) const { if (ValidColRow(nCol,nRow)) @@ -1654,7 +1626,6 @@ bool ScTable::HasStringData( SCCOL nCol, SCROW nRow ) const return false; } - bool ScTable::HasValueData( SCCOL nCol, SCROW nRow ) const { if (ValidColRow(nCol,nRow)) @@ -1663,7 +1634,6 @@ bool ScTable::HasValueData( SCCOL nCol, SCROW nRow ) const return false; } - bool ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const { @@ -1675,14 +1645,12 @@ bool ScTable::HasStringCells( SCCOL nStartCol, SCROW nStartRow, return false; } - void ScTable::SetDirtyVar() { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].SetDirtyVar(); } - void ScTable::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt ) { sc::AutoCalcSwitch aACSwitch(*pDocument, false); @@ -1691,7 +1659,6 @@ void ScTable::SetAllFormulasDirty( const sc::SetFormulaDirtyContext& rCxt ) aCol[i].SetAllFormulasDirty(rCxt); } - void ScTable::SetDirty( const ScRange& rRange ) { bool bOldAutoCalc = pDocument->GetAutoCalc(); @@ -1702,7 +1669,6 @@ void ScTable::SetDirty( const ScRange& rRange ) pDocument->SetAutoCalc( bOldAutoCalc ); } - void ScTable::SetTableOpDirty( const ScRange& rRange ) { bool bOldAutoCalc = pDocument->GetAutoCalc(); @@ -1713,7 +1679,6 @@ void ScTable::SetTableOpDirty( const ScRange& rRange ) pDocument->SetAutoCalc( bOldAutoCalc ); } - void ScTable::SetDirtyAfterLoad() { bool bOldAutoCalc = pDocument->GetAutoCalc(); @@ -1723,7 +1688,6 @@ void ScTable::SetDirtyAfterLoad() pDocument->SetAutoCalc( bOldAutoCalc ); } - void ScTable::SetDirtyIfPostponed() { bool bOldAutoCalc = pDocument->GetAutoCalc(); @@ -1764,13 +1728,11 @@ void ScTable::SetLoadingMedium(bool bLoading) mpRowHeights->enableTreeSearch(!bLoading); } - void ScTable::CalcAll() { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].CalcAll(); } - void ScTable::CompileAll( sc::CompileFormulaContext& rCxt ) { for (SCCOL i = 0; i <= MAXCOL; ++i) @@ -1780,7 +1742,6 @@ void ScTable::CompileAll( sc::CompileFormulaContext& rCxt ) mpCondFormatList->CompileAll(); } - void ScTable::CompileXML( sc::CompileFormulaContext& rCxt, ScProgress& rProgress ) { if (mpRangeName) @@ -1876,7 +1837,6 @@ const ScPatternAttr* ScTable::GetPattern( SCCOL nCol, SCROW nRow ) const } } - const ScPatternAttr* ScTable::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, SCROW nEndRow ) const { if ( ValidColRow( nCol, nStartRow ) && ValidRow( nEndRow ) && (nStartRow <= nEndRow) ) @@ -1885,7 +1845,6 @@ const ScPatternAttr* ScTable::GetMostUsedPattern( SCCOL nCol, SCROW nStartRow, S return NULL; } - bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal_uInt16 nMask ) const { bool bFound = false; @@ -1894,7 +1853,6 @@ bool ScTable::HasAttrib( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, sal return bFound; } - bool ScTable::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) const { bool bFound = false; @@ -1903,7 +1861,6 @@ bool ScTable::HasAttribSelection( const ScMarkData& rMark, sal_uInt16 nMask ) co return bFound; } - bool ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, SCCOL& rEndCol, SCROW& rEndRow, bool bRefresh ) @@ -1921,7 +1878,6 @@ bool ScTable::ExtendMerge( SCCOL nStartCol, SCROW nStartRow, return bFound; } - bool ScTable::IsBlockEmpty( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bIgnoreNotes ) const { if (!(ValidCol(nCol1) && ValidCol(nCol2))) @@ -2168,7 +2124,6 @@ bool ScTable::HasBlockMatrixFragment( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCR return false; } - bool ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const { bool bFound = false; @@ -2177,7 +2132,6 @@ bool ScTable::HasSelectionMatrixFragment( const ScMarkData& rMark ) const return bFound; } - bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const { @@ -2259,7 +2213,6 @@ bool ScTable::IsBlockEditable( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, return bIsEditable; } - bool ScTable::IsSelectionEditable( const ScMarkData& rMark, bool* pOnlyNotBecauseOfMatrix /* = NULL */ ) const { @@ -2349,7 +2302,6 @@ void ScTable::LockTable() ++nLockCount; } - void ScTable::UnlockTable() { if (nLockCount) @@ -2360,14 +2312,12 @@ void ScTable::UnlockTable() } } - void ScTable::MergeSelectionPattern( ScMergePatternState& rState, const ScMarkData& rMark, bool bDeep ) const { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].MergeSelectionPattern( rState, rMark, bDeep ); } - void ScTable::MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bDeep ) const { @@ -2375,7 +2325,6 @@ void ScTable::MergePatternArea( ScMergePatternState& rState, SCCOL nCol1, SCROW aCol[i].MergePatternArea( rState, nRow1, nRow2, bDeep ); } - void ScTable::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner, ScLineFlags& rFlags, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) const { @@ -2389,7 +2338,6 @@ void ScTable::MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInne } } - void ScTable::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoItem* pLineInner, SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow ) { @@ -2403,14 +2351,12 @@ void ScTable::ApplyBlockFrame( const SvxBoxItem* pLineOuter, const SvxBoxInfoIte } } - void ScTable::ApplyPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr ) { if (ValidColRow(nCol,nRow)) aCol[nCol].ApplyPattern( nRow, rAttr ); } - void ScTable::ApplyPatternArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr, ScEditDataArray* pDataArray ) { @@ -2481,7 +2427,6 @@ void ScTable::ApplyStyle( SCCOL nCol, SCROW nRow, const ScStyleSheet& rStyle ) aCol[nCol].ApplyStyle( nRow, rStyle ); } - void ScTable::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScStyleSheet& rStyle ) { if (ValidColRow(nStartCol, nStartRow) && ValidColRow(nEndCol, nEndRow)) @@ -2493,14 +2438,12 @@ void ScTable::ApplyStyleArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, S } } - void ScTable::ApplySelectionStyle(const ScStyleSheet& rStyle, const ScMarkData& rMark) { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].ApplySelectionStyle( rStyle, rMark ); } - void ScTable::ApplySelectionLineStyle( const ScMarkData& rMark, const ::editeng::SvxBorderLine* pLine, bool bColorOnly ) { @@ -2511,7 +2454,6 @@ void ScTable::ApplySelectionLineStyle( const ScMarkData& rMark, aCol[i].ApplySelectionLineStyle( rMark, pLine, bColorOnly ); } - const ScStyleSheet* ScTable::GetStyle( SCCOL nCol, SCROW nRow ) const { if (ValidColRow(nCol, nRow)) @@ -2520,7 +2462,6 @@ const ScStyleSheet* ScTable::GetStyle( SCCOL nCol, SCROW nRow ) const return NULL; } - const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, bool& rFound ) const { rFound = false; @@ -2547,7 +2488,6 @@ const ScStyleSheet* ScTable::GetSelectionStyle( const ScMarkData& rMark, bool& r return bEqual ? pStyle : NULL; } - const ScStyleSheet* ScTable::GetAreaStyle( bool& rFound, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2 ) const { @@ -2574,7 +2514,6 @@ const ScStyleSheet* ScTable::GetAreaStyle( bool& rFound, SCCOL nCol1, SCROW nRow return bEqual ? pStyle : NULL; } - bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyles ) const { bool bIsUsed = false; @@ -2592,7 +2531,6 @@ bool ScTable::IsStyleSheetUsed( const ScStyleSheet& rStyle, bool bGatherAllStyle return bIsUsed; } - void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRemoved, OutputDevice* pDev, double nPPTX, double nPPTY, @@ -2619,7 +2557,6 @@ void ScTable::StyleSheetChanged( const SfxStyleSheetBase* pStyleSheet, bool bRem } } - bool ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags ) { @@ -2630,7 +2567,6 @@ bool ScTable::ApplyFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW return bChanged; } - bool ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, sal_Int16 nFlags ) { @@ -2641,21 +2577,18 @@ bool ScTable::RemoveFlags( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO return bChanged; } - void ScTable::SetPattern( SCCOL nCol, SCROW nRow, const ScPatternAttr& rAttr, bool bPutToPool ) { if (ValidColRow(nCol,nRow)) aCol[nCol].SetPattern( nRow, rAttr, bPutToPool ); } - void ScTable::ApplyAttr( SCCOL nCol, SCROW nRow, const SfxPoolItem& rAttr ) { if (ValidColRow(nCol,nRow)) aCol[nCol].ApplyAttr( nRow, rAttr ); } - void ScTable::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& rMark, ScEditDataArray* pDataArray ) { @@ -2663,21 +2596,18 @@ void ScTable::ApplySelectionCache( SfxItemPoolCache* pCache, const ScMarkData& r aCol[i].ApplySelectionCache( pCache, rMark, pDataArray ); } - void ScTable::ChangeSelectionIndent( bool bIncrement, const ScMarkData& rMark ) { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].ChangeSelectionIndent( bIncrement, rMark ); } - void ScTable::ClearSelectionItems( const sal_uInt16* pWhich, const ScMarkData& rMark ) { for (SCCOL i=0; i<=MAXCOL; i++) aCol[i].ClearSelectionItems( pWhich, rMark ); } - // Spaltenbreiten / Zeilenhoehen void ScTable::SetColWidth( SCCOL nCol, sal_uInt16 nNewWidth ) @@ -2858,7 +2788,6 @@ void ScTable::SetManualHeight( SCROW nStartRow, SCROW nEndRow, bool bManual ) } } - sal_uInt16 ScTable::GetColWidth( SCCOL nCol, bool bHiddenAsZero ) const { OSL_ENSURE(ValidCol(nCol),"wrong column number"); @@ -2874,7 +2803,6 @@ sal_uInt16 ScTable::GetColWidth( SCCOL nCol, bool bHiddenAsZero ) const return (sal_uInt16) STD_COL_WIDTH; } - sal_uInt16 ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die eingestellte { OSL_ENSURE(ValidCol(nCol),"wrong column number"); @@ -2885,7 +2813,6 @@ sal_uInt16 ScTable::GetOriginalWidth( SCCOL nCol ) const // immer die ein return (sal_uInt16) STD_COL_WIDTH; } - sal_uInt16 ScTable::GetCommonWidth( SCCOL nEndCol ) const { // get the width that is used in the largest continuous column range (up to nEndCol) @@ -2932,7 +2859,6 @@ sal_uInt16 ScTable::GetCommonWidth( SCCOL nEndCol ) const return nMaxWidth; } - sal_uInt16 ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, bool bHiddenAsZero ) const { OSL_ENSURE(ValidRow(nRow),"Invalid row number"); @@ -2975,7 +2901,6 @@ sal_uInt16 ScTable::GetRowHeight( SCROW nRow, SCROW* pStartRow, SCROW* pEndRow, } } - sal_uLong ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZero ) const { OSL_ENSURE(ValidRow(nStartRow) && ValidRow(nEndRow),"wrong row number"); @@ -3001,7 +2926,6 @@ sal_uLong ScTable::GetRowHeight( SCROW nStartRow, SCROW nEndRow, bool bHiddenAsZ return (nEndRow - nStartRow + 1) * (sal_uLong)ScGlobal::nStdRowHeight; } - sal_uLong ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fScale ) const { OSL_ENSURE(ValidRow(nStartRow) && ValidRow(nEndRow),"wrong row number"); @@ -3042,7 +2966,6 @@ sal_uLong ScTable::GetScaledRowHeight( SCROW nStartRow, SCROW nEndRow, double fS return (sal_uLong) ((nEndRow - nStartRow + 1) * ScGlobal::nStdRowHeight * fScale); } - sal_uInt16 ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if hidden { OSL_ENSURE(ValidRow(nRow),"wrong row number"); @@ -3053,10 +2976,8 @@ sal_uInt16 ScTable::GetOriginalHeight( SCROW nRow ) const // non-0 even if return (sal_uInt16) ScGlobal::nStdRowHeight; } - // Spalten-/Zeilen-Flags - SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const { if (!ValidRow(nRow)) @@ -3069,7 +2990,6 @@ SCROW ScTable::GetHiddenRowCount( SCROW nRow ) const return nLastRow - nRow + 1; } - //! ShowRows / DBShowRows zusammenfassen void ScTable::ShowCol(SCCOL nCol, bool bShow) @@ -3092,7 +3012,6 @@ void ScTable::ShowCol(SCCOL nCol, bool bShow) } } - void ScTable::ShowRow(SCROW nRow, bool bShow) { if (ValidRow(nRow) && pRowFlags) @@ -3116,7 +3035,6 @@ void ScTable::ShowRow(SCROW nRow, bool bShow) } } - void ScTable::DBShowRow(SCROW nRow, bool bShow) { if (ValidRow(nRow) && pRowFlags) @@ -3143,7 +3061,6 @@ void ScTable::DBShowRow(SCROW nRow, bool bShow) } } - void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow) { SCROW nStartRow = nRow1; @@ -3176,7 +3093,6 @@ void ScTable::DBShowRows(SCROW nRow1, SCROW nRow2, bool bShow) UpdateOutlineRow( nRow1, nRow2, bShow ); } - void ScTable::ShowRows(SCROW nRow1, SCROW nRow2, bool bShow) { SCROW nStartRow = nRow1; @@ -3250,7 +3166,6 @@ void ScTable::SetRowFlags( SCROW nRow, sal_uInt8 nNewFlags ) } } - void ScTable::SetRowFlags( SCROW nStartRow, SCROW nEndRow, sal_uInt8 nNewFlags ) { if (ValidRow(nStartRow) && ValidRow(nEndRow) && pRowFlags) @@ -3261,7 +3176,6 @@ void ScTable::SetRowFlags( SCROW nStartRow, SCROW nEndRow, sal_uInt8 nNewFlags ) } } - sal_uInt8 ScTable::GetColFlags( SCCOL nCol ) const { if (ValidCol(nCol) && pColFlags) @@ -3270,7 +3184,6 @@ sal_uInt8 ScTable::GetColFlags( SCCOL nCol ) const return 0; } - sal_uInt8 ScTable::GetRowFlags( SCROW nRow ) const { if (ValidRow(nRow) && pRowFlags) @@ -3279,7 +3192,6 @@ sal_uInt8 ScTable::GetRowFlags( SCROW nRow ) const return 0; } - SCROW ScTable::GetLastFlaggedRow() const { SCROW nLastFound = 0; @@ -3310,7 +3222,6 @@ SCROW ScTable::GetLastFlaggedRow() const return nLastFound; } - SCCOL ScTable::GetLastChangedCol() const { if ( !pColFlags ) @@ -3324,7 +3235,6 @@ SCCOL ScTable::GetLastChangedCol() const return nLastFound; } - SCROW ScTable::GetLastChangedRow() const { if ( !pRowFlags ) @@ -3342,7 +3252,6 @@ SCROW ScTable::GetLastChangedRow() const return std::max( nLastFlags, nLastHeight); } - bool ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, bool bShow ) { if (pOutlineTable && pColFlags) @@ -3354,7 +3263,6 @@ bool ScTable::UpdateOutlineCol( SCCOL nStartCol, SCCOL nEndCol, bool bShow ) return false; } - bool ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, bool bShow ) { if (pOutlineTable && pRowFlags) @@ -3363,7 +3271,6 @@ bool ScTable::UpdateOutlineRow( SCROW nStartRow, SCROW nEndRow, bool bShow ) return false; } - void ScTable::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) { // Column-wise expansion @@ -3394,7 +3301,6 @@ void ScTable::ExtendHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) } } - void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) { while ( rX2>rX1 && ColHidden(rX2) ) @@ -3421,7 +3327,6 @@ void ScTable::StripHidden( SCCOL& rX1, SCROW& rY1, SCCOL& rX2, SCROW& rY2 ) } } - // Auto-Outline template< typename T > @@ -3587,7 +3492,6 @@ void ScTable::CopyData( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW n } } - bool ScTable::RefVisible(ScFormulaCell* pCell) { ScRange aRef; @@ -3610,14 +3514,12 @@ bool ScTable::RefVisible(ScFormulaCell* pCell) return true; // irgendwie anders } - void ScTable::GetUpperCellString(SCCOL nCol, SCROW nRow, OUString& rStr) { GetInputString(nCol, nRow, rStr); rStr = ScGlobal::pCharClass->uppercase(rStr.trim()); } - // Berechnen der Groesse der Tabelle und setzen der Groesse an der DrawPage void ScTable::SetDrawPageSize(bool bResetStreamValid, bool bUpdateNoteCaptionPos) @@ -3662,7 +3564,6 @@ ScRangeName* ScTable::GetRangeName() const return mpRangeName; } - sal_uLong ScTable::GetRowOffset( SCROW nRow, bool bHiddenAsZero ) const { sal_uLong n = 0; @@ -3712,7 +3613,6 @@ SCROW ScTable::GetRowForHeight(sal_uLong nHeight) const return -1; } - sal_uLong ScTable::GetColOffset( SCCOL nCol, bool bHiddenAsZero ) const { sal_uLong n = 0; diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx index 5b44baf605fc..959a91953af7 100644 --- a/sc/source/core/data/table3.cxx +++ b/sc/source/core/data/table3.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <rtl/math.hxx> #include <unotools/textsearch.hxx> #include <svl/zforlist.hxx> @@ -221,7 +220,6 @@ IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo ) // END OF STATIC DATA ----------------------------------------------------- - class ScSortInfoArray : boost::noncopyable { public: @@ -500,7 +498,6 @@ bool ScTable::IsSortCollatorGlobal() const pSortCollator == ScGlobal::GetCaseCollator(); } - void ScTable::InitSortCollator( const ScSortParam& rPar ) { if ( !rPar.aCollatorLocale.Language.isEmpty() ) @@ -518,7 +515,6 @@ void ScTable::InitSortCollator( const ScSortParam& rPar ) } } - void ScTable::DestroySortCollator() { if ( pSortCollator ) @@ -1211,7 +1207,6 @@ static void lcl_RemoveNumberFormat( ScTable* pTab, SCCOL nCol, SCROW nRow ) } } - // at least MSC needs this at linkage level to be able to use it in a template typedef struct lcl_ScTable_DoSubTotals_RowEntry { @@ -2640,8 +2635,6 @@ bool ScTable::GetDataEntries(SCCOL nCol, SCROW nRow, std::set<ScTypedStrData>& r return aCol[nCol].GetDataEntries( nRow, rStrings, bLimit ); } - - sal_uLong ScTable::GetCellCount() const { sal_uLong nCellCount = 0; diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx index f378c89c6511..48b475e1e3a1 100644 --- a/sc/source/core/data/table4.cxx +++ b/sc/source/core/data/table4.cxx @@ -477,10 +477,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if ( (nFillCount == 0) || !ValidColRow(nCol1, nRow1) || !ValidColRow(nCol2, nRow2) ) return; - // Detect direction - bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP); bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT); @@ -555,10 +553,8 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (pProgress) nProgress = pProgress->GetState(); - // execute - sal_uLong nActFormCnt = 0; for (rOuter = nOStart; rOuter <= nOEnd; rOuter++) { @@ -627,7 +623,6 @@ void ScTable::FillAuto( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, } } - break; } @@ -1429,7 +1424,6 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, // Detect direction - bool bVertical = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_TOP); bool bPositive = (eFillDir == FILL_TO_BOTTOM || eFillDir == FILL_TO_RIGHT); @@ -1507,10 +1501,8 @@ void ScTable::FillSeries( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, if (pProgress) nProgress = pProgress->GetState(); - // execute - sal_uLong nActFormCnt = 0; for (rOuter = nOStart; rOuter <= nOEnd; rOuter++) { @@ -1814,7 +1806,6 @@ void ScTable::Fill( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, eFillCmd, eFillDateCmd, nStepValue, nMaxValue, 0, true, pProgress); } - void ScTable::AutoFormatArea(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCROW nEndRow, const ScPatternAttr& rAttr, sal_uInt16 nFormatNo) { diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx index dfe229f6da80..11c21c474776 100644 --- a/sc/source/core/data/table5.cxx +++ b/sc/source/core/data/table5.cxx @@ -55,7 +55,6 @@ using ::std::set; #define GET_SCALEVALUE(set,id) ((const SfxUInt16Item&)(set.Get( id ))).GetValue() - void ScTable::UpdatePageBreaks( const ScRange* pUserArea ) { if ( pDocument->IsImportingXML() ) @@ -1244,6 +1243,4 @@ void ScTable::InvalidateTextWidth( const ScAddress* pAdrFrom, const ScAddress* p } } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/data/table6.cxx b/sc/source/core/data/table6.cxx index a6101dbd70d4..8102c783d46f 100644 --- a/sc/source/core/data/table6.cxx +++ b/sc/source/core/data/table6.cxx @@ -33,7 +33,6 @@ #include "postit.hxx" #include "stringutil.hxx" - using ::com::sun::star::util::SearchOptions; namespace { diff --git a/sc/source/core/data/tabprotection.cxx b/sc/source/core/data/tabprotection.cxx index 364f922d715a..9b00683450a7 100644 --- a/sc/source/core/data/tabprotection.cxx +++ b/sc/source/core/data/tabprotection.cxx @@ -189,7 +189,6 @@ ScTableProtectionImpl::ScTableProtectionImpl(const ScTableProtectionImpl& r) : { } - bool ScTableProtectionImpl::isProtectedWithPass() const { if (!mbProtected) @@ -220,7 +219,6 @@ void ScTableProtectionImpl::setPassword(const OUString& aPassText) } } - bool ScTableProtectionImpl::hasPasswordHash(ScPasswordHash eHash, ScPasswordHash eHash2) const { if (mbEmptyPass) @@ -351,7 +349,6 @@ void ScTableProtectionImpl::setEnhancedProtection( const ::std::vector< ScEnhanc maEnhancedProtection = rProt; } - bool ScTableProtectionImpl::updateReference( UpdateRefMode eMode, ScDocument* pDoc, const ScRange& rWhere, SCsCOL nDx, SCsROW nDy, SCsTAB nDz ) { @@ -459,7 +456,6 @@ bool ScTableProtectionImpl::isSelectionEditable( const ScRangeList& rRangeList ) return true; } - ScDocProtection::ScDocProtection() : mpImpl(new ScTableProtectionImpl(static_cast<SCSIZE>(ScDocProtection::NONE))) { diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx index 528f9585778a..bcd66e053a14 100644 --- a/sc/source/core/data/validat.cxx +++ b/sc/source/core/data/validat.cxx @@ -52,10 +52,8 @@ using namespace formula; - // Eintrag fuer Gueltigkeit (es gibt nur eine Bedingung) - ScValidationData::ScValidationData( ScValidationMode eMode, ScConditionMode eOper, const OUString& rExpr1, const OUString& rExpr2, ScDocument* pDocument, const ScAddress& rPos, @@ -417,7 +415,6 @@ bool ScValidationData::DoError( Window* pParent, const OUString& rInput, return ( eErrorStyle == SC_VALERR_STOP || nRet == RET_CANCEL ); } - bool ScValidationData::IsDataValid( const OUString& rTest, const ScPatternAttr& rPattern, const ScAddress& rPos ) const { @@ -430,7 +427,6 @@ bool ScValidationData::IsDataValid( if (rTest[0] == '=') // formulas do not pass the validity test return false; - SvNumberFormatter* pFormatter = GetDocument()->GetFormatTable(); // get the value if any @@ -910,7 +906,6 @@ bool ScValidationData::IsListValid( ScRefCellValue& rCell, const ScAddress& rPos return bIsValid; } - ScValidationDataList::ScValidationDataList(const ScValidationDataList& rList) { // fuer Ref-Undo - echte Kopie mit neuen Tokens! diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index c0fed1fb527a..59ffc1e4b3f6 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -43,7 +43,6 @@ public: OString GetHelpId( const OUString& rFuncName ) const; }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/inc/bcaslot.hxx b/sc/source/core/inc/bcaslot.hxx index e7eb7992fbd8..29808753bb59 100644 --- a/sc/source/core/inc/bcaslot.hxx +++ b/sc/source/core/inc/bcaslot.hxx @@ -204,7 +204,6 @@ public: void UpdateRemoveArea( ScBroadcastArea* pArea ); void UpdateInsert( ScBroadcastArea* pArea ); - bool IsInBroadcastIteration() const { return mbInBroadcastIteration; } /** Erase an area from set and delete it if last reference, or if @@ -218,7 +217,6 @@ public: void GetAllListeners( const ScRange& rRange, std::vector<sc::AreaListener>& rListeners ); }; - /** BroadcastAreaSlots and their management, once per document. */ @@ -314,7 +312,6 @@ public: std::vector<sc::AreaListener> GetAllListeners( const ScRange& rRange ); }; - class ScBulkBroadcast { ScBroadcastAreaSlotMachine* pBASM; diff --git a/sc/source/core/inc/interpre.hxx b/sc/source/core/inc/interpre.hxx index 4708e0488496..b3b999a6c7bc 100644 --- a/sc/source/core/inc/interpre.hxx +++ b/sc/source/core/inc/interpre.hxx @@ -181,7 +181,6 @@ private: VolatileType meVolatileType; - /// Merge global and document specific settings. void MergeCalcConfig(); diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx index 6186f7539db6..ec9277f87935 100644 --- a/sc/source/core/inc/poolhelp.hxx +++ b/sc/source/core/inc/poolhelp.hxx @@ -31,7 +31,6 @@ class ScStyleSheetPool; class SvNumberFormatter; class SfxItemPool; - class ScPoolHelper : public salhelper::SimpleReferenceObject { private: diff --git a/sc/source/core/inc/refupdat.hxx b/sc/source/core/inc/refupdat.hxx index 0af07cfae288..20455ad8006f 100644 --- a/sc/source/core/inc/refupdat.hxx +++ b/sc/source/core/inc/refupdat.hxx @@ -71,7 +71,6 @@ public: const ScRange& rArea, SCCOL nGrowX, SCROW nGrowY, ScRange& rRef ); }; - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/inc/scrdata.hxx b/sc/source/core/inc/scrdata.hxx index a7a07c9eb97c..3c322dc3c929 100644 --- a/sc/source/core/inc/scrdata.hxx +++ b/sc/source/core/inc/scrdata.hxx @@ -26,7 +26,6 @@ namespace com { namespace sun { namespace star { namespace i18n { class XBreakIterator; } } } } - class ScScriptTypeData { public: @@ -38,5 +37,4 @@ public: #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/clcc/clew.cxx b/sc/source/core/opencl/clcc/clew.cxx index 6a7c4c0a71e5..485cd926a7dc 100644 --- a/sc/source/core/opencl/clcc/clew.cxx +++ b/sc/source/core/opencl/clcc/clew.cxx @@ -4,7 +4,6 @@ // Distributed under the Boost Software License, Version 1.0. // (See accompanying file license.txt) - #include "clew.h" //! \file clew.c @@ -112,7 +111,6 @@ PFNCLENQUEUEBARRIER __clewEnqueueBarrier = NULL; PFNCLGETEXTENSIONFUNCTIONADDRESS __clewGetExtensionFunctionAddress = NULL; #endif // CLCC_GENERATE_DOCUMENTATION - //! \brief Unloads OpenCL dynamic library, should not be called directly static void clewExit(void) { diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx index 1b88527fbab4..0f61972c258e 100644 --- a/sc/source/core/opencl/formulagroupcl.cxx +++ b/sc/source/core/opencl/formulagroupcl.cxx @@ -62,7 +62,6 @@ using namespace formula; namespace sc { namespace opencl { - /// Map the buffer used by an argument and do necessary argument setting size_t VectorRef::Marshal(cl_kernel k, int argno, int, cl_program) { @@ -1700,7 +1699,6 @@ public: virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "less"; } }; - class OpGreater: public Binary { public: virtual std::string GetBottom(void) SAL_OVERRIDE { return "0"; } diff --git a/sc/source/core/opencl/op_database.cxx b/sc/source/core/opencl/op_database.cxx index a77ce7fa337d..285da07002fa 100644 --- a/sc/source/core/opencl/op_database.cxx +++ b/sc/source/core/opencl/op_database.cxx @@ -18,7 +18,6 @@ #include <formula/vectortoken.hxx> #include <sstream> - namespace sc { namespace opencl { void OpDmax::GenSlidingWindowFunction(std::stringstream &ss, diff --git a/sc/source/core/opencl/op_database.hxx b/sc/source/core/opencl/op_database.hxx index ec0f57cc9a08..d64f3bcd37de 100644 --- a/sc/source/core/opencl/op_database.hxx +++ b/sc/source/core/opencl/op_database.hxx @@ -12,7 +12,6 @@ #include "opbase.hxx" - namespace sc { namespace opencl { class OpDmax: public CheckVariables @@ -103,7 +102,6 @@ public: virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "Dcount2"; } }; - }} #endif diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx index 6170bb77df7d..cc4e757c671b 100644 --- a/sc/source/core/opencl/op_financial.cxx +++ b/sc/source/core/opencl/op_financial.cxx @@ -363,7 +363,6 @@ void OpDISC::GenSlidingWindowFunction(std::stringstream& ss, ss << "}"; } - void OpINTRATE::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { @@ -2210,7 +2209,6 @@ void OpAccrintm::GenSlidingWindowFunction( funs.insert(IsLeapYear); } - void OpYield::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) { @@ -2233,7 +2231,6 @@ void OpYield::GenSlidingWindowFunction( ss << "double tmp005;\n\t"; ss << "double tmp006;\n\t"; - #ifdef ISNAN FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken(); const formula::SingleVectorRefToken*tmpCurDVR0= static_cast<const @@ -4482,7 +4479,6 @@ void OpYielddisc::GenSlidingWindowFunction( ss << "double tmp003;\n\t"; ss << "double tmp004;\n\t"; - #ifdef ISNAN FormulaToken *tmpCur0 = vSubArguments[0]->GetFormulaToken(); const formula::SingleVectorRefToken*tmpCurDVR0= static_cast<const diff --git a/sc/source/core/opencl/op_financial.hxx b/sc/source/core/opencl/op_financial.hxx index 415491f52be5..0136be7fc4f4 100644 --- a/sc/source/core/opencl/op_financial.hxx +++ b/sc/source/core/opencl/op_financial.hxx @@ -294,7 +294,6 @@ public: virtual void BinInlineFun(std::set<std::string>& ,std::set<std::string>& ) SAL_OVERRIDE; }; - class OpSLN: public Normal { public: diff --git a/sc/source/core/opencl/op_logical.cxx b/sc/source/core/opencl/op_logical.cxx index 96170f2293f3..1a9fcd25fe64 100644 --- a/sc/source/core/opencl/op_logical.cxx +++ b/sc/source/core/opencl/op_logical.cxx @@ -18,7 +18,6 @@ #include <formula/vectortoken.hxx> #include <sstream> - using namespace formula; namespace sc { namespace opencl { diff --git a/sc/source/core/opencl/op_logical.hxx b/sc/source/core/opencl/op_logical.hxx index 4365a57e7625..be0ba3755fb2 100644 --- a/sc/source/core/opencl/op_logical.hxx +++ b/sc/source/core/opencl/op_logical.hxx @@ -12,7 +12,6 @@ #include "opbase.hxx" - namespace sc { namespace opencl { class OpAnd: public Normal diff --git a/sc/source/core/opencl/op_math.cxx b/sc/source/core/opencl/op_math.cxx index 555da5926e9f..f9a7785104e9 100644 --- a/sc/source/core/opencl/op_math.cxx +++ b/sc/source/core/opencl/op_math.cxx @@ -285,7 +285,6 @@ void OpCot::GenSlidingWindowFunction(std::stringstream &ss, ss << "}"; } - void OpCoth::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { diff --git a/sc/source/core/opencl/op_math.hxx b/sc/source/core/opencl/op_math.hxx index d2500882f752..e839cf37b8d1 100644 --- a/sc/source/core/opencl/op_math.hxx +++ b/sc/source/core/opencl/op_math.hxx @@ -47,7 +47,6 @@ public: virtual std::string BinFuncName(void) const SAL_OVERRIDE { return "MROUND"; } }; - class OpCsc: public Normal { public: diff --git a/sc/source/core/opencl/op_spreadsheet.cxx b/sc/source/core/opencl/op_spreadsheet.cxx index 361085014542..a5823d49d981 100644 --- a/sc/source/core/opencl/op_spreadsheet.cxx +++ b/sc/source/core/opencl/op_spreadsheet.cxx @@ -165,7 +165,6 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss, ss << "[rowNum];\n"; ss << "}"; - } else { @@ -180,8 +179,6 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss, ss << "[rowNum];\n"; ss << "}"; - - } } ss << " return tmp;\n"; @@ -261,7 +258,6 @@ void OpVLookup::GenSlidingWindowFunction(std::stringstream &ss, ss << "[rowNum];\n"; } - } ss << " return tmp;\n"; ss << " }\n"; diff --git a/sc/source/core/opencl/op_statistical.cxx b/sc/source/core/opencl/op_statistical.cxx index 20dbb49362ba..c378e562ef9a 100644 --- a/sc/source/core/opencl/op_statistical.cxx +++ b/sc/source/core/opencl/op_statistical.cxx @@ -3625,7 +3625,6 @@ vSubArguments) ss << "}\n"; } - void OpFisherInv::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) { @@ -4053,7 +4052,6 @@ void OpPearson::GenSlidingWindowFunction( ss << "}\n"; } - void OpGammaLn::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) { @@ -4476,7 +4474,6 @@ void OpConfidence::GenSlidingWindowFunction(std::stringstream& ss, ss << "}"; } - void OpCritBinom::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { @@ -4592,7 +4589,6 @@ void OpCritBinom::GenSlidingWindowFunction(std::stringstream& ss, ss << "}"; } - void OpRsq::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) { @@ -5094,7 +5090,6 @@ void OpVariationen2::GenSlidingWindowFunction( ss << "}\n"; } - void OpPhi::GenSlidingWindowFunction( std::stringstream &ss,const std::string &sSymName, SubArguments &vSubArguments) @@ -7021,7 +7016,6 @@ void OpBinomdist::GenSlidingWindowFunction( ss << "}\n"; } - void OpChiSqDist::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { diff --git a/sc/source/core/opencl/opencl_device.cxx b/sc/source/core/opencl/opencl_device.cxx index 9070cd8ae519..0dec2673ffb7 100644 --- a/sc/source/core/opencl/opencl_device.cxx +++ b/sc/source/core/opencl/opencl_device.cxx @@ -24,7 +24,6 @@ #include "opencl_device.hxx" - #define INPUTSIZE 15360 #define OUTPUTSIZE 15360 diff --git a/sc/source/core/opencl/openclwrapper.cxx b/sc/source/core/opencl/openclwrapper.cxx index 4f8764479106..79e79255289b 100644 --- a/sc/source/core/opencl/openclwrapper.cxx +++ b/sc/source/core/opencl/openclwrapper.cxx @@ -179,7 +179,6 @@ std::vector<boost::shared_ptr<osl::File> > OpenclDevice::binaryGenerated( const if(clStatus != CL_SUCCESS) return aGeneratedFiles; - // grab the handles to all of the devices in the context. boost::scoped_array<cl_device_id> mpArryDevsID(new cl_device_id[numDevices]); clStatus = clGetContextInfo( context, CL_CONTEXT_DEVICES, diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index 04601b83c4ea..c18212fdeb58 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -271,7 +271,6 @@ std::string DateToDays_new= " return nDays;\n" "}\n"; - std::string GetNullDateDecl= "int GetNullDate(void);\n"; @@ -512,14 +511,12 @@ std::string getDaysInYearRange= ";\n" "}\n"; - std::string getDiffDecl= "int getDiff(int rFrom,int rTo,int fDay,int fMonth,int fYear,int fbLastDayMode," "int fbLastDay,int fb30Days,int fbUSMode,int fnDay,int tDay,int tMonth," "int tYear,int tbLastDayMode,int tbLastDay,int tb30Days," "int tbUSMode,int tnDay);\n"; - std::string getDiff= "int getDiff(int rFrom,int rTo,int fDay,int fMonth,int fYear,int fbLastDayMode," "int fbLastDay,int fb30Days,int fbUSMode,int fnDay,int tDay,int tMonth," @@ -581,7 +578,6 @@ std::string getDiff= std::string lcl_GetcoupdaybsDecl= "int lcl_Getcoupdaybs(int nNullDate,int nSettle, int nMat,int nFreq,int nBase);\n"; - std::string lcl_Getcoupdaybs= "int lcl_Getcoupdaybs(int nNullDate,int nSettle, int nMat,int nFreq,int nBase)\n" "{\n" @@ -837,11 +833,9 @@ std::string setDay= " }\n" "}\n"; - std::string coupdaysDecl= "double coupdays(int nSettle,int nMat,int nFreq,int nBase);\n"; - std::string coupdays= "double coupdays(int nSettle,int nMat,int nFreq,int nBase)\n" "{\n" @@ -887,7 +881,6 @@ std::string coupdaybs_new= std::string coupdaysncDecl= "double coupdaysnc( int nSettle,int nMat,int nFreq,int nBase);\n"; - std::string coupdaysnc= "double coupdaysnc( int nSettle,int nMat,int nFreq,int nBase)\n" "{\n" @@ -1009,7 +1002,6 @@ std::string getPrice_Decl= "double getPrice_(int nSettle, int nMat, double fRate, double fYield,\n" "double fRedemp, int nFreq, int nBase );\n"; - std::string getPrice_= "double getPrice_(int nSettle, int nMat, double fRate, double fYield,\n" "double fRedemp, int nFreq, int nBase )\n" @@ -1032,7 +1024,6 @@ std::string getPrice_new_Decl= "double getPrice_(int nSettle, int nMat, double fRate, double fYield,\n" "double fRedemp, int nFreq, int nBase );\n"; - std::string getPrice_new= "double getPrice_(int nSettle, int nMat, double fRate, double fYield,\n" "double fRedemp, int nFreq, int nBase )\n" @@ -1244,12 +1235,10 @@ std::string GetYearFrac= " return (double)( nDayDiff ) / (nDaysInYear);\n" "}\n"; - std::string GetYieldmatDecl= "double GetYieldmat( int nNullDate, int nSettle, int nMat, int nIssue,\n" "double fRate, double fPrice, int nBase );\n"; - std::string GetYieldmat= "double GetYieldmat( int nNullDate, int nSettle, int nMat, int nIssue,\n" "double fRate, double fPrice, int nBase )\n" @@ -1381,7 +1370,6 @@ std::string GetDiffDate360Decl= "int GetDiffDate360( int nNullDate, int nDate1, int nDate2," "bool bUSAMethod);\n"; - std::string GetDiffDate360= "int GetDiffDate360( int nNullDate, int nDate1, int nDate2," "bool bUSAMethod )\n" diff --git a/sc/source/core/opencl/opinlinefun_math.hxx b/sc/source/core/opencl/opinlinefun_math.hxx index 7666f9d36095..ab9dc02efa67 100644 --- a/sc/source/core/opencl/opinlinefun_math.hxx +++ b/sc/source/core/opencl/opinlinefun_math.hxx @@ -86,7 +86,6 @@ std::string atan2Content = " return a;\n" "}\n"; - #endif // INCLUDED_SC_SOURCE_CORE_OPENCL_OPINLINEFUN_MATH_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/opencl/opinlinefun_statistical.cxx b/sc/source/core/opencl/opinlinefun_statistical.cxx index 71cfd3df01b7..d16d9386feff 100644 --- a/sc/source/core/opencl/opinlinefun_statistical.cxx +++ b/sc/source/core/opencl/opinlinefun_statistical.cxx @@ -327,7 +327,6 @@ std::string GetBinomDistPMF = " }\n" "}\n"; - std::string lcl_GetBinomDistRangeDecl = "double lcl_GetBinomDistRange(double n, \n" "double xs, double xe, double fFactor, double p, double q);"; @@ -363,7 +362,6 @@ std::string GetLogGamma = " return lcl_GetLogGammaHelper(fZ+2) - log(fZ+1) - log(fZ);\n" "}\n"; - std::string GetChiDistDecl = "double GetChiDist(double fX, double fDF);\n"; std::string GetChiDist = "double GetChiDist(double fX, double fDF)\n" @@ -374,7 +372,6 @@ std::string GetChiDist = " return GetUpRegIGamma( fDF*pow(2.0,-1.0), fX*pow(2.0,-1.0));\n" "}\n"; - std::string GetChiSqDistCDFDecl = "double GetChiSqDistCDF(double fX, double fDF);\n"; std::string GetChiSqDistCDF = @@ -386,7 +383,6 @@ std::string GetChiSqDistCDF = " return GetLowRegIGamma( fDF*pow(2.0,-1.0), fX*pow(2.0,-1.0));\n" "}\n"; - std::string GetChiSqDistPDFDecl= "double GetChiSqDistPDF(double fX, double fDF);\n"; std::string GetChiSqDistPDF = @@ -426,7 +422,6 @@ std::string GetChiSqDistPDF = " return fValue;\n" "}\n"; - std::string lcl_IterateInverseBetaInvDecl = "static double lcl_IterateInverseBetaInv(double fp, double fAlpha, \n" " double fBeta, double fAx, double fBx, bool *rConvError );\n"; @@ -524,7 +519,6 @@ std::string lcl_IterateInverseBetaInv = " return fRx;\n" "}\n"; - std::string lcl_IterateInverseChiInvDecl = "static double lcl_IterateInverseChiInv" "(double fp, double fdf, double fAx, double fBx, bool *rConvError);\n"; @@ -1545,4 +1539,3 @@ std::string rtl_math_erfc_rd = #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index f0a757b071e8..9b52c862e5e9 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -1346,7 +1346,6 @@ ScUnoAddInCall::~ScUnoAddInCall() // pFuncData is deleted with ScUnoAddInCollection } - ScAddInArgumentType ScUnoAddInCall::GetArgType( long nPos ) { if ( pFuncData ) @@ -1699,5 +1698,4 @@ void ScUnoAddInCall::SetResult( const uno::Any& rNewRes ) } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/addinlis.cxx b/sc/source/core/tool/addinlis.cxx index cea7023d0a7b..abdd4c4b4c64 100644 --- a/sc/source/core/tool/addinlis.cxx +++ b/sc/source/core/tool/addinlis.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <sfx2/objsh.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/core/tool/cellkeytranslator.cxx b/sc/source/core/tool/cellkeytranslator.cxx index 8df2576e140d..2c7bb57f54df 100644 --- a/sc/source/core/tool/cellkeytranslator.cxx +++ b/sc/source/core/tool/cellkeytranslator.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "cellkeytranslator.hxx" #include <comphelper/processfactory.hxx> #include <i18nlangtag/mslangid.hxx> diff --git a/sc/source/core/tool/chartarr.cxx b/sc/source/core/tool/chartarr.cxx index e3d3a1914733..c92977fe0cca 100644 --- a/sc/source/core/tool/chartarr.cxx +++ b/sc/source/core/tool/chartarr.cxx @@ -147,10 +147,8 @@ ScMemChart* ScChartArray::CreateMemChartSingle() SCSIZE nCol; SCSIZE nRow; - // real size (without hidden rows/columns) - SCCOL nColAdd = HasRowHeaders() ? 1 : 0; SCROW nRowAdd = HasColHeaders() ? 1 : 0; @@ -264,7 +262,6 @@ ScMemChart* ScChartArray::CreateMemChartSingle() pMemChart->SetData( nCol, nRow, DBL_MIN ); } - // Column Header for (nCol=0; nCol<nColCount; nCol++) @@ -286,7 +283,6 @@ ScMemChart* ScChartArray::CreateMemChartSingle() pMemChart->SetColText( nCol, aString); } - // Row Header for (nRow=0; nRow<nRowCount; nRow++) @@ -376,10 +372,8 @@ ScMemChart* ScChartArray::CreateMemChartMulti() //TODO: Label when gaps - // Column header - SCCOL nPosCol = 0; for ( nCol = 0; nCol < nColCount; nCol++ ) { @@ -403,10 +397,8 @@ ScMemChart* ScChartArray::CreateMemChartMulti() pMemChart->SetColText( nCol, aString); } - // Row header - SCROW nPosRow = 0; for ( nRow = 0; nRow < nRowCount; nRow++ ) { diff --git a/sc/source/core/tool/chartlis.cxx b/sc/source/core/tool/chartlis.cxx index a19686bdf4a8..1fa991a4653a 100644 --- a/sc/source/core/tool/chartlis.cxx +++ b/sc/source/core/tool/chartlis.cxx @@ -95,7 +95,6 @@ void ScChartListener::ExternalRefListener::removeFileId(sal_uInt16 nFileId) maFileIds.erase(nFileId); } - ScChartListener::ScChartListener( const OUString& rName, ScDocument* pDocP, const ScRangeListRef& rRangeList ) : SvtListener(), @@ -172,7 +171,6 @@ ScChartListener::~ScChartListener() } } - void ScChartListener::SetUno( const uno::Reference< chart::XChartDataChangeEventListener >& rListener, const uno::Reference< chart::XChartData >& rSource ) @@ -469,9 +467,6 @@ bool ScChartListenerCollection::hasListeners() const return !maListeners.empty(); } - - - OUString ScChartListenerCollection::getUniqueName(const OUString& rPrefix) const { for (sal_Int32 nNum = 1; nNum < 10000; ++nNum) // arbitrary limit to prevent infinite loop. diff --git a/sc/source/core/tool/chartpos.cxx b/sc/source/core/tool/chartpos.cxx index 11a0bb281613..b36b6e9e4685 100644 --- a/sc/source/core/tool/chartpos.cxx +++ b/sc/source/core/tool/chartpos.cxx @@ -342,7 +342,6 @@ const ScChartPositionMap* ScChartPositioner::GetPositionMap() return pPositionMap; } - void ScChartPositioner::CreatePositionMap() { if ( eGlue == SC_CHARTGLUE_NA && pPositionMap ) @@ -361,10 +360,8 @@ void ScChartPositioner::CreatePositionMap() SCROW nRow, nRow1, nRow2; SCTAB nTab, nTab1, nTab2; - // real size (without hidden rows/columns) - SCSIZE nColCount = 0; SCSIZE nRowCount = 0; @@ -480,7 +477,6 @@ void ScChartPositioner::CreatePositionMap() delete pCols; } - ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, SCCOL nColAdd, SCROW nRowAdd, ColumnMap& rCols ) : ppData( new ScAddress* [ nChartCols * nChartRows ] ), @@ -570,7 +566,6 @@ ScChartPositionMap::ScChartPositionMap( SCCOL nChartCols, SCROW nChartRows, } } - ScChartPositionMap::~ScChartPositionMap() { for ( sal_uLong nIndex=0; nIndex < nCount; nIndex++ ) diff --git a/sc/source/core/tool/chgtrack.cxx b/sc/source/core/tool/chgtrack.cxx index 239964488221..8f1691def1fd 100644 --- a/sc/source/core/tool/chgtrack.cxx +++ b/sc/source/core/tool/chgtrack.cxx @@ -553,13 +553,11 @@ OUString ScChangeAction::GetRefString( return aBuf.makeStringAndClear(); } - void ScChangeAction::SetUser( const OUString& r ) { aUser = r; } - void ScChangeAction::SetComment( const OUString& rStr ) { aComment = rStr; @@ -875,7 +873,6 @@ bool ScChangeActionDel::IsTabDeleteCol() const return p && p->GetType() == SC_CAT_DELETE_TABS; } - ScChangeActionDelMoveEntry* ScChangeActionDel::AddCutOffMove( ScChangeActionMove* pMove, short nFrom, short nTo ) { @@ -1443,8 +1440,6 @@ void ScChangeActionContent::GetNewString( OUString& rStr, const ScDocument* pDoc GetValueString(rStr, maNewValue, maNewCell, pDoc); } - - void ScChangeActionContent::GetDescription( OUString& rStr, ScDocument* pDoc, bool bSplitRange, bool bWarning ) const { @@ -2201,7 +2196,6 @@ void ScChangeTrack::Clear() Init(); } - void ScChangeTrack::ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ) { if ( !pDoc->IsInDtorClear() ) @@ -2238,7 +2232,6 @@ void ScChangeTrack::SetUser( const OUString& rUser ) maUserCollection.insert(maUser); } - void ScChangeTrack::StartBlockModify( ScChangeTrackMsgType eMsgType, sal_uLong nStartAction ) { diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx index 48c505e9ff93..c5ba011739ff 100644 --- a/sc/source/core/tool/dbdata.cxx +++ b/sc/source/core/tool/dbdata.cxx @@ -802,10 +802,6 @@ ScDBCollection::ScDBCollection(ScDocument* pDocument) : ScDBCollection::ScDBCollection(const ScDBCollection& r) : pDoc(r.pDoc), nEntryIndex(r.nEntryIndex), maNamedDBs(r.maNamedDBs), maAnonDBs(r.maAnonDBs) {} - - - - const ScDBData* ScDBCollection::GetDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool bStartOnly) const { // First, search the global named db ranges. diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx index 14d6aaee5bcc..39e4bbd531ef 100644 --- a/sc/source/core/tool/detfunc.cxx +++ b/sc/source/core/tool/detfunc.cxx @@ -1144,8 +1144,6 @@ sal_uInt16 ScDetectiveFunc::FindSuccLevel( SCCOL nCol1, SCROW nRow1, SCCOL nCol2 return nResult; } - - bool ScDetectiveFunc::ShowPred( SCCOL nCol, SCROW nRow ) { ScDrawLayer* pModel = pDoc->GetDrawLayer(); diff --git a/sc/source/core/tool/doubleref.cxx b/sc/source/core/tool/doubleref.cxx index 547bc21e6aec..2499c71f4105 100644 --- a/sc/source/core/tool/doubleref.cxx +++ b/sc/source/core/tool/doubleref.cxx @@ -266,7 +266,6 @@ void ScDBRangeBase::fillQueryOptions(ScQueryParamBase* pParam) pParam->bDuplicate = true; } - ScDBInternalRange::ScDBInternalRange(ScDocument* pDoc, const ScRange& rRange) : ScDBRangeBase(pDoc, INTERNAL), maRange(rRange) { @@ -276,7 +275,6 @@ ScDBInternalRange::~ScDBInternalRange() { } - SCCOL ScDBInternalRange::getColSize() const { return maRange.aEnd.Col() - maRange.aStart.Col() + 1; diff --git a/sc/source/core/tool/editdataarray.cxx b/sc/source/core/tool/editdataarray.cxx index a635d64a465e..63b9b1d53ff9 100644 --- a/sc/source/core/tool/editdataarray.cxx +++ b/sc/source/core/tool/editdataarray.cxx @@ -72,7 +72,4 @@ const EditTextObject* ScEditDataArray::Item::GetNewData() const return mpNewData.get(); } - - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/editutil.cxx b/sc/source/core/tool/editutil.cxx index 732d55c15609..e3aa845cffe0 100644 --- a/sc/source/core/tool/editutil.cxx +++ b/sc/source/core/tool/editutil.cxx @@ -716,10 +716,8 @@ void ScTabEditEngine::Init( const ScPatternAttr& rPattern ) // Feldbefehle fuer Kopf- und Fusszeilen - // Zahlen aus \sw\source\core\doc\numbers.cxx - static OUString lcl_GetCharStr( sal_Int32 nNo ) { OSL_ENSURE( nNo, "0 is an invalid number !!" ); @@ -844,10 +842,8 @@ OUString ScHeaderEditEngine::CalcFieldValue( const SvxFieldItem& rField, return aRet; } - // Feld-Daten - ScFieldEditEngine::ScFieldEditEngine( ScDocument* pDoc, SfxItemPool* pEnginePoolP, SfxItemPool* pTextObjectPool, bool bDeleteEnginePoolP) : diff --git a/sc/source/core/tool/formularesult.cxx b/sc/source/core/tool/formularesult.cxx index 658eb97821e5..983da5daaccd 100644 --- a/sc/source/core/tool/formularesult.cxx +++ b/sc/source/core/tool/formularesult.cxx @@ -67,7 +67,6 @@ ScFormulaResult::~ScFormulaResult() mpToken->DecRef(); } - void ScFormulaResult::ResetToDefaults() { mnError = 0; diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx index 8c86e56a7839..d9a7d588dcc0 100644 --- a/sc/source/core/tool/interpr1.cxx +++ b/sc/source/core/tool/interpr1.cxx @@ -211,7 +211,6 @@ void ScInterpreter::ScIfJump() } } - /** Store a matrix value in another matrix in the context of that other matrix is the result matrix of a jump matrix. All arguments must be valid and are not checked. */ @@ -233,7 +232,6 @@ static void lcl_storeJumpMatResult( } } - void ScInterpreter::ScIfError( bool bNAonly ) { const short* pJump = pCur->GetJump(); @@ -393,7 +391,6 @@ void ScInterpreter::ScIfError( bool bNAonly ) } } - void ScInterpreter::ScChoseJump() { // We have to set a jump, if there was none chosen because of an error set @@ -879,7 +876,6 @@ double ScInterpreter::Compare() return sc::CompareFunc(aComp.maCells[0], aComp.maCells[1], aComp.mbIgnoreCase); } - sc::RangeMatrix ScInterpreter::CompareMat( ScQueryOp eOp, sc::CompareOptions* pOptions ) { sc::Compare aComp; @@ -1041,7 +1037,6 @@ sc::RangeMatrix ScInterpreter::CompareMat( ScQueryOp eOp, sc::CompareOptions* pO return aRes; } - ScMatrixRef ScInterpreter::QueryMat( const ScMatrixRef& pMat, sc::CompareOptions& rOptions ) { short nSaveCurFmtType = nCurFmtType; @@ -1081,7 +1076,6 @@ void ScInterpreter::ScEqual() PushInt( int(Compare() == 0) ); } - void ScInterpreter::ScNotEqual() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1099,7 +1093,6 @@ void ScInterpreter::ScNotEqual() PushInt( int(Compare() != 0) ); } - void ScInterpreter::ScLess() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1117,7 +1110,6 @@ void ScInterpreter::ScLess() PushInt( int(Compare() < 0) ); } - void ScInterpreter::ScGreater() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1135,7 +1127,6 @@ void ScInterpreter::ScGreater() PushInt( int(Compare() > 0) ); } - void ScInterpreter::ScLessEqual() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1153,7 +1144,6 @@ void ScInterpreter::ScLessEqual() PushInt( int(Compare() <= 0) ); } - void ScInterpreter::ScGreaterEqual() { if ( GetStackType(1) == svMatrix || GetStackType(2) == svMatrix ) @@ -1171,7 +1161,6 @@ void ScInterpreter::ScGreaterEqual() PushInt( int(Compare() >= 0) ); } - void ScInterpreter::ScAnd() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -1271,7 +1260,6 @@ void ScInterpreter::ScAnd() } } - void ScInterpreter::ScOr() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -1372,7 +1360,6 @@ void ScInterpreter::ScOr() } } - void ScInterpreter::ScXor() { @@ -1476,7 +1463,6 @@ void ScInterpreter::ScXor() } } - void ScInterpreter::ScNeg() { // Simple negation doesn't change current format type to number, keep @@ -1519,7 +1505,6 @@ void ScInterpreter::ScNeg() } } - void ScInterpreter::ScPercentSign() { nFuncFmtType = NUMBERFORMAT_PERCENT; @@ -1534,7 +1519,6 @@ void ScInterpreter::ScPercentSign() cPar = nSavePar; } - void ScInterpreter::ScNot() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -1575,7 +1559,6 @@ void ScInterpreter::ScNot() } } - void ScInterpreter::ScBitAnd() { @@ -1591,7 +1574,6 @@ void ScInterpreter::ScBitAnd() PushDouble ((sal_uInt64) num1 & (sal_uInt64) num2); } - void ScInterpreter::ScBitOr() { @@ -1607,7 +1589,6 @@ void ScInterpreter::ScBitOr() PushDouble ((sal_uInt64) num1 | (sal_uInt64) num2); } - void ScInterpreter::ScBitXor() { @@ -1623,7 +1604,6 @@ void ScInterpreter::ScBitXor() PushDouble ((sal_uInt64) num1 ^ (sal_uInt64) num2); } - void ScInterpreter::ScBitLshift() { @@ -1647,7 +1627,6 @@ void ScInterpreter::ScBitLshift() } } - void ScInterpreter::ScBitRshift() { @@ -1671,117 +1650,98 @@ void ScInterpreter::ScBitRshift() } } - void ScInterpreter::ScPi() { PushDouble(F_PI); } - void ScInterpreter::ScRandom() { PushDouble(::comphelper::rng::uniform()); } - void ScInterpreter::ScTrue() { nFuncFmtType = NUMBERFORMAT_LOGICAL; PushInt(1); } - void ScInterpreter::ScFalse() { nFuncFmtType = NUMBERFORMAT_LOGICAL; PushInt(0); } - void ScInterpreter::ScDeg() { PushDouble((GetDouble() / F_PI) * 180.0); } - void ScInterpreter::ScRad() { PushDouble(GetDouble() * (F_PI / 180)); } - void ScInterpreter::ScSin() { PushDouble(::rtl::math::sin(GetDouble())); } - void ScInterpreter::ScCos() { PushDouble(::rtl::math::cos(GetDouble())); } - void ScInterpreter::ScTan() { PushDouble(::rtl::math::tan(GetDouble())); } - void ScInterpreter::ScCot() { PushDouble(1.0 / ::rtl::math::tan(GetDouble())); } - void ScInterpreter::ScArcSin() { PushDouble(asin(GetDouble())); } - void ScInterpreter::ScArcCos() { PushDouble(acos(GetDouble())); } - void ScInterpreter::ScArcTan() { PushDouble(atan(GetDouble())); } - void ScInterpreter::ScArcCot() { PushDouble((F_PI2) - atan(GetDouble())); } - void ScInterpreter::ScSinHyp() { PushDouble(sinh(GetDouble())); } - void ScInterpreter::ScCosHyp() { PushDouble(cosh(GetDouble())); } - void ScInterpreter::ScTanHyp() { PushDouble(tanh(GetDouble())); } - void ScInterpreter::ScCotHyp() { PushDouble(1.0 / tanh(GetDouble())); } - void ScInterpreter::ScArcSinHyp() { PushDouble( ::rtl::math::asinh( GetDouble())); @@ -1805,7 +1765,6 @@ void ScInterpreter::ScArcTanHyp() PushDouble( ::rtl::math::atanh( fVal)); } - void ScInterpreter::ScArcCotHyp() { double nVal = GetDouble(); @@ -1835,13 +1794,11 @@ void ScInterpreter::ScSecantHyp() PushDouble(1.0 / cosh(GetDouble())); } - void ScInterpreter::ScExp() { PushDouble(exp(GetDouble())); } - void ScInterpreter::ScSqrt() { double fVal = GetDouble(); @@ -1851,7 +1808,6 @@ void ScInterpreter::ScSqrt() PushIllegalArgument(); } - void ScInterpreter::ScIsEmpty() { short nRes = 0; @@ -1907,7 +1863,6 @@ void ScInterpreter::ScIsEmpty() PushInt( nRes ); } - bool ScInterpreter::IsString() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -1968,19 +1923,16 @@ bool ScInterpreter::IsString() return nRes; } - void ScInterpreter::ScIsString() { PushInt( int(IsString()) ); } - void ScInterpreter::ScIsNonString() { PushInt( int(!IsString()) ); } - void ScInterpreter::ScIsLogical() { bool nRes = false; @@ -2019,7 +1971,6 @@ void ScInterpreter::ScIsLogical() PushInt( int(nRes) ); } - void ScInterpreter::ScType() { short nType = 0; @@ -2098,13 +2049,11 @@ void ScInterpreter::ScType() PushInt( nType ); } - static inline bool lcl_FormatHasNegColor( const SvNumberformat* pFormat ) { return pFormat && pFormat->GetColor( 1 ); } - static inline bool lcl_FormatHasOpenPar( const SvNumberformat* pFormat ) { return pFormat && (pFormat->GetFormatstring().indexOf('(') != -1); @@ -2527,7 +2476,6 @@ void ScInterpreter::ScIsRef() PushInt( int(nRes) ); } - void ScInterpreter::ScIsValue() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2591,7 +2539,6 @@ void ScInterpreter::ScIsValue() PushInt( int(nRes) ); } - void ScInterpreter::ScIsFormula() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2615,7 +2562,6 @@ void ScInterpreter::ScIsFormula() PushInt( int(nRes) ); } - void ScInterpreter::ScFormula() { OUString aFormula; @@ -2695,7 +2641,6 @@ void ScInterpreter::ScIsNV() PushInt( int(nRes) ); } - void ScInterpreter::ScIsErr() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2750,7 +2695,6 @@ void ScInterpreter::ScIsErr() PushInt( int(nRes) ); } - void ScInterpreter::ScIsError() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2802,7 +2746,6 @@ void ScInterpreter::ScIsError() PushInt( int(nRes) ); } - bool ScInterpreter::IsEven() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -2886,13 +2829,11 @@ bool ScInterpreter::IsEven() return nRes; } - void ScInterpreter::ScIsEven() { PushInt( int(IsEven()) ); } - void ScInterpreter::ScIsOdd() { PushInt( int(!IsEven()) ); @@ -2931,14 +2872,12 @@ void ScInterpreter::ScTrim() PushString(aStr.makeStringAndClear()); } - void ScInterpreter::ScUpper() { OUString aString = ScGlobal::pCharClass->uppercase(GetString().getString()); PushString(aString); } - void ScInterpreter::ScPropper() { //2do: what to do with I18N-CJK ?!? @@ -2963,20 +2902,17 @@ void ScInterpreter::ScPropper() PushString(aStr.makeStringAndClear()); } - void ScInterpreter::ScLower() { OUString aString = ScGlobal::pCharClass->lowercase(GetString().getString()); PushString(aString); } - void ScInterpreter::ScLen() { PushDouble(GetString().getLength()); } - void ScInterpreter::ScT() { switch ( GetStackType() ) @@ -3045,7 +2981,6 @@ void ScInterpreter::ScT() } } - void ScInterpreter::ScValue() { OUString aInputString; @@ -3127,7 +3062,6 @@ void ScInterpreter::ScValue() PushIllegalArgument(); } - // fdo#57180 void ScInterpreter::ScNumberValue() { @@ -3224,7 +3158,6 @@ void ScInterpreter::ScNumberValue() PushNoValue(); } - //2do: this should be a proper unicode string method static inline bool lcl_ScInterpreter_IsPrintable( sal_Unicode c ) { @@ -3242,7 +3175,6 @@ void ScInterpreter::ScClean() PushString(aStr); } - void ScInterpreter::ScCode() { //2do: make it full range unicode? @@ -3258,7 +3190,6 @@ void ScInterpreter::ScCode() PushInt( (unsigned char) OUStringToOString(OUString(aStr[0]), osl_getThreadTextEncoding(), convertFlags).toChar() ); } - void ScInterpreter::ScChar() { //2do: make it full range unicode? @@ -3279,7 +3210,6 @@ void ScInterpreter::ScChar() } } - /* #i70213# fullwidth/halfwidth conversion provided by * Takashi Nakamoto <bluedwarf@ooo> * erAck: added Excel compatibility conversions as seen in issue's test case. */ @@ -3298,7 +3228,6 @@ static OUString lcl_convertIntoHalfWidth( const OUString & rStr ) return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ), NULL ); } - static OUString lcl_convertIntoFullWidth( const OUString & rStr ) { static bool bFirstJISCall = true; @@ -3313,7 +3242,6 @@ static OUString lcl_convertIntoFullWidth( const OUString & rStr ) return aTrans.transliterate( rStr, 0, sal_uInt16( rStr.getLength() ), NULL ); } - /* ODFF: * Summary: Converts half-width to full-width ASCII and katakana characters. * Semantics: Conversion is done for half-width ASCII and katakana characters, @@ -3330,7 +3258,6 @@ void ScInterpreter::ScJis() PushString( lcl_convertIntoFullWidth( GetString().getString())); } - /* ODFF: * Summary: Converts full-width to half-width ASCII and katakana characters. * Semantics: Conversion is done for full-width ASCII and katakana characters, @@ -3374,7 +3301,6 @@ void ScInterpreter::ScUnichar() } } - void ScInterpreter::ScMin( bool bTextAsZero ) { short nParamCount = GetByte(); @@ -3683,7 +3609,6 @@ void ScInterpreter::GetStVarParams( double& rVal, double& rValCount, rVal = vSum; } - void ScInterpreter::ScVar( bool bTextAsZero ) { double nVal; @@ -3696,7 +3621,6 @@ void ScInterpreter::ScVar( bool bTextAsZero ) PushDouble( nVal / (nValCount - 1.0)); } - void ScInterpreter::ScVarP( bool bTextAsZero ) { double nVal; @@ -3706,7 +3630,6 @@ void ScInterpreter::ScVarP( bool bTextAsZero ) PushDouble( div( nVal, nValCount)); } - void ScInterpreter::ScStDev( bool bTextAsZero ) { double nVal; @@ -3718,7 +3641,6 @@ void ScInterpreter::ScStDev( bool bTextAsZero ) PushDouble( sqrt( nVal / (nValCount - 1.0))); } - void ScInterpreter::ScStDevP( bool bTextAsZero ) { double nVal; @@ -3747,7 +3669,6 @@ void ScInterpreter::ScStDevP( bool bTextAsZero ) */ } - void ScInterpreter::ScColumns() { sal_uInt8 nParamCount = GetByte(); @@ -3805,7 +3726,6 @@ void ScInterpreter::ScColumns() PushDouble((double)nVal); } - void ScInterpreter::ScRows() { sal_uInt8 nParamCount = GetByte(); @@ -3917,7 +3837,6 @@ void ScInterpreter::ScTables() PushDouble( (double) nVal ); } - void ScInterpreter::ScColumn() { sal_uInt8 nParamCount = GetByte(); @@ -3999,7 +3918,6 @@ void ScInterpreter::ScColumn() } } - void ScInterpreter::ScRow() { sal_uInt8 nParamCount = GetByte(); @@ -4589,7 +4507,6 @@ void ScInterpreter::ScMatch() } } - void ScInterpreter::ScCountEmptyCells() { if ( MustHaveParamCount( GetByte(), 1 ) ) @@ -4637,7 +4554,6 @@ void ScInterpreter::ScCountEmptyCells() } } - double ScInterpreter::IterateParametersIf( ScIterFuncIf eFunc ) { sal_uInt8 nParamCount = GetByte(); @@ -5840,7 +5756,6 @@ void ScInterpreter::ScLookup() SetError( errIllegalParameter); } - if (nGlobalError) { PushError( nGlobalError); @@ -6248,7 +6163,6 @@ void ScInterpreter::ScLookup() } } - void ScInterpreter::ScHLookup() { CalculateLookup(true); @@ -6852,7 +6766,6 @@ ScDBQueryParamBase* ScInterpreter::GetDBParams( bool& rMissingField ) return NULL; } - void ScInterpreter::DBIterator( ScIterFunc eFunc ) { double nErg = 0.0; @@ -6919,13 +6832,11 @@ void ScInterpreter::DBIterator( ScIterFunc eFunc ) PushDouble( nErg ); } - void ScInterpreter::ScDBSum() { DBIterator( ifSUM ); } - void ScInterpreter::ScDBCount() { bool bMissingField = true; @@ -6986,7 +6897,6 @@ void ScInterpreter::ScDBCount() PushIllegalParameter(); } - void ScInterpreter::ScDBCount2() { bool bMissingField = true; @@ -7019,31 +6929,26 @@ void ScInterpreter::ScDBCount2() PushIllegalParameter(); } - void ScInterpreter::ScDBAverage() { DBIterator( ifAVERAGE ); } - void ScInterpreter::ScDBMax() { DBIterator( ifMAX ); } - void ScInterpreter::ScDBMin() { DBIterator( ifMIN ); } - void ScInterpreter::ScDBProduct() { DBIterator( ifPRODUCT ); } - void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) { std::vector<double> values; @@ -7088,7 +6993,6 @@ void ScInterpreter::GetDBStVarParams( double& rVal, double& rValCount ) rVal = vSum; } - void ScInterpreter::ScDBStdDev() { double fVal, fCount; @@ -7096,7 +7000,6 @@ void ScInterpreter::ScDBStdDev() PushDouble( sqrt(fVal/(fCount-1))); } - void ScInterpreter::ScDBStdDevP() { double fVal, fCount; @@ -7104,7 +7007,6 @@ void ScInterpreter::ScDBStdDevP() PushDouble( sqrt(fVal/fCount)); } - void ScInterpreter::ScDBVar() { double fVal, fCount; @@ -7112,7 +7014,6 @@ void ScInterpreter::ScDBVar() PushDouble(fVal/(fCount-1)); } - void ScInterpreter::ScDBVarP() { double fVal, fCount; @@ -7200,7 +7101,6 @@ void ScInterpreter::ScIndirect() } } - void ScInterpreter::ScAddressFunc() { OUString sTabStr; @@ -7291,7 +7191,6 @@ void ScInterpreter::ScAddressFunc() PushString( aRefStr ); } - void ScInterpreter::ScOffset() { sal_uInt8 nParamCount = GetByte(); @@ -7439,7 +7338,6 @@ void ScInterpreter::ScOffset() } } - void ScInterpreter::ScIndex() { sal_uInt8 nParamCount = GetByte(); @@ -7645,7 +7543,6 @@ void ScInterpreter::ScIndex() } } - void ScInterpreter::ScMultiArea() { // Legacy support, convert to RefList @@ -7659,7 +7556,6 @@ void ScInterpreter::ScMultiArea() } } - void ScInterpreter::ScAreas() { sal_uInt8 nParamCount = GetByte(); @@ -7696,7 +7592,6 @@ void ScInterpreter::ScAreas() } } - void ScInterpreter::ScCurrency() { sal_uInt8 nParamCount = GetByte(); @@ -7755,7 +7650,6 @@ void ScInterpreter::ScCurrency() } } - void ScInterpreter::ScReplace() { if ( MustHaveParamCount( GetByte(), 4 ) ) @@ -7783,7 +7677,6 @@ void ScInterpreter::ScReplace() } } - void ScInterpreter::ScFixed() { sal_uInt8 nParamCount = GetByte(); @@ -7841,7 +7734,6 @@ void ScInterpreter::ScFixed() } } - void ScInterpreter::ScFind() { sal_uInt8 nParamCount = GetByte(); @@ -7866,7 +7758,6 @@ void ScInterpreter::ScFind() } } - void ScInterpreter::ScExact() { nFuncFmtType = NUMBERFORMAT_LOGICAL; @@ -7878,7 +7769,6 @@ void ScInterpreter::ScExact() } } - void ScInterpreter::ScLeft() { sal_uInt8 nParamCount = GetByte(); @@ -8107,7 +7997,6 @@ void ScInterpreter::ScRight() } } - void ScInterpreter::ScSearch() { sal_uInt8 nParamCount = GetByte(); @@ -8247,7 +8136,6 @@ void ScInterpreter::ScText() } } - void ScInterpreter::ScSubstitute() { sal_uInt8 nParamCount = GetByte(); @@ -8301,7 +8189,6 @@ void ScInterpreter::ScSubstitute() } } - void ScInterpreter::ScRept() { if ( MustHaveParamCount( GetByte(), 2 ) ) @@ -8328,7 +8215,6 @@ void ScInterpreter::ScRept() } } - void ScInterpreter::ScConcat() { sal_uInt8 nParamCount = GetByte(); @@ -8341,7 +8227,6 @@ void ScInterpreter::ScConcat() PushString( aRes ); } - void ScInterpreter::ScErrorType() { sal_uInt16 nErr; @@ -8422,7 +8307,6 @@ void ScInterpreter::ScErrorType() } } - bool ScInterpreter::MayBeRegExp( const OUString& rStr, const ScDocument* pDoc ) { if ( pDoc && !pDoc->GetDocOptions().IsFormulaRegexEnabled() ) diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx index 51453ddc892f..02938092f217 100644 --- a/sc/source/core/tool/interpr2.cxx +++ b/sc/source/core/tool/interpr2.cxx @@ -2184,10 +2184,8 @@ void ScInterpreter::ScStyle() if (nTimeOut < 0) nTimeOut = 0; - // Request ausfuehren, um Vorlage anzuwenden - if ( !pDok->IsClipOrUndo() ) { SfxObjectShell* pShell = pDok->GetDocumentShell(); diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index dba4882c62da..f20b07f0b560 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -249,10 +249,8 @@ double ScInterpreter::gauss(double x) return nVal; } - // #i26836# new gaussinv implementation by Martin Eitzenberger <m.eitzenberger@unix.net> - double ScInterpreter::gaussinv(double x) { double q,t,z; diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx index 5ed260e6871b..3238d066f9d6 100644 --- a/sc/source/core/tool/interpr4.cxx +++ b/sc/source/core/tool/interpr4.cxx @@ -82,7 +82,6 @@ using ::std::auto_ptr; //-----------------------------static data ----------------- - // Funktionen fuer den Zugriff auf das Document void ScInterpreter::ReplaceCell( ScAddress& rPos ) @@ -104,7 +103,6 @@ void ScInterpreter::ReplaceCell( ScAddress& rPos ) } } - void ScInterpreter::ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ) { ScAddress aCellPos( rCol, rRow, rTab ); @@ -129,7 +127,6 @@ void ScInterpreter::ReplaceCell( SCCOL& rCol, SCROW& rRow, SCTAB& rTab ) } } - bool ScInterpreter::IsTableOpInRange( const ScRange& rRange ) { if ( rRange.aStart == rRange.aEnd ) @@ -148,7 +145,6 @@ bool ScInterpreter::IsTableOpInRange( const ScRange& rRange ) return false; } - sal_uLong ScInterpreter::GetCellNumberFormat( const ScAddress& rPos, ScRefCellValue& rCell ) { sal_uLong nFormat; @@ -171,7 +167,6 @@ sal_uLong ScInterpreter::GetCellNumberFormat( const ScAddress& rPos, ScRefCellVa return nFormat; } - /// Only ValueCell, formula cells already store the result rounded. double ScInterpreter::GetValueCellValue( const ScAddress& rPos, double fOrig ) { @@ -657,7 +652,6 @@ bool ScInterpreter::CreateDoubleArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, return true; } - bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr) @@ -755,7 +749,6 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, return true; } - bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2, sal_uInt8* pCellArr) @@ -916,7 +909,6 @@ void ScInterpreter::Push( FormulaToken& r ) } } - void ScInterpreter::PushTempToken( FormulaToken* p ) { if ( sp >= MAXSTACK ) @@ -948,7 +940,6 @@ void ScInterpreter::PushTempToken( FormulaToken* p ) } } - void ScInterpreter::PushTempTokenWithoutError( FormulaToken* p ) { p->IncRef(); @@ -969,14 +960,12 @@ void ScInterpreter::PushTempTokenWithoutError( FormulaToken* p ) } } - void ScInterpreter::PushTempToken( const FormulaToken& r ) { if (!IfErrorPushError()) PushTempTokenWithoutError( r.Clone()); } - void ScInterpreter::PushCellResultToken( bool bDisplayEmptyAsString, const ScAddress & rAddress, short * pRetTypeExpr, sal_uLong * pRetIndexExpr ) { @@ -1024,7 +1013,6 @@ void ScInterpreter::PushCellResultToken( bool bDisplayEmptyAsString, } } - // Simply throw away TOS. void ScInterpreter::Pop() @@ -1035,7 +1023,6 @@ void ScInterpreter::Pop() SetError(errUnknownStackVariable); } - // Simply throw away TOS and set error code, used with ocIsError et al. void ScInterpreter::PopError() @@ -1050,7 +1037,6 @@ void ScInterpreter::PopError() SetError(errUnknownStackVariable); } - FormulaTokenRef ScInterpreter::PopToken() { if (sp) @@ -1066,7 +1052,6 @@ FormulaTokenRef ScInterpreter::PopToken() return NULL; } - double ScInterpreter::PopDouble() { nCurFmtType = NUMBERFORMAT_NUMBER; @@ -1094,7 +1079,6 @@ double ScInterpreter::PopDouble() return 0.0; } - svl::SharedString ScInterpreter::PopString() { nCurFmtType = NUMBERFORMAT_TEXT; @@ -1123,7 +1107,6 @@ svl::SharedString ScInterpreter::PopString() return svl::SharedString::getEmptyString(); } - void ScInterpreter::ValidateRef( const ScSingleRefData & rRef ) { SCCOL nCol; @@ -1132,14 +1115,12 @@ void ScInterpreter::ValidateRef( const ScSingleRefData & rRef ) SingleRefToVars( rRef, nCol, nRow, nTab); } - void ScInterpreter::ValidateRef( const ScComplexRefData & rRef ) { ValidateRef( rRef.Ref1); ValidateRef( rRef.Ref2); } - void ScInterpreter::ValidateRef( const ScRefList & rRefList ) { ScRefList::const_iterator it( rRefList.begin()); @@ -1150,7 +1131,6 @@ void ScInterpreter::ValidateRef( const ScRefList & rRefList ) } } - void ScInterpreter::SingleRefToVars( const ScSingleRefData & rRef, SCCOL & rCol, SCROW & rRow, SCTAB & rTab ) { @@ -1177,7 +1157,6 @@ void ScInterpreter::SingleRefToVars( const ScSingleRefData & rRef, SetError( errNoRef ), rTab = 0; } - void ScInterpreter::PopSingleRef(SCCOL& rCol, SCROW &rRow, SCTAB& rTab) { if( sp ) @@ -1202,7 +1181,6 @@ void ScInterpreter::PopSingleRef(SCCOL& rCol, SCROW &rRow, SCTAB& rTab) SetError( errUnknownStackVariable); } - void ScInterpreter::PopSingleRef( ScAddress& rAdr ) { if( sp ) @@ -1233,7 +1211,6 @@ void ScInterpreter::PopSingleRef( ScAddress& rAdr ) SetError( errUnknownStackVariable); } - void ScInterpreter::DoubleRefToVars( const ScToken* p, SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SCCOL& rCol2, SCROW &rRow2, SCTAB& rTab2, @@ -1316,7 +1293,6 @@ void ScInterpreter::PopDoubleRef(SCCOL& rCol1, SCROW &rRow1, SCTAB& rTab1, SetError( errUnknownStackVariable); } - void ScInterpreter::DoubleRefToRange( const ScComplexRefData & rCRef, ScRange & rRange, bool bDontCheckForTableOp ) { @@ -1334,7 +1310,6 @@ void ScInterpreter::DoubleRefToRange( const ScComplexRefData & rCRef, } } - void ScInterpreter::PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRefInList ) { if (sp) @@ -1380,7 +1355,6 @@ void ScInterpreter::PopDoubleRef( ScRange & rRange, short & rParam, size_t & rRe SetError( errUnknownStackVariable); } - void ScInterpreter::PopDoubleRef( ScRange& rRange, bool bDontCheckForTableOp ) { if( sp ) @@ -1610,7 +1584,6 @@ bool ScInterpreter::PopDoubleRefOrSingleRef( ScAddress& rAdr ) return false; } - void ScInterpreter::PopDoubleRefPushMatrix() { if ( GetStackType() == svDoubleRef ) @@ -1625,13 +1598,11 @@ void ScInterpreter::PopDoubleRefPushMatrix() SetError( errNoRef ); } - ScTokenMatrixMap* ScInterpreter::CreateTokenMatrixMap() { return new ScTokenMatrixMap; } - bool ScInterpreter::ConvertMatrixParameters() { sal_uInt16 nParams = pCur->GetParamCount(); @@ -1792,7 +1763,6 @@ bool ScInterpreter::ConvertMatrixParameters() return false; } - ScMatrixRef ScInterpreter::PopMatrix() { if( sp ) @@ -1906,7 +1876,6 @@ void ScInterpreter::QueryMatrixType(ScMatrixRef& xMat, short& rRetTypeExpr, sal_ SetError( errUnknownStackVariable); } - void ScInterpreter::PushDouble(double nVal) { TreatDoubleError( nVal ); @@ -1914,14 +1883,12 @@ void ScInterpreter::PushDouble(double nVal) PushTempTokenWithoutError( new FormulaDoubleToken( nVal ) ); } - void ScInterpreter::PushInt(int nVal) { if (!IfErrorPushError()) PushTempTokenWithoutError( new FormulaDoubleToken( nVal ) ); } - void ScInterpreter::PushStringBuffer( const sal_Unicode* pString ) { if ( pString ) @@ -1944,7 +1911,6 @@ void ScInterpreter::PushString( const svl::SharedString& rString ) PushTempTokenWithoutError( new FormulaStringToken( rString ) ); } - void ScInterpreter::PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab) { if (!IfErrorPushError()) @@ -1955,7 +1921,6 @@ void ScInterpreter::PushSingleRef(SCCOL nCol, SCROW nRow, SCTAB nTab) } } - void ScInterpreter::PushDoubleRef(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2) { @@ -1967,7 +1932,6 @@ void ScInterpreter::PushDoubleRef(SCCOL nCol1, SCROW nRow1, SCTAB nTab1, } } - void ScInterpreter::PushExternalSingleRef( sal_uInt16 nFileId, const OUString& rTabName, SCCOL nCol, SCROW nRow, SCTAB nTab) { @@ -1979,7 +1943,6 @@ void ScInterpreter::PushExternalSingleRef( } } - void ScInterpreter::PushExternalDoubleRef( sal_uInt16 nFileId, const OUString& rTabName, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2) @@ -2017,7 +1980,6 @@ void ScInterpreter::PushMatrix(const ScMatrixRef& pMat) PushTempTokenWithoutError( new ScMatrixToken( pMat ) ); } - void ScInterpreter::PushError( sal_uInt16 nError ) { SetError( nError ); // only sets error if not already set @@ -2029,37 +1991,31 @@ void ScInterpreter::PushParameterExpected() PushError( errParameterExpected); } - void ScInterpreter::PushIllegalParameter() { PushError( errIllegalParameter); } - void ScInterpreter::PushIllegalArgument() { PushError( errIllegalArgument); } - void ScInterpreter::PushNA() { PushError( NOTAVAILABLE); } - void ScInterpreter::PushNoValue() { PushError( errNoValue); } - bool ScInterpreter::IsMissing() { return sp && pStack[sp - 1]->GetType() == svMissing; } - StackVar ScInterpreter::GetRawStackType() { StackVar eRes; @@ -2075,7 +2031,6 @@ StackVar ScInterpreter::GetRawStackType() return eRes; } - StackVar ScInterpreter::GetStackType() { StackVar eRes; @@ -2093,7 +2048,6 @@ StackVar ScInterpreter::GetStackType() return eRes; } - StackVar ScInterpreter::GetStackType( sal_uInt8 nParam ) { StackVar eRes; @@ -2108,7 +2062,6 @@ StackVar ScInterpreter::GetStackType( sal_uInt8 nParam ) return eRes; } - bool ScInterpreter::DoubleRefToPosSingleRef( const ScRange& rRange, ScAddress& rAdr ) { // Check for a singleton first - no implicit intersection for them. @@ -2292,7 +2245,6 @@ double ScInterpreter::GetDouble() return nVal; } - double ScInterpreter::GetDoubleWithDefault(double nDefault) { bool bMissing = IsMissing(); @@ -2302,7 +2254,6 @@ double ScInterpreter::GetDoubleWithDefault(double nDefault) return nResultVal; } - svl::SharedString ScInterpreter::GetString() { switch (GetRawStackType()) @@ -2473,7 +2424,6 @@ ScMatValType ScInterpreter::GetDoubleOrStringFromMatrix( return nMatValType; } - void ScInterpreter::ScDBGet() { bool bMissingField = false; @@ -2511,7 +2461,6 @@ void ScInterpreter::ScDBGet() PushString(aValue.maString); } - void ScInterpreter::ScExternal() { sal_uInt8 nParamCount = GetByte(); @@ -3078,7 +3027,6 @@ void ScInterpreter::ScExternal() } } - void ScInterpreter::ScMissing() { PushTempToken( new FormulaMissingToken ); @@ -3629,7 +3577,6 @@ void ScInterpreter::ScDBArea() PushError( errNoName); } - void ScInterpreter::ScColRowNameAuto() { ScComplexRefData aRefData( static_cast<const ScToken*>(pCur)->GetDoubleRef() ); @@ -3713,7 +3660,6 @@ void ScInterpreter::ScColRowNameAuto() // --- internals ------------------------------------------------------------ - void ScInterpreter::ScTTT() { // Temporaerer Test-Tanz, zum auspropieren von Funktionen etc. sal_uInt8 nParamCount = GetByte(); @@ -3725,7 +3671,6 @@ void ScInterpreter::ScTTT() PushError(errNoValue); } - ScInterpreter::ScInterpreter( ScFormulaCell* pCell, ScDocument* pDoc, const ScAddress& rPos, ScTokenArray& r ) : aCode(r) @@ -4369,7 +4314,6 @@ StackVar ScInterpreter::Interpret() pJumpMatrix = NULL; } while ( bGotResult ); - // Functions that evaluate an error code and directly set nGlobalError to 0, // usage: switch( OpCode ) { CASE_OCERRFUNC statements; } #define CASE_OCERRFUNC \ diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx index 944a0ce053d5..f2669c6fdfd8 100644 --- a/sc/source/core/tool/interpr5.cxx +++ b/sc/source/core/tool/interpr5.cxx @@ -334,7 +334,6 @@ ScMatrixRef ScInterpreter::GetNewMat(SCSIZE nC, SCSIZE nR, bool bEmpty) return pMat; } - ScMatrixRef ScInterpreter::CreateMatrixFromDoubleRef( const FormulaToken* pToken, SCCOL nCol1, SCROW nRow1, SCTAB nTab1, SCCOL nCol2, SCROW nRow2, SCTAB nTab2 ) diff --git a/sc/source/core/tool/interpr6.cxx b/sc/source/core/tool/interpr6.cxx index 9ae88f9700ea..f7e8259da573 100644 --- a/sc/source/core/tool/interpr6.cxx +++ b/sc/source/core/tool/interpr6.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "interpre.hxx" #include "columnspanset.hxx" #include "column.hxx" @@ -747,13 +746,11 @@ double ScInterpreter::IterateParameters( ScIterFunc eFunc, bool bTextAsZero ) return fRes; } - void ScInterpreter::ScSumSQ() { PushDouble( IterateParameters( ifSUMSQ ) ); } - void ScInterpreter::ScSum() { short nParamCount = GetByte(); @@ -890,13 +887,11 @@ void ScInterpreter::ScSum() PushDouble(fRes); } - void ScInterpreter::ScProduct() { PushDouble( IterateParameters( ifPRODUCT ) ); } - void ScInterpreter::ScAverage( bool bTextAsZero ) { PushDouble( IterateParameters( ifAVERAGE, bTextAsZero ) ); @@ -1054,7 +1049,6 @@ void ScInterpreter::ScCount() PushDouble(nCount); } - void ScInterpreter::ScCount2() { PushDouble( IterateParameters( ifCOUNT2 ) ); diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index c0c9bf0715c4..8131a5465d52 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -58,7 +58,6 @@ void ScInterpreter::ScFilterXML() return; } - boost::shared_ptr<xmlXPathContext> pXPathCtx( xmlXPathNewContext(pDoc.get()), xmlXPathFreeContext ); diff --git a/sc/source/core/tool/jumpmatrix.cxx b/sc/source/core/tool/jumpmatrix.cxx index 625e425c18b4..dae7f109bd8e 100644 --- a/sc/source/core/tool/jumpmatrix.cxx +++ b/sc/source/core/tool/jumpmatrix.cxx @@ -110,7 +110,6 @@ void ScJumpMatrix::SetJumpParameters(ScTokenVec* p) pParams = p; } - void ScJumpMatrix::GetPos(SCSIZE& rCol, SCSIZE& rRow) const { rCol = nCurCol; diff --git a/sc/source/core/tool/lookupcache.cxx b/sc/source/core/tool/lookupcache.cxx index ac92fe627309..15d161bda9e1 100644 --- a/sc/source/core/tool/lookupcache.cxx +++ b/sc/source/core/tool/lookupcache.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "lookupcache.hxx" #include "document.hxx" #include "queryentry.hxx" @@ -72,12 +71,10 @@ ScLookupCache::ScLookupCache( ScDocument * pDoc, const ScRange & rRange ) : { } - ScLookupCache::~ScLookupCache() { } - ScLookupCache::Result ScLookupCache::lookup( ScAddress & o_rResultAddress, const QueryCriteria & rCriteria, const ScAddress & rQueryAddress ) const { @@ -94,7 +91,6 @@ ScLookupCache::Result ScLookupCache::lookup( ScAddress & o_rResultAddress, return FOUND; } - bool ScLookupCache::insert( const ScAddress & rResultAddress, const QueryCriteria & rCriteria, const ScAddress & rQueryAddress, const bool bAvailable ) @@ -109,7 +105,6 @@ bool ScLookupCache::insert( const ScAddress & rResultAddress, return bInserted; } - void ScLookupCache::Notify( const SfxHint& rHint ) { if (!mpDoc->IsInDtorClear()) diff --git a/sc/source/core/tool/odffmap.cxx b/sc/source/core/tool/odffmap.cxx index e57bd8fda363..011979d3d1d4 100644 --- a/sc/source/core/tool/odffmap.cxx +++ b/sc/source/core/tool/odffmap.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "compiler.hxx" #include <sal/macros.h> diff --git a/sc/source/core/tool/prnsave.cxx b/sc/source/core/tool/prnsave.cxx index b47341892859..d85e60b4c0e4 100644 --- a/sc/source/core/tool/prnsave.cxx +++ b/sc/source/core/tool/prnsave.cxx @@ -23,10 +23,8 @@ // STATIC DATA - // Daten pro Tabelle - ScPrintSaverTab::ScPrintSaverTab() : mpRepeatCol(NULL), mpRepeatRow(NULL), @@ -68,10 +66,8 @@ bool ScPrintSaverTab::operator==( const ScPrintSaverTab& rCmp ) const (maPrintRanges == rCmp.maPrintRanges); } - // Daten fuer das ganze Dokument - ScPrintRangeSaver::ScPrintRangeSaver( SCTAB nCount ) : nTabCount( nCount ) { diff --git a/sc/source/core/tool/progress.cxx b/sc/source/core/tool/progress.cxx index 5909fa909974..c1d2991b1fdb 100644 --- a/sc/source/core/tool/progress.cxx +++ b/sc/source/core/tool/progress.cxx @@ -33,7 +33,6 @@ using namespace com::sun::star; - static ScProgress theDummyInterpretProgress; SfxProgress* ScProgress::pGlobalProgress = NULL; sal_uLong ScProgress::nGlobalRange = 0; @@ -46,7 +45,6 @@ bool ScProgress::bAllowInterpretProgress = true; ScDocument* ScProgress::pInterpretDoc; bool ScProgress::bIdleWasEnabled = false; - static bool lcl_IsHiddenDocument( SfxObjectShell* pObjSh ) { if (pObjSh) @@ -116,13 +114,11 @@ ScProgress::ScProgress( SfxObjectShell* pObjSh, const OUString& rText, } } - ScProgress::ScProgress() : pProgress( NULL ) { // DummyInterpret } - ScProgress::~ScProgress() { if ( pProgress ) @@ -135,7 +131,6 @@ ScProgress::~ScProgress() } } - void ScProgress::CreateInterpretProgress( ScDocument* pDoc, bool bWait ) { if ( bAllowInterpretProgress ) diff --git a/sc/source/core/tool/queryentry.cxx b/sc/source/core/tool/queryentry.cxx index af739594a2a4..0b23da5add61 100644 --- a/sc/source/core/tool/queryentry.cxx +++ b/sc/source/core/tool/queryentry.cxx @@ -79,8 +79,6 @@ ScQueryEntry& ScQueryEntry::operator=( const ScQueryEntry& r ) return *this; } - - void ScQueryEntry::SetQueryByEmpty() { eOp = SC_EQUAL; diff --git a/sc/source/core/tool/queryparam.cxx b/sc/source/core/tool/queryparam.cxx index 295d952af67e..5f8c769fe03b 100644 --- a/sc/source/core/tool/queryparam.cxx +++ b/sc/source/core/tool/queryparam.cxx @@ -394,7 +394,6 @@ ScDBQueryParamBase::~ScDBQueryParamBase() { } - ScDBQueryParamInternal::ScDBQueryParamInternal() : ScDBQueryParamBase(ScDBQueryParamBase::INTERNAL), ScQueryParamTable() diff --git a/sc/source/core/tool/recursionhelper.cxx b/sc/source/core/tool/recursionhelper.cxx index 68ad21e287b3..7d7a32cbc772 100644 --- a/sc/source/core/tool/recursionhelper.cxx +++ b/sc/source/core/tool/recursionhelper.cxx @@ -95,6 +95,3 @@ void ScRecursionHelper::Clear() } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - - - diff --git a/sc/source/core/tool/refdata.cxx b/sc/source/core/tool/refdata.cxx index 435326514f30..d508247ad641 100644 --- a/sc/source/core/tool/refdata.cxx +++ b/sc/source/core/tool/refdata.cxx @@ -41,7 +41,6 @@ void ScSingleRefData::InitAddressRel( const ScAddress& rAdr, const ScAddress& rP SetAddress(rAdr, rPos); } - void ScSingleRefData::SetAbsCol( SCCOL nVal ) { Flags.bColRel = false; @@ -98,19 +97,16 @@ void ScSingleRefData::SetColDeleted( bool bVal ) Flags.bColDeleted = bVal; } - void ScSingleRefData::SetRowDeleted( bool bVal ) { Flags.bRowDeleted = bVal; } - void ScSingleRefData::SetTabDeleted( bool bVal ) { Flags.bTabDeleted = bVal; } - bool ScSingleRefData::IsDeleted() const { return IsColDeleted() || IsRowDeleted() || IsTabDeleted(); @@ -289,7 +285,6 @@ ScComplexRefData& ScComplexRefData::Extend( const ScSingleRefData & rRef, const return *this; } - ScComplexRefData& ScComplexRefData::Extend( const ScComplexRefData & rRef, const ScAddress & rPos ) { return Extend( rRef.Ref1, rPos).Extend( rRef.Ref2, rPos); diff --git a/sc/source/core/tool/refhint.cxx b/sc/source/core/tool/refhint.cxx index 8327b6186cec..25dc699976e5 100644 --- a/sc/source/core/tool/refhint.cxx +++ b/sc/source/core/tool/refhint.cxx @@ -14,23 +14,16 @@ namespace sc { RefHint::RefHint( Type eType ) : SfxSimpleHint(SC_HINT_REFERENCE), meType(eType) {} RefHint::~RefHint() {} - RefMovedHint::RefMovedHint( const ScRange& rRange, const ScAddress& rMove ) : RefHint(Moved), maRange(rRange), maMoveDelta(rMove) {} RefMovedHint::~RefMovedHint() {} - - RefColReorderHint::RefColReorderHint( const sc::ColReorderMapType& rColMap, SCTAB nTab, SCROW nRow1, SCROW nRow2 ) : RefHint(ColumnReordered), mrColMap(rColMap), mnTab(nTab), mnRow1(nRow1), mnRow2(nRow2) {} RefColReorderHint::~RefColReorderHint() {} - - - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx index 8874218e677e..964fd471723a 100644 --- a/sc/source/core/tool/scmatrix.cxx +++ b/sc/source/core/tool/scmatrix.cxx @@ -314,7 +314,6 @@ void ScMatrixImpl::SetImmutable(bool bVal) mbCloneIfConst = bVal; } - void ScMatrixImpl::Resize(SCSIZE nC, SCSIZE nR) { maMat.resize(nR, nC); @@ -2243,4 +2242,3 @@ void ScMatrix::Dump() const #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ - diff --git a/sc/source/core/tool/subtotal.cxx b/sc/source/core/tool/subtotal.cxx index b5d253992a4d..2f3ffeadbcf0 100644 --- a/sc/source/core/tool/subtotal.cxx +++ b/sc/source/core/tool/subtotal.cxx @@ -36,7 +36,6 @@ bool SubTotal::SafePlus(double& fVal1, double fVal2) return bOk; } - bool SubTotal::SafeMult(double& fVal1, double fVal2) { bool bOk = true; @@ -50,7 +49,6 @@ bool SubTotal::SafeMult(double& fVal1, double fVal2) return bOk; } - bool SubTotal::SafeDiv(double& fVal1, double fVal2) { bool bOk = true; diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 92900583f69a..8f8fe8467c91 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -138,7 +138,6 @@ sal_Int32 ScRawToken::GetStrLen( const sal_Unicode* pStr ) return sal::static_int_cast<sal_Int32>( p - pStr ); } - void ScRawToken::SetOpCode( OpCode e ) { eOp = e; @@ -285,7 +284,6 @@ void ScRawToken::SetExternal( const sal_Unicode* pStr ) nRefCnt = 0; } - bool ScRawToken::IsValidReference() const { switch (eType) @@ -303,7 +301,6 @@ bool ScRawToken::IsValidReference() const return false; } - sal_uInt16 ScRawToken::sbyteOffset() { // offset of sbyte in ScRawToken @@ -359,7 +356,6 @@ ScRawToken* ScRawToken::Clone() const return p; } - FormulaToken* ScRawToken::CreateToken() const { #if OSL_DEBUG_LEVEL > 1 @@ -436,7 +432,6 @@ FormulaToken* ScRawToken::CreateToken() const #undef IF_NOT_OPCODE_ERROR } - void ScRawToken::Delete() { if ( bRaw ) @@ -454,7 +449,6 @@ void ScRawToken::Delete() } } - // --- class ScToken -------------------------------------------------------- static ScSingleRefData lcl_ScToken_InitSingleRef() @@ -516,7 +510,6 @@ bool ScToken::TextEqual( const FormulaToken& _rToken ) const return *this == _rToken; // else normal operator== } - bool ScToken::Is3DRef() const { switch ( eType ) @@ -725,7 +718,6 @@ ScMatrix* ScToken::GetMatrix() return NULL; } - ScJumpMatrix* ScToken::GetJumpMatrix() const { OSL_FAIL( "ScToken::GetJumpMatrix: virtual dummy called" ); @@ -745,8 +737,6 @@ ScRefList* ScToken::GetRefList() // real implementations of virtual functions - - const ScSingleRefData& ScSingleRefToken::GetSingleRef() const { return aSingleRef; } ScSingleRefData& ScSingleRefToken::GetSingleRef() { return aSingleRef; } bool ScSingleRefToken::operator==( const FormulaToken& r ) const @@ -1179,9 +1169,6 @@ bool ScHybridCellToken::operator==( const FormulaToken& r ) const maFormula == static_cast<const ScHybridCellToken &>(r).GetFormula(); } - - - bool ScTokenArray::AddFormulaToken( const css::sheet::FormulaToken& rToken, svl::SharedStringPool& rSPool, formula::ExternalReferenceHelper* pExtRef) { @@ -1675,8 +1662,6 @@ void ScTokenArray::GenHash() mnHashValue = nHash; } - - bool ScTokenArray::IsInvariant() const { FormulaToken** p = pCode; @@ -1991,7 +1976,6 @@ FormulaToken* ScTokenArray::MergeArray( ) return AddMatrix( pArray ); } - FormulaToken* ScTokenArray::MergeRangeReference( const ScAddress & rPos ) { if (!pCode || !nLen) @@ -2224,7 +2208,6 @@ bool ScTokenArray::GetAdjacentExtendOfOuterFuncRefs( SCCOLROW& nExtend, return false; } - void ScTokenArray::ReadjustRelative3DReferences( const ScAddress& rOldPos, const ScAddress& rNewPos ) { @@ -3122,7 +3105,6 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceInMovedName( const sc::RefUpdat sc::RefUpdateResult aRes; - FormulaToken** p = pCode; FormulaToken** pEnd = p + static_cast<size_t>(nLen); for (; p != pEnd; ++p) @@ -3995,5 +3977,4 @@ void ScTokenArray::Dump() const } #endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/tokenstringcontext.cxx b/sc/source/core/tool/tokenstringcontext.cxx index 3eb2f16b8474..44babecdc21f 100644 --- a/sc/source/core/tool/tokenstringcontext.cxx +++ b/sc/source/core/tool/tokenstringcontext.cxx @@ -128,7 +128,6 @@ void CompileFormulaContext::updateTabNames() } } - void CompileFormulaContext::setGrammar( formula::FormulaGrammar::Grammar eGram ) { bool bUpdate = (meGram != eGram); @@ -137,8 +136,6 @@ void CompileFormulaContext::setGrammar( formula::FormulaGrammar::Grammar eGram ) updateTabNames(); } - - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/core/tool/typedstrdata.cxx b/sc/source/core/tool/typedstrdata.cxx index de9b8ba14a71..700e68b78569 100644 --- a/sc/source/core/tool/typedstrdata.cxx +++ b/sc/source/core/tool/typedstrdata.cxx @@ -104,9 +104,6 @@ bool ScTypedStrData::IsStrData() const return meStrType != Value; } - - - FindTypedStrData::FindTypedStrData(const ScTypedStrData& rVal, bool bCaseSens) : maVal(rVal), mbCaseSens(bCaseSens) {} diff --git a/sc/source/core/tool/unitconv.cxx b/sc/source/core/tool/unitconv.cxx index b9d5c61856c7..9ab85c09e599 100644 --- a/sc/source/core/tool/unitconv.cxx +++ b/sc/source/core/tool/unitconv.cxx @@ -41,8 +41,6 @@ ScUnitConverterData::ScUnitConverterData( const ScUnitConverterData& r ) : ScUnitConverterData::~ScUnitConverterData() {} - - OUString ScUnitConverterData::BuildIndexString( const OUString& rFromUnit, const OUString& rToUnit ) { diff --git a/sc/source/core/tool/userlist.cxx b/sc/source/core/tool/userlist.cxx index a379e2288d13..6f594dff46da 100644 --- a/sc/source/core/tool/userlist.cxx +++ b/sc/source/core/tool/userlist.cxx @@ -27,7 +27,6 @@ #include <boost/bind.hpp> - namespace { class FindByName : public ::std::unary_function<ScUserListData::SubStr, bool> @@ -316,7 +315,6 @@ bool ScUserList::operator!=( const ScUserList& r ) const return !operator==( r ); } - bool ScUserList::HasEntry( const OUString& rStr ) const { DataType::const_iterator itr = ::std::find_if( |