diff --git a/sc/inc/column.hxx b/sc/inc/column.hxx index ba0fcd4a5371..0e4c1d72abb1 100644 --- a/sc/inc/column.hxx +++ b/sc/inc/column.hxx @@ -303,7 +303,6 @@ public: void SetRawString( SCROW nRow, const OUString& rStr, bool bBroadcast = true ); void SetRawString( SCROW nRow, const svl::SharedString& rStr, bool bBroadcast = true ); - void SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const OUString& rStr, bool bBroadcast = true ); void SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const svl::SharedString& rStr, bool bBroadcast = true ); void SetValue( SCROW nRow, double fVal ); void SetValues( SCROW nRow, const std::vector& rVals ); @@ -458,7 +457,6 @@ public: void EndListening( SvtListener& rLst, SCROW nRow ); void StartListening( sc::StartListeningContext& rCxt, SCROW nRow, SvtListener& rListener ); void EndListening( sc::EndListeningContext& rCxt, SCROW nRow, SvtListener& rListener ); - void MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow ); void StartAllListeners(); void StartNeededListeners(); // only for cells where NeedsListening()==true void SetDirtyIfPostponed(); @@ -512,7 +510,6 @@ public: ScPostIt* GetCellNote( SCROW nRow ); const ScPostIt* GetCellNote( SCROW nRow ) const; void DeleteCellNotes( sc::ColumnBlockPosition& rBlockPos, SCROW nRow1, SCROW nRow2 ); - void DeleteCellNote( SCROW nRow ); bool HasCellNotes() const; void SetCellNote( SCROW nRow, ScPostIt* pNote); bool IsNotesEmptyBlock(SCROW nStartRow, SCROW nEndRow) const; diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx index 203ed3ea3e35..6fb99ea55fd5 100644 --- a/sc/source/core/data/column2.cxx +++ b/sc/source/core/data/column2.cxx @@ -1859,10 +1859,7 @@ void ScColumn::SetCellNote(SCROW nRow, ScPostIt* pNote) //pNote->UpdateCaptionPos(ScAddress(nCol, nRow, nTab)); // TODO notes usefull ? slow import with many notes maCellNotes.set(nRow, pNote); } -void ScColumn::DeleteCellNote(SCROW nRow) -{ - maCellNotes.set_empty(nRow, nRow); -} + void ScColumn::DeleteCellNotes( sc::ColumnBlockPosition& rBlockPos, SCROW nRow1, SCROW nRow2 ) { rBlockPos.miCellNotePos = @@ -2946,31 +2943,6 @@ void ScColumn::StartListening( SvtListener& rLst, SCROW nRow ) startListening(maBroadcasters, aPos.first, aPos.second, nRow, rLst); } -void ScColumn::MoveListeners( SvtBroadcaster& rSource, SCROW nDestRow ) -{ - // Move listeners from the source position to the destination position. - if (!rSource.HasListeners()) - // No listeners to relocate. Bail out. - return; - - // See if the destination position already has a broadcaster, if not, create one. - SvtBroadcaster* pBC = GetBroadcaster(nDestRow); - if (!pBC) - { - pBC = new SvtBroadcaster; - maBroadcasters.set(nDestRow, pBC); - } - - SvtBroadcaster::ListenersType& rListeners = rSource.GetAllListeners(); - SvtBroadcaster::ListenersType::iterator it = rListeners.begin(), itEnd = rListeners.end(); - for (; it != itEnd; ++it) - { - SvtListener& rLst = **it; - rLst.StartListening(*pBC); - rLst.EndListening(rSource); - } -} - void ScColumn::EndListening( SvtListener& rLst, SCROW nRow ) { SvtBroadcaster* pBC = GetBroadcaster(nRow); diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx index b50536b0a71a..f006f0eb0d60 100644 --- a/sc/source/core/data/column3.cxx +++ b/sc/source/core/data/column3.cxx @@ -2249,16 +2249,6 @@ void ScColumn::SetRawString( SCROW nRow, const svl::SharedString& rStr, bool bBr BroadcastNewCell(nRow); } -void ScColumn::SetRawString( - sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const OUString& rStr, bool bBroadcast ) -{ - svl::SharedString aSS = pDocument->GetSharedStringPool().intern(rStr); - if (!aSS.getData()) - return; - - SetRawString(rBlockPos, nRow, aSS, bBroadcast); -} - void ScColumn::SetRawString( sc::ColumnBlockPosition& rBlockPos, SCROW nRow, const svl::SharedString& rStr, bool bBroadcast ) { diff --git a/unusedcode.easy b/unusedcode.easy index 0302b7e3d0e0..fc2c119250cb 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -68,9 +68,6 @@ ScCellValue::hasString() const ScCellValue::set(ScFormulaCell const&) ScCollection::IndexOf(ScDataObject*) const ScColorScaleEntry::UpdateMoveTab(short, short, short) -ScColumn::DeleteCellNote(int) -ScColumn::MoveListeners(SvtBroadcaster&, int) -ScColumn::SetRawString(sc::ColumnBlockPosition&, int, rtl::OUString const&, bool) ScDocument::CreateFormatTable() const ScExtIButton::GetSelected() const ScVbaFormat::getAddIndent()