[Libreoffice-commits] core.git: sc/inc sc/source unusedcode.easy
Noel Grandin
noel at peralex.com
Tue Nov 4 01:44:01 PST 2014
sc/inc/document.hxx | 3 --
sc/inc/table.hxx | 2 -
sc/source/core/data/documen7.cxx | 48 ---------------------------------------
sc/source/core/data/table3.cxx | 30 ------------------------
sc/source/ui/inc/tabview.hxx | 2 -
sc/source/ui/inc/undobase.hxx | 2 -
sc/source/ui/undo/undobase.cxx | 6 ----
sc/source/ui/view/tabview5.cxx | 33 --------------------------
unusedcode.easy | 4 ---
9 files changed, 130 deletions(-)
New commits:
commit 389875573012c6373d95ef31b12fe8e8104b1233
Author: Noel Grandin <noel at peralex.com>
Date: Tue Nov 4 11:42:49 2014 +0200
remove some unused code in sc
Change-Id: I6cd2acaf361ae1947787b5aacc86b75a6e21c379
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index e593387..47387bd 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -1864,9 +1864,6 @@ public:
/// only area, no cell broadcast
void AreaBroadcast( const ScHint& rHint );
- /// only areas in range, no cell broadcasts
- void AreaBroadcastInRange( const ScRange& rRange,
- const ScHint& rHint );
void DelBroadcastAreasInRange( const ScRange& rRange );
void UpdateBroadcastAreas( UpdateRefMode eUpdateRefMode,
const ScRange& rRange,
diff --git a/sc/inc/table.hxx b/sc/inc/table.hxx
index b65f829..d396402 100644
--- a/sc/inc/table.hxx
+++ b/sc/inc/table.hxx
@@ -246,8 +246,6 @@ public:
void RemoveSubTotals( ScSubTotalParam& rParam );
bool DoSubTotals( ScSubTotalParam& rParam );
- void MarkSubTotalCells( sc::ColumnSpanSet& rSet, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bVal ) const;
-
const ScSheetEvents* GetSheetEvents() const { return pSheetEvents; }
void SetSheetEvents( const ScSheetEvents* pNew );
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 2e71884..af09c83 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -233,54 +233,6 @@ void ScDocument::AreaBroadcast( const ScHint& rHint )
}
}
-void ScDocument::AreaBroadcastInRange( const ScRange& rRange, const ScHint& rHint )
-{
- if ( !pBASM )
- return ; // Clipboard or Undo
- if ( !bHardRecalcState )
- {
- ScBulkBroadcast aBulkBroadcast( pBASM); // scoped bulk broadcast
- if ( pBASM->AreaBroadcastInRange( rRange, rHint ) )
- TrackFormulas( rHint.GetId() );
- }
-
- // Repaint for conditional formats containing relative references.
- //! This is _THE_ bottle neck!
- TableContainer::iterator itr = maTabs.begin();
- for(; itr != maTabs.end(); ++itr)
- {
- if(!*itr)
- continue;
-
- ScConditionalFormatList* pCondFormList = (*itr)->GetCondFormList();
- if ( pCondFormList )
- {
- SCCOL nCol1;
- SCROW nRow1;
- SCTAB nTab1;
- SCCOL nCol2;
- SCROW nRow2;
- SCTAB nTab2;
- rRange.GetVars( nCol1, nRow1, nTab1, nCol2, nRow2, nTab2 );
- ScAddress aAddress( rRange.aStart );
- for ( SCTAB nTab = nTab1; nTab <= nTab2; ++nTab )
- {
- aAddress.SetTab( nTab );
- for ( SCCOL nCol = nCol1; nCol <= nCol2; ++nCol )
- {
- aAddress.SetCol( nCol );
- for ( SCROW nRow = nRow1; nRow <= nRow2; ++nRow )
- {
- aAddress.SetRow( nRow );
- pCondFormList->SourceChanged( aAddress );
- }
- }
- }
- }
-
- }
-}
-
void ScDocument::DelBroadcastAreasInRange( const ScRange& rRange )
{
if ( pBASM )
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index b7661fe..f7c6118 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1804,36 +1804,6 @@ bool ScTable::DoSubTotals( ScSubTotalParam& rParam )
return bSpaceLeft;
}
-void ScTable::MarkSubTotalCells(
- sc::ColumnSpanSet& rSet, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW nRow2, bool bVal ) const
-{
- if (!ValidCol(nCol1) || !ValidCol(nCol2))
- return;
-
- // Pick up all subtotal formula cells.
- for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
- aCol[nCol].MarkSubTotalCells(rSet, nRow1, nRow2, bVal);
-
- // Pick up all filtered rows.
- ScFlatBoolRowSegments::RangeData aFilteredSpan;
- SCROW nRow = nRow1;
- while (nRow <= nRow2)
- {
- if (!mpFilteredRows->getRangeData(nRow, aFilteredSpan))
- // Failed for whatever reason.
- return;
-
- if (aFilteredSpan.mbValue)
- {
- // Filtered span found.
- for (SCCOL nCol = nCol1; nCol <= nCol2; ++nCol)
- rSet.set(nTab, nCol, nRow, aFilteredSpan.mnRow2, bVal);
- }
-
- nRow = aFilteredSpan.mnRow2 + 1;
- }
-}
-
namespace {
class QueryEvaluator
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 0bc4751..2aba44d 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -276,8 +276,6 @@ public:
void UpdatePageBreakData( bool bForcePaint = false );
- void DrawMarkRect( const Rectangle& rRect );
-
ScViewData& GetViewData() { return aViewData; }
const ScViewData& GetViewData() const { return aViewData; }
diff --git a/sc/source/ui/inc/undobase.hxx b/sc/source/ui/inc/undobase.hxx
index 845d197..30670d2 100644
--- a/sc/source/ui/inc/undobase.hxx
+++ b/sc/source/ui/inc/undobase.hxx
@@ -134,8 +134,6 @@ public:
ScDBFuncUndo( ScDocShell* pDocSh, const ScRange& rOriginal, SdrUndoAction* pDrawUndo = 0 );
virtual ~ScDBFuncUndo();
- void SetDrawUndoAction( SdrUndoAction* pDrawUndo );
-
void BeginUndo();
void EndUndo();
void BeginRedo();
diff --git a/sc/source/ui/undo/undobase.cxx b/sc/source/ui/undo/undobase.cxx
index c1f58d8..23fa4ed 100644
--- a/sc/source/ui/undo/undobase.cxx
+++ b/sc/source/ui/undo/undobase.cxx
@@ -487,12 +487,6 @@ ScDBFuncUndo::~ScDBFuncUndo()
delete pAutoDBRange;
}
-void ScDBFuncUndo::SetDrawUndoAction( SdrUndoAction* pDrawUndo )
-{
- DeleteSdrUndoAction( mpDrawUndo );
- mpDrawUndo = pDrawUndo;
-}
-
void ScDBFuncUndo::BeginUndo()
{
ScSimpleUndo::BeginUndo();
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 8d08c29..424e9bc 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -447,39 +447,6 @@ void ScTabView::UpdateIMap( SdrObject* pObj )
pDrawView->UpdateIMap( pObj );
}
-void ScTabView::DrawMarkRect( const Rectangle& rRect )
-{
- //! store rectangle for repaint during drag
-
- for (sal_uInt16 i=0; i<4; i++)
- {
- if ( pGridWin[i] && pGridWin[i]->IsVisible() )
- {
- RasterOp aROp = pGridWin[i]->GetRasterOp();
- bool bHasLine = pGridWin[i]->IsLineColor();
- Color aLine = pGridWin[i]->GetLineColor();
- bool bHasFill = pGridWin[i]->IsFillColor();
- Color aFill = pGridWin[i]->GetFillColor();
-
- pGridWin[i]->SetRasterOp( ROP_INVERT );
- pGridWin[i]->SetLineColor( COL_BLACK );
- pGridWin[i]->SetFillColor();
-
- pGridWin[i]->DrawRect(rRect);
-
- pGridWin[i]->SetRasterOp(aROp);
- if (bHasLine)
- pGridWin[i]->SetLineColor(aLine);
- else
- pGridWin[i]->SetLineColor();
- if (bHasFill)
- pGridWin[i]->SetFillColor(aFill);
- else
- pGridWin[i]->SetFillColor();
- }
- }
-}
-
void ScTabView::DrawEnableAnim(bool bSet)
{
sal_uInt16 i;
diff --git a/unusedcode.easy b/unusedcode.easy
index 4379f7f..c3ca2a4 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -18,14 +18,10 @@ OutputDevice::PixelToLogic(vcl::Region const&, MapMode const&) const
Primitive2dXmlDump::filterActionType(unsigned short, bool)
Primitive2dXmlDump::filterAllActionTypes()
SalGraphics::drawTransformedBitmap(basegfx::B2DPoint const&, basegfx::B2DPoint const&, basegfx::B2DPoint const&, SalBitmap const&, SalBitmap const*)
-ScDBFuncUndo::SetDrawUndoAction(SdrUndoAction*)
-ScDocument::AreaBroadcastInRange(ScRange const&, ScHint const&)
ScDocument::CreateFormatTable() const
ScFormulaCellGroup::scheduleCompilation()
ScRawToken::Clone() const
ScRawToken::Delete()
-ScTabView::DrawMarkRect(Rectangle const&)
-ScTable::MarkSubTotalCells(sc::ColumnSpanSet&, short, int, short, int, bool) const
ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent()
ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&)
SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*)
More information about the Libreoffice-commits
mailing list