[Libreoffice-commits] .: binfilter/bf_sc

[Joseph Powers]

 binfilter/bf_sc/source/core/data/sc_cell.cxx  |   24 ------------------------
 binfilter/bf_sc/source/core/data/sc_cell2.cxx |    2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

New commits:
commit e19ef0dff2b4288073deb95269bfe7dbf2eb3a8a
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Thu Sep 8 22:39:54 2011 -0700

    Minor cleanup of the ScFormulaCell & ScBaseCell classes

diff --git a/binfilter/bf_sc/source/core/data/sc_cell.cxx b/binfilter/bf_sc/source/core/data/sc_cell.cxx
index 0bb732d..3bf2d93 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell.cxx
@@ -706,7 +706,6 @@ static const sal_Char msgDbgInfinity[] =
 /*N*/   bTableOpDirty( FALSE ),
 /*N*/   aPos( rPos )
 /*N*/ {
-/*N*/ //    ScReadHeader aHdr( rStream );
 /*N*/   rHdr.StartEntry();
 /*N*/
 /*N*/   USHORT nVer = (USHORT) pDoc->GetSrcVersion();
@@ -715,14 +714,6 @@ static const sal_Char msgDbgInfinity[] =
 /*N*/   {
 /*N*/       BYTE cData;
 /*N*/       rStream >> cData;
-/*N*/ #ifdef DBG_UTIL
-/*N*/ //        static BOOL bShown = 0;
-/*N*/ //        if ( !bShown && SOFFICE_FILEFORMAT_NOW > SOFFICE_FILEFORMAT_50 )
-/*N*/ //        {
-/*N*/ //            bShown = 1;
-/*N*/ //            DBG_ERRORFILE( "bei inkompatiblem FileFormat den FormatIndex umheben!" );
-/*N*/ //        }
-/*N*/ #endif
 /*N*/       if( cData & 0x0F )
 /*N*/       {
 /*N*/           BYTE nSkip = cData & 0x0F;
@@ -866,10 +857,6 @@ static const sal_Char msgDbgInfinity[] =
 /*N*/       delete pCodeOld;
 /*N*/   if( !pCode->GetError() )
 /*N*/   {
-/*N*/       if ( !pCode->GetLen() && aErgString.Len() && rFormula == aErgString )
-/*N*/       {   // #65994# nicht rekursiv CompileTokenArray/Compile/CompileTokenArray
-/*?*/       DBG_BF_ASSERT(0, "STRIP");
-/*N*/       }
 /*N*/       bCompile = TRUE;
 /*N*/       CompileTokenArray( bNoListening );
 /*N*/   }
@@ -945,10 +932,6 @@ static const sal_Char msgDbgInfinity[] =
 /*N*/   delete pCodeOld;
 /*N*/   if( !pCode->GetError() )
 /*N*/   {
-/*N*/       if ( !pCode->GetLen() )
-/*N*/       {
-/*?*/       DBG_BF_ASSERT(0, "STRIP");
-/*N*/       }
 /*N*/       bSubTotal = aComp.CompileTokenArray();
 /*N*/       if( !pCode->GetError() )
 /*N*/       {
@@ -1287,13 +1270,6 @@ static const sal_Char msgDbgInfinity[] =
 /*N*/       }
 /*N*/ #endif
 /*N*/
-/*N*/       //  FORCED Zellen auch sofort auf Gueltigkeit testen (evtl. Makro starten)
-/*N*/
-/*N*/       if ( pCode->IsRecalcModeForced() )
-/*N*/       {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/       }
-/*N*/
 /*N*/       // Reschedule verlangsamt das ganze erheblich, nur bei Prozentaenderung ausfuehren
 /*N*/       ScProgress::GetInterpretProgress()->SetStateCountDownOnPercent(
 /*N*/           pDocument->GetFormulaCodeInTree() );
diff --git a/binfilter/bf_sc/source/core/data/sc_cell2.cxx b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
index b963c16..9d8f620 100644
--- a/binfilter/bf_sc/source/core/data/sc_cell2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_cell2.cxx
@@ -582,7 +582,7 @@ const USHORT nMemPoolEditCell = (0x1000 - 64) / sizeof(ScNoteCell);
 /*N*/ BOOL ScFormulaCell::TestTabRefAbs(USHORT nTable)
 /*N*/ {
 /*N*/   BOOL bRet = FALSE;
-DBG_BF_ASSERT(0, "STRIP"); /*N*/    if( !pDocument->IsClipOrUndo() )
+/*N*/   if( !pDocument->IsClipOrUndo() )
 /*N*/   {
 /*N*/       pCode->Reset();
 /*N*/       ScToken* p = pCode->GetNextReferenceRPN();