[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sat Sep 10 07:49:01 PDT 2011
binfilter/bf_sc/source/core/data/sc_documen3.cxx | 34 +++---
binfilter/bf_sc/source/core/data/sc_document.cxx | 66 ++----------
binfilter/bf_sc/source/core/data/sc_table1.cxx | 21 ----
binfilter/bf_sc/source/core/data/sc_table2.cxx | 120 +++++------------------
binfilter/bf_sc/source/core/data/sc_table3.cxx | 55 ----------
binfilter/inc/bf_sc/table.hxx | 25 ----
6 files changed, 62 insertions(+), 259 deletions(-)
New commits:
commit 747460af5452d695c6adcce8501559cde06128b1
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sat Sep 10 07:47:36 2011 -0700
Cleanup of class ScTable
diff --git a/binfilter/bf_sc/source/core/data/sc_documen3.cxx b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
index 50de0c3..3d8b9e5 100644
--- a/binfilter/bf_sc/source/core/data/sc_documen3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_documen3.cxx
@@ -477,14 +477,15 @@ using namespace ::com::sun::star;
// Outline anpassen
-/*N*/ BOOL ScDocument::UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, USHORT nTab, BOOL bShow )
-/*N*/ {
-/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
-/*N*/ return pTab[nTab]->UpdateOutlineCol( nStartCol, nEndCol, bShow );
-/*N*/
-/*N*/ OSL_FAIL("missing tab");
-/*N*/ return FALSE;
-/*N*/ }
+BOOL ScDocument::UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, USHORT nTab, BOOL bShow )
+{
+ DBG_BF_ASSERT(0, "STRIP");
+ if ( nTab<=MAXTAB && pTab[nTab] )
+ return FALSE;
+
+ OSL_FAIL("missing tab");
+ return FALSE;
+}
/*N*/ BOOL ScDocument::UpdateOutlineRow( USHORT nStartRow, USHORT nEndRow, USHORT nTab, BOOL bShow )
/*N*/ {
@@ -495,14 +496,15 @@ using namespace ::com::sun::star;
/*N*/ return FALSE;
/*N*/ }
-/*N*/ BOOL ScDocument::CreateQueryParam(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, USHORT nTab, ScQueryParam& rQueryParam)
-/*N*/ {
-/*N*/ if ( nTab<=MAXTAB && pTab[nTab] )
-/*N*/ return pTab[nTab]->CreateQueryParam(nCol1, nRow1, nCol2, nRow2, rQueryParam);
-/*N*/
-/*N*/ OSL_FAIL("missing tab");
-/*N*/ return FALSE;
-/*N*/ }
+BOOL ScDocument::CreateQueryParam(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, USHORT nTab, ScQueryParam& rQueryParam)
+{
+ DBG_BF_ASSERT(0, "STRIP");
+ if ( nTab<=MAXTAB && pTab[nTab] )
+ return FALSE;
+
+ OSL_FAIL("missing tab");
+ return FALSE;
+}
// Funktionen werden als 1 schon vom InputHandler eingefuegt
#define SC_STRTYPE_NAMES 2
diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 98fd171..ff194d6 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -513,14 +513,6 @@ void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
/*N*/ if (pTab[i])
/*N*/ pTab[i]->InsertRow( nStartCol, nEndCol, nStartRow, nSize );
/*N*/
-/*N*/ // #82991# UpdateRef for drawing layer must be after inserting,
-/*N*/ // when the new row heights are known.
-/*N*/ for (i=nStartTab; i<=nEndTab; i++)
-/*N*/ if (pTab[i])
-/*N*/ pTab[i]->UpdateDrawRef( URM_INSDEL,
-/*N*/ nStartCol, nStartRow, nStartTab, nEndCol, MAXROW, nEndTab,
-/*N*/ 0, nSize, 0 );
-/*N*/
/*N*/ if ( pChangeTrack && pChangeTrack->IsInDeleteUndo() )
/*N*/ { // durch Restaurierung von Referenzen auf geloeschte Bereiche ist
/*N*/ // ein neues Listening faellig, bisherige Listener wurden in
@@ -1098,12 +1090,6 @@ void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
/*N*/ {
/*N*/ do
/*N*/ {
-/*N*/ for (k = 0; k <= MAXTAB; k++)
-/*N*/ {
-/*N*/ if ( pTab[k] && rMark.GetTableSelect(k) )
-/*N*/ pTab[k]->ReplaceRangeNamesInUse(nC1_b, nR1_b,
-/*N*/ nC2_b, nR2_b, aClipRangeMap );
-/*N*/ }
/*N*/ nC1_b = nC2_b + 1;
/*N*/ nC2_b = Min((USHORT)(nC1_b + nXw), nCol2);
/*N*/ } while (nC1_b <= nCol2);
@@ -1205,13 +1191,11 @@ void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
/*N*/ }
-/*N*/ void ScDocument::GetValue( USHORT nCol, USHORT nRow, USHORT nTab, double& rValue )
-/*N*/ {
-/*N*/ if ( VALIDTAB(nTab) && pTab[nTab] )
-/*N*/ rValue = pTab[nTab]->GetValue( nCol, nRow );
-/*N*/ else
-/*N*/ rValue = 0.0;
-/*N*/ }
+void ScDocument::GetValue( USHORT nCol, USHORT nRow, USHORT nTab, double& rValue )
+{
+ DBG_BF_ASSERT(0, "STRIP");
+ rValue = 0.0;
+}
/*N*/ double ScDocument::GetValue( const ScAddress& rPos )
@@ -1360,15 +1344,10 @@ void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
/*N*/ }
-/*N*/ void ScDocument::SetDirty( const ScRange& rRange )
-/*N*/ {
-/*N*/ BOOL bOldAutoCalc = GetAutoCalc();
-/*N*/ bAutoCalc = FALSE; // keine Mehrfachberechnung
-/*N*/ USHORT nTab2 = rRange.aEnd.Tab();
-/*N*/ for (USHORT i=rRange.aStart.Tab(); i<=nTab2; i++)
-/*N*/ if (pTab[i]) pTab[i]->SetDirty( rRange );
-/*N*/ SetAutoCalc( bOldAutoCalc );
-/*N*/ }
+void ScDocument::SetDirty( const ScRange& rRange )
+{
+ DBG_BF_ASSERT(0, "STRIP");
+}
/*N*/ void ScDocument::SetTableOpDirty( const ScRange& rRange )
@@ -1956,11 +1935,6 @@ void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
/*N*/ ScRange aRange;
/*N*/ rMark.GetMarkArea(aRange);
/*N*/ rLineInner.SetTable(aRange.aStart!=aRange.aEnd);
-/*N*/ for (USHORT i=0; i<=MAXTAB; i++)
-/*N*/ if (pTab[i] && rMark.GetTableSelect(i))
-/*N*/ pTab[i]->MergeBlockFrame( &rLineOuter, &rLineInner, aFlags,
-/*N*/ aRange.aStart.Col(), aRange.aStart.Row(),
-/*N*/ aRange.aEnd.Col(), aRange.aEnd.Row() );
/*N*/ }
/*N*/
/*N*/ // Don't care Status auswerten
@@ -2346,22 +2320,12 @@ void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
-/*N*/ void ScDocument::ApplySelectionFrame( const ScMarkData& rMark,
-/*N*/ const SvxBoxItem* pLineOuter,
-/*N*/ const SvxBoxInfoItem* pLineInner )
-/*N*/ {
-/*N*/ if (rMark.IsMarked())
-/*N*/ {
-/*N*/ ScRange aRange;
-/*N*/ rMark.GetMarkArea(aRange);
-/*N*/ for (USHORT i=0; i<=MAXTAB; i++)
-/*N*/ if (pTab[i])
-/*N*/ if (rMark.GetTableSelect(i))
-/*N*/ pTab[i]->ApplyBlockFrame( pLineOuter, pLineInner,
-/*N*/ aRange.aStart.Col(), aRange.aStart.Row(),
-/*N*/ aRange.aEnd.Col(), aRange.aEnd.Row() );
-/*N*/ }
-/*N*/ }
+void ScDocument::ApplySelectionFrame( const ScMarkData& rMark,
+ const SvxBoxItem* pLineOuter,
+ const SvxBoxInfoItem* pLineInner )
+{
+ DBG_BF_ASSERT(0, "STRIP");
+}
diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index 54fbc83..6a8a765 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -193,7 +193,6 @@ extern BOOL bIsOlk, bOderSo;
/*N*/ delete pRepeatColRange;
/*N*/ delete pRepeatRowRange;
/*N*/ delete pScenarioRanges;
-/*N*/ DestroySortCollator();
/*N*/ }
/*N*/ void ScTable::GetName( String& rName ) const
@@ -501,16 +500,6 @@ extern BOOL bIsOlk, bOderSo;
/*N*/ return FALSE; // alle Spalten durch
/*N*/ }
-/*N*/ void ScTable::UpdateDrawRef( UpdateRefMode /*eUpdateRefMode*/, USHORT /*nCol1*/, USHORT /*nRow1*/, USHORT nTab1,
-/*N*/ USHORT /*nCol2*/, USHORT /*nRow2*/, USHORT nTab2,
-/*N*/ short /*nDx*/, short /*nDy*/, short nDz )
-/*N*/ {
-/*N*/ if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // only within the table
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
/*N*/ void ScTable::UpdateReference( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
/*N*/ USHORT nCol2, USHORT nRow2, USHORT nTab2, short nDx, short nDy, short nDz,
/*N*/ ScDocument* pUndoDoc, BOOL bIncludeDraw )
@@ -531,9 +520,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ aCol[i].UpdateReference( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2,
/*N*/ nDx, nDy, nDz, pUndoDoc );
/*N*/
-/*N*/ if ( bIncludeDraw )
-/*N*/ UpdateDrawRef( eUpdateRefMode, nCol1, nRow1, nTab1, nCol2, nRow2, nTab2, nDx, nDy, nDz );
-/*N*/
/*N*/ if ( nTab >= nTab1 && nTab <= nTab2 && nDz == 0 ) // print ranges: only within the table
/*N*/ {
/*?*/ USHORT nSTab,nETab,nSCol,nSRow,nECol,nERow;
@@ -652,13 +638,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ return bInUse;
/*N*/ }
-/*N*/ void ScTable::ReplaceRangeNamesInUse(USHORT, USHORT,
-/*N*/ USHORT, USHORT,
-/*N*/ const ScIndexMap& )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ void ScTable::ExtendPrintArea( OutputDevice* pDev,
/*N*/ USHORT /*nStartCol*/, USHORT nStartRow, USHORT& rEndCol, USHORT nEndRow )
/*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_table2.cxx b/binfilter/bf_sc/source/core/data/sc_table2.cxx
index 115f4a9..32f0716 100644
--- a/binfilter/bf_sc/source/core/data/sc_table2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table2.cxx
@@ -66,11 +66,6 @@ void lcl_LoadRange( SvStream& rStream, ScRange** ppRange );
/*N*/ USHORT nNewSizeX = 0;
/*N*/ USHORT nNewSizeY = 0;
/*N*/
-/*N*/ if (pOutlineTable)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/
/*N*/ if (pNewOutline)
/*N*/ {
/*N*/ pOutlineTable = new ScOutlineTable( *pNewOutline );
@@ -358,25 +353,15 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if (nRow1==0 && nRow2==MAXROW && pColWidth && pDestTab->pColWidth)
/*N*/ for (i=nCol1; i<=nCol2; i++)
/*N*/ {
-/*N*/ BOOL bChange = pCharts &&
-/*N*/ ( pDestTab->pColFlags[i] & CR_HIDDEN ) != ( pColFlags[i] & CR_HIDDEN );
/*N*/ pDestTab->pColWidth[i] = pColWidth[i];
/*N*/ pDestTab->pColFlags[i] = pColFlags[i];
-/*N*/ //! Aenderungen zusammenfassen?
-/*N*/ if (bChange)
-/*?*/ { DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/
/*N*/ if (nCol1==0 && nCol2==MAXCOL && pRowHeight && pDestTab->pRowHeight)
/*N*/ for (i=nRow1; i<=nRow2; i++)
/*N*/ {
-/*N*/ BOOL bChange = pCharts &&
-/*N*/ ( pDestTab->pRowFlags[i] & CR_HIDDEN ) != ( pRowFlags[i] & CR_HIDDEN );
/*N*/ pDestTab->pRowHeight[i] = pRowHeight[i];
/*N*/ pDestTab->pRowFlags[i] = pRowFlags[i];
-/*N*/ //! Aenderungen zusammenfassen?
-/*N*/ if (bChange)
-/*?*/ { DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/
/*N*/ pDestTab->SetOutlineTable( pOutlineTable ); // auch nur wenn bColRowFlags
@@ -429,8 +414,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if (pCell)
/*N*/ aCol[nCol].Insert( nRow, pCell );
-/*N*/ else
-DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
@@ -441,8 +424,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if (pCell)
/*N*/ aCol[nCol].Insert( nRow, nFormatIndex, pCell );
-/*N*/ else
-DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/ }
@@ -451,8 +432,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ {
/*N*/ if (pCell)
/*N*/ aCol[rPos.Col()].Insert( rPos.Row(), pCell );
-/*N*/ else
-DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
@@ -496,11 +475,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ rString.Erase();
/*N*/ }
-/*N*/ double ScTable::GetValue( USHORT, USHORT )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); return 0.0;
-/*N*/ }
-
/*N*/ BOOL ScTable::GetNote( USHORT nCol, USHORT nRow, ScPostIt& rNote)
/*N*/ {
/*N*/ BOOL bHasNote = FALSE;
@@ -577,12 +551,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ void ScTable::SetDirty( const ScRange& )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
/*N*/ void ScTable::SetTableOpDirty( const ScRange& rRange )
/*N*/ {
/*N*/ BOOL bOldAutoCalc = pDocument->GetAutoCalc();
@@ -823,34 +791,37 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ BOOL ScTable::IsSelectionEditable( const ScMarkData& rMark,
-/*N*/ BOOL* pOnlyNotBecauseOfMatrix /* = NULL */ ) const
-/*N*/ {
-/*N*/ BOOL bIsEditable;
-/*N*/ if ( nLockCount )
-/*N*/ bIsEditable = FALSE;
-/*N*/ else if ( bProtected )
+BOOL ScTable::IsSelectionEditable(
+ const ScMarkData& rMark,
+ BOOL* pOnlyNotBecauseOfMatrix /* = NULL */
+) const
+{
+ BOOL bIsEditable;
+ if ( nLockCount )
+ bIsEditable = FALSE;
+ else if ( bProtected )
{
-{DBG_BF_ASSERT(0, "STRIP");}
bIsEditable = FALSE;
}
-/*N*/ else
-/*N*/ bIsEditable = TRUE;
-/*N*/ if ( bIsEditable )
-/*N*/ {
-/*N*/ if ( HasSelectionMatrixFragment( rMark ) )
-/*N*/ {
-/*N*/ bIsEditable = FALSE;
-/*N*/ if ( pOnlyNotBecauseOfMatrix )
-/*N*/ *pOnlyNotBecauseOfMatrix = TRUE;
-/*N*/ }
-/*N*/ else if ( pOnlyNotBecauseOfMatrix )
-/*N*/ *pOnlyNotBecauseOfMatrix = FALSE;
-/*N*/ }
-/*N*/ else if ( pOnlyNotBecauseOfMatrix )
-/*N*/ *pOnlyNotBecauseOfMatrix = FALSE;
-/*N*/ return bIsEditable;
-/*N*/ }
+ else
+ bIsEditable = TRUE;
+
+ if ( bIsEditable )
+ {
+ if ( HasSelectionMatrixFragment( rMark ) )
+ {
+ bIsEditable = FALSE;
+ if ( pOnlyNotBecauseOfMatrix )
+ *pOnlyNotBecauseOfMatrix = TRUE;
+ }
+ else if ( pOnlyNotBecauseOfMatrix )
+ *pOnlyNotBecauseOfMatrix = FALSE;
+ }
+ else if ( pOnlyNotBecauseOfMatrix )
+ *pOnlyNotBecauseOfMatrix = FALSE;
+
+ return bIsEditable;
+}
@@ -884,22 +855,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ void ScTable::MergeBlockFrame( SvxBoxItem*, SvxBoxInfoItem*, ScLineFlags&,
-/*N*/ USHORT, USHORT, USHORT, USHORT ) const
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-/*N*/ void ScTable::ApplyBlockFrame( const SvxBoxItem*, const SvxBoxInfoItem*,
-/*N*/ USHORT, USHORT, USHORT, USHORT )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-
-
-
/*N*/ void ScTable::ApplyPatternArea( USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow,
/*N*/ const ScPatternAttr& rAttr )
/*N*/ {
@@ -1307,9 +1262,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ if( !--nRecalcLvl )
/*?*/ SetDrawPageSize();
/*N*/
-/*N*/ ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
-/*N*/ if ( pCharts && pCharts->GetCount() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ }
/*N*/ }
/*N*/ else
@@ -1354,13 +1306,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ for (i=nStartRow; i<=nEndRow; i++)
/*N*/ pRowFlags[i] |= CR_HIDDEN;
/*N*/
-/*N*/ if ( bChanged )
-/*N*/ {
-/*N*/ ScChartListenerCollection* pCharts = pDocument->GetChartListenerCollection();
-/*N*/ if ( pCharts && pCharts->GetCount() )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-/*N*/
/*N*/ nStartRow = nEndRow + 1;
/*N*/ }
/*N*/ if( !--nRecalcLvl )
@@ -1439,15 +1384,6 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
-/*N*/ BOOL ScTable::UpdateOutlineCol( USHORT /*nStartCol*/, USHORT /*nEndCol*/, BOOL /*bShow*/ )
-/*N*/ {
-/*N*/ if (pOutlineTable && pColFlags)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return FALSE;}
-/*N*/ else
-/*N*/ return FALSE;
-/*N*/ }
-
-
/*N*/ BOOL ScTable::UpdateOutlineRow( USHORT nStartRow, USHORT nEndRow, BOOL bShow )
/*N*/ {
/*N*/ if (pOutlineTable && pRowFlags)
diff --git a/binfilter/bf_sc/source/core/data/sc_table3.cxx b/binfilter/bf_sc/source/core/data/sc_table3.cxx
index 40c1a57..d4f71ac 100644
--- a/binfilter/bf_sc/source/core/data/sc_table3.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table3.cxx
@@ -52,49 +52,6 @@
#include <vector>
namespace binfilter {
-// STATIC DATA -----------------------------------------------------------
-
-const USHORT nMaxSorts = 3; // maximale Anzahl Sortierkriterien in aSortParam
-
-struct ScSortInfo
-{
- ScBaseCell* pCell;
- USHORT nOrg;
- DECL_FIXEDMEMPOOL_NEWDEL( ScSortInfo );
-};
-/*N*/ const USHORT nMemPoolSortInfo = (0x8000 - 64) / sizeof(ScSortInfo);
-/*N*/ IMPL_FIXEDMEMPOOL_NEWDEL( ScSortInfo, nMemPoolSortInfo, nMemPoolSortInfo )
-
-// END OF STATIC DATA -----------------------------------------------------
-
-
-
-
-
-
-
-
-
-/*N*/ void ScTable::DestroySortCollator()
-/*N*/ {
-/*N*/ if ( pSortCollator )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-
-
-
-
-
-
-
-
-
-
-
-
-
// Testen, ob beim Loeschen von Zwischenergebnissen andere Daten mit geloescht werden
// (fuer Hinweis-Box)
@@ -175,7 +132,7 @@ DBG_BF_ASSERT(0, "STRIP");
/*N*/
/*N*/ }
/*N*/ else
-/*?*/ nCellVal = GetValue( rEntry.nField, nRow );
+/*?*/ nCellVal = 0.0;
/*N*/ switch (rEntry.eOp)
/*N*/ {
/*N*/ case SC_EQUAL :
@@ -334,16 +291,6 @@ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ BOOL ScTable::CreateQueryParam(USHORT, USHORT, USHORT, USHORT, ScQueryParam&)
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-return FALSE;
-/*N*/ }
-
-
-
-
-
/*N*/ long ScTable::GetCellCount() const
/*N*/ {
/*N*/ long nCellCount = 0;
diff --git a/binfilter/inc/bf_sc/table.hxx b/binfilter/inc/bf_sc/table.hxx
index bccad31..d1f079f 100644
--- a/binfilter/inc/bf_sc/table.hxx
+++ b/binfilter/inc/bf_sc/table.hxx
@@ -62,7 +62,6 @@ class ScPrintSaverTab;
class ScProgress;
class ScProgress;
class ScRangeList;
-class ScSortInfoArray;
class ScStyleSheet;
class ScTableLink;
class ScUserListData;
@@ -232,7 +231,6 @@ public:
void GetInputString( USHORT nCol, USHORT nRow, String& rString );
double GetValue( const ScAddress& rPos ) const
{ return aCol[rPos.Col()].GetValue( rPos.Row() ); }
- double GetValue( USHORT nCol, USHORT nRow );
BOOL GetNote( USHORT nCol, USHORT nRow, ScPostIt& rNote);
CellType GetCellType( const ScAddress& rPos ) const
@@ -290,7 +288,6 @@ public:
void ResetChanged( const ScRange& rRange );
void SetDirty();
- void SetDirty( const ScRange& );
void SetDirtyAfterLoad();
void SetDirtyVar();
void SetTableOpDirty( const ScRange& );
@@ -304,20 +301,12 @@ public:
short nDx, short nDy, short nDz,
ScDocument* pUndoDoc = NULL, BOOL bIncludeDraw = TRUE );
- void UpdateDrawRef( UpdateRefMode eUpdateRefMode, USHORT nCol1, USHORT nRow1, USHORT nTab1,
- USHORT nCol2, USHORT nRow2, USHORT nTab2,
- short nDx, short nDy, short nDz );
-
-
-
void UpdateInsertTab(USHORT nTable);
void UpdateDeleteTab( USHORT nTable, BOOL bIsMove, ScTable* pRefUndo = NULL );
void UpdateCompile( BOOL bForceIfNameInUse = FALSE );
void SetTabNo(USHORT nNewTab);
BOOL IsRangeNameInUse(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2,
USHORT nIndex) const;
- void ReplaceRangeNamesInUse(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2,
- const ScIndexMap& rMap );
void UpdateSelectionFunction( ScFunctionData& rData,
USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow,
@@ -341,14 +330,6 @@ public:
const ScMarkData& rMark, BOOL bDeep ) const;
void MergePatternArea( SfxItemSet** ppSet, USHORT nCol1, USHORT nRow1,
USHORT nCol2, USHORT nRow2, BOOL bDeep ) const;
- void MergeBlockFrame( SvxBoxItem* pLineOuter, SvxBoxInfoItem* pLineInner,
- ScLineFlags& rFlags,
- USHORT nStartCol, USHORT nStartRow,
- USHORT nEndCol, USHORT nEndRow ) const;
- void ApplyBlockFrame( const SvxBoxItem* pLineOuter,
- const SvxBoxInfoItem* pLineInner,
- USHORT nStartCol, USHORT nStartRow,
- USHORT nEndCol, USHORT nEndRow );
void ApplyAttr( USHORT nCol, USHORT nRow, const SfxPoolItem& rAttr );
void ApplyPatternArea( USHORT nStartCol, USHORT nStartRow, USHORT nEndCol, USHORT nEndRow, const ScPatternAttr& rAttr );
@@ -427,7 +408,6 @@ public:
BYTE GetColFlags( USHORT nCol ) const;
BYTE GetRowFlags( USHORT nRow ) const;
- BOOL UpdateOutlineCol( USHORT nStartCol, USHORT nEndCol, BOOL bShow );
BOOL UpdateOutlineRow( USHORT nStartRow, USHORT nEndRow, BOOL bShow );
void UpdatePageBreaks( const ScRange* pUserArea );
@@ -439,9 +419,6 @@ public:
BOOL ValidQuery(USHORT nRow, const ScQueryParam& rQueryParam,
BOOL* pSpecial = NULL, ScBaseCell* pCell = NULL,
BOOL* pbTestEqualCondition = NULL );
- BOOL CreateQueryParam(USHORT nCol1, USHORT nRow1, USHORT nCol2, USHORT nRow2, ScQueryParam& rQueryParam);
-
-
void DoColResize( USHORT nCol1, USHORT nCol2, USHORT nAdd );
@@ -452,8 +429,6 @@ public:
void IncRecalcLevel() { ++nRecalcLvl; }
void DecRecalcLevel() { if (!--nRecalcLvl) SetDrawPageSize(); }
- void DestroySortCollator();
-
private:
// benutzen globalen SortParam:
More information about the Libreoffice-commits
mailing list