[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Sun Oct 2 06:11:10 PDT 2011
binfilter/bf_sc/source/core/data/sc_dpshttab.cxx | 7 ----
binfilter/bf_sc/source/core/tool/sc_collect.cxx | 40 -----------------------
binfilter/bf_sc/source/core/tool/sc_compiler.cxx | 18 ++++------
binfilter/bf_sc/source/core/tool/sc_consoli.cxx | 31 -----------------
binfilter/inc/bf_sc/collect.hxx | 23 +------------
binfilter/inc/bf_sc/column.hxx | 1
binfilter/inc/bf_sc/document.hxx | 1
binfilter/inc/bf_sc/dptabdat.hxx | 2 -
8 files changed, 10 insertions(+), 113 deletions(-)
New commits:
commit c49dde7cea0c533da696752a064213c2d091e834
Author: Joseph Powers <jpowers27 at cox.net>
Date: Sun Oct 2 06:10:59 2011 -0700
Class TypedStrCollection is not really used, so I'm deleting it.
Plus some miscellanous DBG_BF_ASSERT cleanup.
diff --git a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
index 9aa89be..d3396c0 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpshttab.cxx
@@ -52,7 +52,6 @@ namespace binfilter {
/*N*/ long nColCount;
/*N*/ BOOL bIgnoreEmptyRows;
/*N*/ BOOL bRepeatIfEmpty;
-/*N*/ TypedStrCollection** ppStrings;
/*N*/ BOOL* pDateDim;
/*N*/ USHORT nNextRow; // for iterator, within range
/*N*/
@@ -72,10 +71,7 @@ namespace binfilter {
/*M*/ pImpl->bIgnoreEmptyRows = FALSE;
/*M*/ pImpl->bRepeatIfEmpty = FALSE;
/*M*/ pImpl->nColCount = nCount;
-/*M*/ pImpl->ppStrings = new TypedStrCollection*[nCount];
/*M*/ pImpl->pDateDim = NULL;
-/*M*/ for (long i=0; i<nCount; i++)
-/*M*/ pImpl->ppStrings[i] = NULL;
/*M*/
/*M*/ pImpl->nNextRow = pImpl->aRange.aStart.Row() + 1;
/*M*/
@@ -106,9 +102,6 @@ namespace binfilter {
/*N*/ ScSheetDPData::~ScSheetDPData()
/*N*/ {
-/*N*/ for (long i=0; i<pImpl->nColCount; i++)
-/*N*/ delete pImpl->ppStrings[i];
-/*N*/ delete[] pImpl->ppStrings;
/*N*/ delete[] pImpl->pDateDim;
/*N*/ delete pImpl;
/*M*/ delete[] pSpecial;
diff --git a/binfilter/bf_sc/source/core/tool/sc_collect.cxx b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
index 2ce86f7..773e5ba 100644
--- a/binfilter/bf_sc/source/core/tool/sc_collect.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_collect.cxx
@@ -193,13 +193,6 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------------
-
-/*N*/ DataObject* Collection::Clone() const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-//------------------------------------------------------------------------
// SortedCollection
//------------------------------------------------------------------------
@@ -261,17 +254,6 @@ namespace binfilter {
//------------------------------------------------------------------------
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-// IsEqual - komplette Inhalte vergleichen
-
-
-//------------------------------------------------------------------------
-
/*N*/ DataObject* StrData::Clone() const
/*N*/ {
return new StrData(*this); // #i49161# this is needed
@@ -292,13 +274,6 @@ namespace binfilter {
//------------------------------------------------------------------------
-/*N*/ DataObject* StrCollection::Clone() const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return NULL;
-/*N*/ }
-
-//------------------------------------------------------------------------
-
/*N*/ void StrCollection::Load( SvStream& rStream ) // Changetracking.sdc
/*N*/ {
/*N*/ ScReadHeader aHdr( rStream );
@@ -318,8 +293,6 @@ namespace binfilter {
/*N*/ }
//------------------------------------------------------------------------
-// TypedStrCollection
-//------------------------------------------------------------------------
/*N*/ TypedStrData::TypedStrData( ScDocument* pDoc, USHORT nCol, USHORT nRow, USHORT nTab,
/*N*/ BOOL bAllStrings )
@@ -345,19 +318,6 @@ namespace binfilter {
/*N*/ }
-/*N*/ short TypedStrCollection::Compare( DataObject* /*pKey1*/, DataObject* /*pKey2*/ ) const
-/*N*/ {
-/*N*/ short nResult = 0;
- DBG_BF_ASSERT(0, "STRIP");
-/*N*/ return nResult;
-/*N*/ }
-
-
- // Gross-/Kleinschreibung anpassen
-
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
index dbb3a44..e67a51f 100644
--- a/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_compiler.cxx
@@ -767,9 +767,9 @@ namespace binfilter {
/*N*/ bFound = ScGlobal::GetFuncCollection()->SearchFunc(cSymbol, nIndex);
/*N*/ if( bFound )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScRawToken aToken;
-/*N*/ /*?*/ aToken.SetExternal( cSymbol );
-/*N*/ /*?*/ pRawToken = aToken.Clone();
+/*?*/ ScRawToken aToken;
+/*N*/ aToken.SetExternal( cSymbol );
+/*N*/ pRawToken = aToken.Clone();
/*N*/ }
/*N*/ else
/*N*/ {
@@ -988,7 +988,7 @@ namespace binfilter {
/*N*/ pSfxApp->LeaveBasicCall();
/*N*/ return FALSE;
/*N*/ }
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScRawToken aToken;
+/*?*/ /*N*/ ScRawToken aToken;
/*N*/ /*?*/ aToken.SetExternal( rName.GetBuffer() );
/*N*/ /*?*/ aToken.eOp = ocMacro;
/*N*/ /*?*/ pRawToken = aToken.Clone();
@@ -1565,7 +1565,7 @@ namespace binfilter {
/*N*/ ScByteToken aToken( ocClose );
/*N*/ while( nBrackets-- )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ if( !pArr->AddToken( aToken ) )
+/*?*/ /*N*/ if( !pArr->AddToken( aToken ) )
/*N*/ /*?*/ {
/*N*/ /*?*/ SetError(errCodeOverflow); break;
/*N*/ /*?*/ }
@@ -1940,7 +1940,7 @@ namespace binfilter {
/*N*/ }
/*N*/ else if( pToken->GetOpCode() == ocDBArea )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex( pToken->GetIndex() );
+/*?*/ /*N*/ ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex( pToken->GetIndex() );
/*N*/ /*?*/ if ( !pDBData )
/*N*/ /*?*/ SetError(errNoName);
/*N*/ /*?*/ else if ( !bCompileForFAP )
@@ -2669,7 +2669,7 @@ namespace binfilter {
/*N*/ (!rRef.Ref2.IsColRel() && !rRef.Ref2.IsRowRel() &&
/*N*/ (!rRef.Ref2.IsFlag3D() || !rRef.Ref2.IsTabRel()))))
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ if (ScRefUpdate::Update( pDoc, eUpdateRefMode, aPos,
+/*?*/ /*N*/ if (ScRefUpdate::Update( pDoc, eUpdateRefMode, aPos,
/*N*/ /*?*/ r, nDx, nDy, nDz, rRef ) != UR_NOTHING )
/*N*/ /*?*/ rChanged = TRUE;
/*N*/ }
@@ -3131,7 +3131,7 @@ namespace binfilter {
/*N*/ break;
/*?*/ case ocDBArea:
/*?*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP"); /*N*/ ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex(t->GetIndex());
+/*?*/ /*N*/ ScDBData* pDBData = pDoc->GetDBCollection()->FindIndex(t->GetIndex());
/*N*/ /*?*/ if (pDBData)
/*N*/ /*?*/ aBuffer.append(pDBData->GetName());
/*?*/ }
@@ -3149,8 +3149,6 @@ namespace binfilter {
/*N*/ {
/*N*/ // show translated name of StarOne AddIns
/*N*/ String aAddIn( t->GetExternal() );
-/*N*/ if ( pSymbolTable != pSymbolTableEnglish )
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
/*N*/ rBuffer.append(aAddIn);
/*N*/ }
/*N*/ break;
diff --git a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
index a69f692..5fc790e 100644
--- a/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_consoli.cxx
@@ -120,8 +120,6 @@ namespace binfilter {
/*N*/ delete[] ppRefs;
/*N*/ ppRefs = NULL;
/*N*/
-/*N*/ // DELETEARR( ppData1, nColCount );
-/*N*/ // DELETEARR( ppData2, nColCount );
/*N*/ DELETEARR( ppCount, nColCount );
/*N*/ DELETEARR( ppSum, nColCount );
/*N*/ DELETEARR( ppSumSqr,nColCount );
@@ -461,19 +459,6 @@ namespace binfilter {
/*N*/ nCol1 = nStartCol;
/*N*/ nRow1 = nStartRow;
/*N*/
-/*N*/ // Daten
-/*N*/
-/*N*/ ( eFunction == SUBTOTAL_FUNC_CNT2 );
-/*N*/ for (nCol=nCol1; nCol<=nCol2; nCol++)
-/*N*/ {
-/*N*/ USHORT nArrX = nCol-nCol1;
-/*N*/ if (bColByName) nArrX = pDestCols[nArrX];
-/*N*/ if (nArrX != SC_CONS_NOTFOUND)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
-/*N*/
/*N*/ delete[] pDestCols;
/*N*/ delete[] pDestRows;
/*N*/ }
@@ -540,26 +525,10 @@ namespace binfilter {
/*N*/ aCRef.InitFlags();
/*N*/ aCRef.Ref1.SetColRel(TRUE); aCRef.Ref1.SetRowRel(TRUE); aCRef.Ref1.SetTabRel(TRUE);
/*N*/ aCRef.Ref2.SetColRel(TRUE); aCRef.Ref2.SetRowRel(TRUE); aCRef.Ref2.SetTabRel(TRUE);
-/*N*/
-/*N*/ for (nArrY=0; nArrY<nRowCount; nArrY++)
-/*N*/ {
-/*N*/ USHORT nNeeded = 0;
-/*N*/ for (nArrX=0; nArrX<nColCount; nArrX++)
-/*N*/ if (ppUsed[nArrX][nArrY])
-/*N*/ nNeeded = Max( nNeeded, ppRefs[nArrX][nArrY].GetCount() );
-/*N*/
-/*N*/ if (nNeeded)
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-/*N*/ }
/*N*/ }
/*N*/ }
-
-
-
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/binfilter/inc/bf_sc/collect.hxx b/binfilter/inc/bf_sc/collect.hxx
index 03cca22..04a9f60 100644
--- a/binfilter/inc/bf_sc/collect.hxx
+++ b/binfilter/inc/bf_sc/collect.hxx
@@ -66,7 +66,7 @@ public:
Collection(const Collection& rCollection);
virtual ~Collection();
- virtual DataObject* Clone() const;
+ virtual DataObject* Clone() const { return NULL; } // DBG_BF_ASSERT
void AtFree(USHORT nIndex);
void Free(DataObject* pDataObject);
@@ -132,7 +132,7 @@ public:
StrCollection(const StrCollection& rStrCollection) :
SortedCollection ( rStrCollection ) {}
- virtual DataObject* Clone() const;
+ virtual DataObject* Clone() const { return NULL; } // DBG_BF_ASSERT
StrData* operator[]( const USHORT nIndex) const {return (StrData*)At(nIndex);}
virtual short Compare(DataObject* pKey1, DataObject* pKey2) const;
@@ -167,7 +167,6 @@ public:
const String& GetString() const { return aStrValue; }
private:
- friend class TypedStrCollection;
friend class PivotStrCollection;
String aStrValue;
@@ -175,24 +174,6 @@ private:
USHORT nStrType; // 0 = Value
};
-class TypedStrCollection : public SortedCollection
-{
-private:
- BOOL bCaseSensitive;
-
-public:
- TypedStrCollection( USHORT nLim = 4, USHORT nDel = 4, BOOL bDup = FALSE )
- : SortedCollection( nLim, nDel, bDup ) { bCaseSensitive = FALSE; }
-
- TypedStrCollection( const TypedStrCollection& rCpy )
- : SortedCollection( rCpy ) { bCaseSensitive = rCpy.bCaseSensitive; }
-
- virtual short Compare( DataObject* pKey1, DataObject* pKey2 ) const;
-
-
-
-};
-
} //namespace binfilter
#endif
diff --git a/binfilter/inc/bf_sc/column.hxx b/binfilter/inc/bf_sc/column.hxx
index 688fba3..0114eb4 100644
--- a/binfilter/inc/bf_sc/column.hxx
+++ b/binfilter/inc/bf_sc/column.hxx
@@ -61,7 +61,6 @@ class ScMultipleWriteHeader;
class ScPatternAttr;
class ScStyleSheet;
class ScBroadcasterList;
-class TypedStrCollection;
class ScProgress;
struct ScFunctionData;
struct ScLineFlags;
diff --git a/binfilter/inc/bf_sc/document.hxx b/binfilter/inc/bf_sc/document.hxx
index f9fa60d..dc5f8a0 100644
--- a/binfilter/inc/bf_sc/document.hxx
+++ b/binfilter/inc/bf_sc/document.hxx
@@ -114,7 +114,6 @@ class ScValidationData;
class ScValidationDataList;
class ScViewOptions;
class StrCollection;
-class TypedStrCollection;
class ScChangeTrack;
class ScFieldEditEngine;
struct ScConsolidateParam;
diff --git a/binfilter/inc/bf_sc/dptabdat.hxx b/binfilter/inc/bf_sc/dptabdat.hxx
index 8f6d006..1189061 100644
--- a/binfilter/inc/bf_sc/dptabdat.hxx
+++ b/binfilter/inc/bf_sc/dptabdat.hxx
@@ -34,8 +34,6 @@
#include <tools/string.hxx>
namespace binfilter {
-class TypedStrCollection;
-
// -----------------------------------------------------------------------
#define SC_DAPI_DATE_HIERARCHIES 3
More information about the Libreoffice-commits
mailing list