[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc

Joseph Powers jpowers at kemper.freedesktop.org
Sat Sep 10 06:54:53 PDT 2011


 binfilter/bf_sc/source/core/data/sc_document.cxx |   29 +++++----------
 binfilter/bf_sc/source/core/data/sc_dpobject.cxx |    3 -
 binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx |   38 ++++++++------------
 binfilter/bf_sc/source/core/data/sc_drwlayer.cxx |   13 ------
 binfilter/bf_sc/source/core/data/sc_global.cxx   |   16 +++-----
 binfilter/bf_sc/source/core/data/sc_global2.cxx  |   43 -----------------------
 binfilter/bf_sc/source/core/data/sc_olinetab.cxx |    6 ---
 binfilter/bf_sc/source/core/data/sc_pivot.cxx    |   10 -----
 binfilter/bf_sc/source/core/data/sc_pivot2.cxx   |    6 +--
 binfilter/bf_sc/source/core/data/sc_table1.cxx   |   26 -------------
 binfilter/inc/bf_sc/dpshttab.hxx                 |    4 --
 binfilter/inc/bf_sc/global.hxx                   |    9 ----
 binfilter/inc/bf_sc/table.hxx                    |    8 ----
 13 files changed, 37 insertions(+), 174 deletions(-)

New commits:
commit e8589143af58ab9e4e19ddec7afcf9af3dc79917
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sat Sep 10 06:30:16 2011 -0700

    Some more DBG_BF_ASSERT() cleanups

diff --git a/binfilter/bf_sc/source/core/data/sc_document.cxx b/binfilter/bf_sc/source/core/data/sc_document.cxx
index 7b8ab2c..98fd171 100644
--- a/binfilter/bf_sc/source/core/data/sc_document.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_document.cxx
@@ -450,13 +450,11 @@ namespace binfilter {
 
 //  zusammenhaengender Bereich
 
-/*N*/ void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
-/*N*/                               USHORT& rEndCol, USHORT& rEndRow, BOOL bIncludeOld )
-/*N*/ {
-/*N*/   if (VALIDTAB(nTab))
-/*N*/       if (pTab[nTab])
-/*N*/           pTab[nTab]->GetDataArea( rStartCol, rStartRow, rEndCol, rEndRow, bIncludeOld );
-/*N*/ }
+void ScDocument::GetDataArea( USHORT nTab, USHORT& rStartCol, USHORT& rStartRow,
+                              USHORT& rEndCol, USHORT& rEndRow, BOOL bIncludeOld )
+{
+    DBG_BF_ASSERT(0, "STRIP");
+}
 
 
 
@@ -2420,18 +2418,11 @@ namespace binfilter {
 
 
 
-/*N*/ void ScDocument::GetNextPos( USHORT& rCol, USHORT& rRow, USHORT nTab, short nMovX, short nMovY,
-/*N*/                               BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark )
-/*N*/ {
-/*N*/   DBG_ASSERT( !nMovX || !nMovY, "GetNextPos: nur X oder Y" );
-/*N*/
-/*N*/   ScMarkData aCopyMark = rMark;
-/*N*/   aCopyMark.SetMarking(FALSE);
-/*N*/   aCopyMark.MarkToMulti();
-/*N*/
-/*N*/   if (nTab<=MAXTAB && pTab[nTab])
-/*N*/       pTab[nTab]->GetNextPos( rCol, rRow, nMovX, nMovY, bMarked, bUnprotected, aCopyMark );
-/*N*/ }
+void ScDocument::GetNextPos( USHORT& rCol, USHORT& rRow, USHORT nTab, short nMovX, short nMovY,
+                             BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark )
+{
+    DBG_BF_ASSERT(0, "STRIP");
+}
 
 //
 //  Datei-Operationen
diff --git a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
index 7b620e5..a4f6a4b 100644
--- a/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dpobject.cxx
@@ -198,9 +198,6 @@ DBG_BF_ASSERT(0, "STRIP"); return NULL;
 
 /*N*/ void ScDPObject::SetSheetDesc(const ScSheetSourceDesc& rDesc)
 /*N*/ {
-/*N*/   if ( pSheetDesc && rDesc == *pSheetDesc )
-/*N*/       return;             // nothing to do
-/*N*/
 /*N*/   DELETEZ( pImpDesc );
 /*N*/   DELETEZ( pServDesc );
 /*N*/
diff --git a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
index 144c94e..f756881 100644
--- a/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_dptabsrc.cxx
@@ -285,10 +285,11 @@ using namespace ::com::sun::star;
 /*?*/   return nDim;
 /*N*/ }
 
-/*?*/ uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResults()
-/*?*/                                                           throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Sequence< uno::Sequence<sheet::DataResult> >(0);
-/*?*/ }
+uno::Sequence< uno::Sequence<sheet::DataResult> > SAL_CALL ScDPSource::getResults()
+    throw(uno::RuntimeException)
+{
+    return uno::Sequence< uno::Sequence<sheet::DataResult> >(0);
+}
 
 /*?*/ void SAL_CALL ScDPSource::refresh() throw(uno::RuntimeException)
 /*?*/ {DBG_BF_ASSERT(0, "STRIP");
@@ -398,9 +399,7 @@ using namespace ::com::sun::star;
 /*N*/       lcl_SetBoolInAny( aRet, getIgnoreEmptyRows() );
 /*N*/   else if ( aNameStr.EqualsAscii( SC_UNO_REPEATIF ) )
 /*N*/       lcl_SetBoolInAny( aRet, getRepeatIfEmpty() );
-/*N*/   else if ( aNameStr.EqualsAscii( SC_UNO_DATADESC ) )             // read-only
-/*?*/   {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/   else
+/*N*/   else if ( !aNameStr.EqualsAscii( SC_UNO_DATADESC ) )             // read-only
 /*N*/   {
 /*N*/       OSL_FAIL("unknown property");
 /*N*/       //! THROW( UnknownPropertyException() );
@@ -630,8 +629,7 @@ using namespace ::com::sun::star;
 /*N*/   else if ( aNameStr.EqualsAscii( SC_UNO_USEDHIER ) )
 /*N*/   {
 /*?*/       INT32 nInt;
-/*?*/       if (aValue >>= nInt)
-/*?*/       {DBG_BF_ASSERT(0, "STRIP");}
+/*?*/       aValue >>= nInt;
 /*N*/   }
 /*N*/   else if ( aNameStr.EqualsAscii( SC_UNO_ORIENTAT ) )
 /*N*/   {
@@ -998,21 +996,18 @@ using namespace ::com::sun::star;
 
 /*N*/ ScDPLevel::~ScDPLevel()
 /*N*/ {
-/*N*/   //! release pSource
-/*N*/
-/*N*/   if ( pMembers )
-/*?*/   {DBG_BF_ASSERT(0, "STRIP");}
 /*N*/ }
 
 
-/*?*/ uno::Reference<container::XNameAccess> SAL_CALL ScDPLevel::getMembers() throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP"); return uno::Reference<container::XNameAccess>(0);
-/*?*/ }
+uno::Reference<container::XNameAccess> SAL_CALL ScDPLevel::getMembers() throw(uno::RuntimeException)
+{
+    return uno::Reference<container::XNameAccess>(0);
+}
 
-/*?*/ uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::RuntimeException)
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");
-/*?*/   return uno::Sequence<sheet::MemberResult>(0);       //! Error?
-/*?*/ }
+uno::Sequence<sheet::MemberResult> SAL_CALL ScDPLevel::getResults() throw(uno::RuntimeException)
+{
+    return uno::Sequence<sheet::MemberResult>(0);       //! Error?
+}
 
 /*N*/ ::rtl::OUString SAL_CALL ScDPLevel::getName() throw(uno::RuntimeException)
 /*N*/ {
@@ -1113,8 +1108,7 @@ using namespace ::com::sun::star;
 /*N*/   else if ( aNameStr.EqualsAscii( SC_UNO_SUBTOTAL ) )
 /*N*/   {
 /*?*/       uno::Sequence<sheet::GeneralFunction> aSeq;
-/*?*/       if ( aValue >>= aSeq )
-/*?*/       {DBG_BF_ASSERT(0, "STRIP");}
+/*?*/       aValue >>= aSeq;
 /*N*/   }
 /*N*/   else
 /*N*/   {
diff --git a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
index 82ab441..4e3ef33 100644
--- a/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_drwlayer.cxx
@@ -272,19 +272,6 @@ BOOL bDrawIsInUndo = FALSE;         //! Member
 /*N*/           pPage->SetSize( rSize );
 /*N*/           Broadcast( ScTabSizeChangedHint( nPageNo ) );   // SetWorkArea() an den Views
 /*N*/       }
-/*N*/
-/*N*/       // Detektivlinien umsetzen (an neue Hoehen/Breiten anpassen)
-/*N*/       //  auch wenn Groesse gleich geblieben ist
-/*N*/       //  (einzelne Zeilen/Spalten koennen geaendert sein)
-/*N*/
-/*N*/       ULONG nCount = pPage->GetObjCount();
-/*N*/       for ( ULONG i = 0; i < nCount; i++ )
-/*N*/       {
-/*N*/           SdrObject* pObj = pPage->GetObj( i );
-/*N*/           ScDrawObjData* pData = GetObjData( pObj );
-/*N*/           if( pData )
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/       }
 /*N*/   }
 /*N*/ }
 
diff --git a/binfilter/bf_sc/source/core/data/sc_global.cxx b/binfilter/bf_sc/source/core/data/sc_global.cxx
index 5ca0675..a580b76 100644
--- a/binfilter/bf_sc/source/core/data/sc_global.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global.cxx
@@ -520,8 +520,6 @@ void global_InitAppOptions();
 /*N*/   DELETEZ(pProtectedBrushItem);
 /*N*/     DELETEZ(pOutlineBitmaps);
 /*N*/     DELETEZ(pOutlineBitmapsHC);
-/*N*/ //    DELETEZ(pAnchorBitmap);
-/*N*/ //    DELETEZ(pGrayAnchorBitmap);
 /*N*/     DELETEZ(pEnglishFormatter);
 /*N*/     DELETEZ(pCaseTransliteration);
 /*N*/     DELETEZ(pTransliteration);
@@ -713,10 +711,9 @@ void global_InitAppOptions();
 /*N*/ }
 
 
-/*N*/ ScFunctionList::ScFunctionList() :
-/*N*/       nMaxFuncNameLen ( 0 )
-/*N*/ {
-/*N*/       DBG_BF_ASSERT(0, "STRIP");
+ScFunctionList::ScFunctionList() :
+    nMaxFuncNameLen ( 0 )
+{
 }
 
 //------------------------------------------------------------------------
@@ -762,10 +759,9 @@ void global_InitAppOptions();
 //========================================================================
 // class ScFunctionMgr:
 
-/*N*/ ScFunctionMgr::~ScFunctionMgr()
-/*N*/ {
-/*?*/   DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
+ScFunctionMgr::~ScFunctionMgr()
+{
+}
 
 /*N*/ String ColToAlpha( const USHORT nCol )
 /*N*/ {
diff --git a/binfilter/bf_sc/source/core/data/sc_global2.cxx b/binfilter/bf_sc/source/core/data/sc_global2.cxx
index 3acea14..a186de3 100644
--- a/binfilter/bf_sc/source/core/data/sc_global2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_global2.cxx
@@ -307,19 +307,6 @@ namespace binfilter {
 
 //------------------------------------------------------------------------
 
-BOOL ScQueryParam::operator==( const ScQueryParam& /*rOther*/ ) const
-{
-    BOOL bEqual = FALSE;
-    // Anzahl der Queries gleich?
-    DBG_BF_ASSERT(0, "STRIP");
-    return bEqual;
-}
-
-//------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
 /*N*/ void ScQueryParam::Resize(USHORT nNew)
 /*N*/ {
 /*N*/   if ( nNew < MAXQUERY )
@@ -700,8 +687,6 @@ BOOL ScQueryParam::operator==( const ScQueryParam& /*rOther*/ ) const
 /*N*/       bMakeTotalRow(r.bMakeTotalRow)
 /*N*/ {
 /*N*/   SetLabelData    ( r.ppLabelArr, r.nLabels );
-/*N*/   SetPivotArrays  ( r.aColArr, r.aRowArr, r.aDataArr,
-/*N*/                     r.nColCount, r.nRowCount, r.nDataCount );
 /*N*/ }
 
 //------------------------------------------------------------------------
@@ -749,18 +734,6 @@ BOOL ScQueryParam::operator==( const ScQueryParam& /*rOther*/ ) const
 
 //------------------------------------------------------------------------
 
-/*N*/ void ScPivotParam::SetPivotArrays ( const PivotField*,
-/*N*/                                             const PivotField*,
-/*N*/                                             const PivotField*,
-/*N*/                                             USHORT,
-/*N*/                                             USHORT,
-/*N*/                                             USHORT )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-//------------------------------------------------------------------------
-
 /*N*/ ScPivotParam& ScPivotParam::operator=( const ScPivotParam& r )
 /*N*/ {
 /*N*/   nCol              = r.nCol;
@@ -772,8 +745,6 @@ DBG_BF_ASSERT(0, "STRIP");
 /*N*/   bMakeTotalRow     = r.bMakeTotalRow;
 /*N*/
 /*N*/   SetLabelData    ( r.ppLabelArr, r.nLabels );
-/*N*/   SetPivotArrays  ( r.aColArr, r.aRowArr, r.aDataArr,
-/*N*/                     r.nColCount, r.nRowCount, r.nDataCount );
 /*N*/
 /*N*/   return *this;
 /*N*/ }
@@ -808,13 +779,6 @@ DBG_BF_ASSERT(0, "STRIP");
 /*N*/ }
 
 //------------------------------------------------------------------------
-
-
-//------------------------------------------------------------------------
-
-
-
-//------------------------------------------------------------------------
 // struct ScTabOpParam
 
 /*N*/ ScTabOpParam::ScTabOpParam( const ScTabOpParam& r )
@@ -860,11 +824,7 @@ DBG_BF_ASSERT(0, "STRIP");
 /*N*/ void ScPostIt::AutoSetText( const String& rNewText )
 /*N*/ {
 /*N*/   aStrText   = rNewText;
-/*N*/     aStrDate   = ScGlobal::pLocaleData->getDate( Date() );
-/*N*/
-/*N*/   //  Der Einheitlichkeit halber das Datum immer ohne Uhrzeit (wie im Writer)
-/*N*/ //    aStrDate  += ", ";
-/*N*/ //  aStrDate  += ScGlobal::pLocaleData->getTime( Time() );
+/*N*/   aStrDate   = ScGlobal::pLocaleData->getDate( Date() );
 /*N*/
 /*N*/   SvtUserOptions aUserOpt;
 /*N*/   aStrAuthor = aUserOpt.GetID();
@@ -1265,7 +1225,6 @@ DBG_BF_ASSERT(0, "STRIP");
 /*?*/           r = ScGlobal::GetRscString( STR_NOREF_STR );
 /*?*/           return;
 /*N*/       }
-/*N*/ //        if( nFlags & ( SCA_TAB_ABSOLUTE | SCA_TAB_3D ) )
 /*N*/       if( nFlags & SCA_TAB_3D )
 /*N*/       {
 /*N*/           String aTabName;
diff --git a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
index 71f999d..0e62b52 100644
--- a/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_olinetab.cxx
@@ -435,11 +435,7 @@ namespace binfilter {
 /*?*/                   if ( ( pHiddenFlags[i] & CR_HIDDEN ) == 0 )
 /*?*/                       bAllHidden = FALSE;
 /*?*/
-/*?*/               BOOL bToggle = ( bShow != bAllHidden );
-/*?*/               if ( bToggle )
-/*?*/               {
-/*?*/                   DBG_BF_ASSERT(0, "STRIP");
-/*?*/               }
+/*?*/               DBG_BF_ASSERT(0, "STRIP");
 /*?*/           }
 /*N*/       }
 /*N*/   }
diff --git a/binfilter/bf_sc/source/core/data/sc_pivot.cxx b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
index 3a26afe..7917a8d 100644
--- a/binfilter/bf_sc/source/core/data/sc_pivot.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_pivot.cxx
@@ -911,10 +911,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
 /*N*/   for (nRow = nSrcRow1 + nHeader; nRow <= nSrcRow2; nRow++)
 /*N*/   {
 /*N*/       BOOL bValidLine = TRUE;
-/*N*/       if (bIgnoreEmpty)
-/*N*/       {
-/*?*/           DBG_BF_ASSERT(0, "STRIP");
-/*N*/       }
 /*N*/       if (bValidLine)
 /*N*/           bValidLine = pDoc->pTab[nSrcTab]->ValidQuery(nRow, aQuery);
 /*N*/       if (bValidLine)
@@ -976,10 +972,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
 /*N*/   for (USHORT nRow = nSrcRow1 + nHeader; nRow <= nSrcRow2; nRow++)
 /*N*/   {
 /*N*/       BOOL bValidLine = TRUE;
-/*N*/       if (bIgnoreEmpty)
-/*N*/       {
-/*?*/           DBG_BF_ASSERT(0, "STRIP");
-/*N*/       }
 /*N*/       if (bValidLine)
 /*N*/           bValidLine = pDoc->pTab[nSrcTab]->ValidQuery(nRow, aQuery);
 /*N*/       if (bValidLine)
@@ -1060,8 +1052,6 @@ static const USHORT nFuncMaskArr[PIVOT_MAXFUNC+1] =
 /*N*/                           double nVal = pDoc->GetValue( aAdr );
 /*N*/                           ppDataArr[nRIndex][nCIndex].Update(nVal);
 /*N*/                       }
-/*N*/                       else
-/*?*/                       {DBG_BF_ASSERT(0, "STRIP");}
 /*N*/                   }
 /*N*/               }
 /*N*/           }
diff --git a/binfilter/bf_sc/source/core/data/sc_pivot2.cxx b/binfilter/bf_sc/source/core/data/sc_pivot2.cxx
index da1b8c4..03ac05d 100644
--- a/binfilter/bf_sc/source/core/data/sc_pivot2.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_pivot2.cxx
@@ -149,11 +149,9 @@ namespace binfilter {
 /*N*/   {
 /*N*/       // Strings vergleichen:
 /*N*/
-/*N*/       if (pUserData)
-/*?*/       {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/       else
+/*N*/       if ( !pUserData )
 /*N*/       {
-/*N*/             nResult = (short) ScGlobal::pTransliteration->compareString(
+/*N*/           nResult = (short) ScGlobal::pTransliteration->compareString(
 /*N*/               rData1.aStrValue, rData2.aStrValue );
 /*N*/       }
 /*N*/   }
diff --git a/binfilter/bf_sc/source/core/data/sc_table1.cxx b/binfilter/bf_sc/source/core/data/sc_table1.cxx
index 461a85d..54fbc83 100644
--- a/binfilter/bf_sc/source/core/data/sc_table1.cxx
+++ b/binfilter/bf_sc/source/core/data/sc_table1.cxx
@@ -182,17 +182,6 @@ extern BOOL bIsOlk, bOderSo;
 
 /*N*/ ScTable::~ScTable()
 /*N*/ {
-/*N*/   if (!pDocument->IsInDtorClear())
-/*N*/   {
-/*?*/       //  nicht im dtor die Pages in der falschen Reihenfolge loeschen
-/*?*/       //  (nTab stimmt dann als Page-Number nicht!)
-/*?*/       //  In ScDocument::Clear wird hinterher per Clear am DrawLayer alles geloescht.
-/*?*/
-/*?*/       ScDrawLayer* pDrawLayer = pDocument->GetDrawLayer();
-/*?*/       if (pDrawLayer)
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/   }
-/*N*/
 /*N*/   delete[] pColWidth;
 /*N*/   delete[] pRowHeight;
 /*N*/   delete[] pColFlags;
@@ -214,9 +203,6 @@ DBG_BF_ASSERT(0, "STRIP");
 
 /*N*/ void ScTable::SetName( const String& rNewName )
 /*N*/ {
-/*N*/   String aMd( "D\344umling", RTL_TEXTENCODING_MS_1252 );  // ANSI
-/*N*/   if( rNewName == aMd )
-/*?*/       {DBG_BF_ASSERT(0, "STRIP");}
 /*N*/   aName = rNewName;
 /*N*/ }
 
@@ -474,18 +460,6 @@ DBG_BF_ASSERT(0, "STRIP");
 /*N*/   return bFound;
 /*N*/ }
 
-/*N*/ void ScTable::GetDataArea( USHORT&, USHORT&, USHORT&, USHORT&,
-/*N*/                           BOOL )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
-/*N*/ void ScTable::GetNextPos( USHORT&, USHORT&, short, short,
-/*N*/                               BOOL, BOOL, const ScMarkData& )
-/*N*/ {
-DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
 /*N*/ BOOL ScTable::GetNextMarkedCell( USHORT& rCol, USHORT& rRow, const ScMarkData& rMark )
 /*N*/ {
 /*N*/   const ScMarkArray* pMarkArray = rMark.GetArray();
diff --git a/binfilter/inc/bf_sc/dpshttab.hxx b/binfilter/inc/bf_sc/dpshttab.hxx
index f10591c..7dc5724 100644
--- a/binfilter/inc/bf_sc/dpshttab.hxx
+++ b/binfilter/inc/bf_sc/dpshttab.hxx
@@ -46,10 +46,6 @@ struct ScSheetSourceDesc
 {
     ScRange         aSourceRange;
     ScQueryParam    aQueryParam;
-
-    BOOL operator== ( const ScSheetSourceDesc& rOther ) const
-        { return aSourceRange == rOther.aSourceRange &&
-                 aQueryParam  == rOther.aQueryParam; }
 };
 
  class ScSheetDPData_Impl;
diff --git a/binfilter/inc/bf_sc/global.hxx b/binfilter/inc/bf_sc/global.hxx
index 33ff4ae..f666f43 100644
--- a/binfilter/inc/bf_sc/global.hxx
+++ b/binfilter/inc/bf_sc/global.hxx
@@ -1371,10 +1371,9 @@ public:
     void            Resize(USHORT nNew);
 
     ScQueryParam&   operator=   ( const ScQueryParam& r );
-    BOOL            operator==  ( const ScQueryParam& rOther ) const;
     void            Clear       ();
 
-     void           FillInExcelSyntax(String& aCellStr, USHORT nIndex);
+    void            FillInExcelSyntax(String& aCellStr, USHORT nIndex);
 
     void            Load(SvStream& rStream);
     void Store(SvStream&) const {}
@@ -1497,12 +1496,6 @@ struct ScPivotParam
     void            ClearLabelData  ();
     void            SetLabelData    ( LabelData**   ppLabArr,
                                       USHORT        nLab );
-    void            SetPivotArrays  ( const PivotField* pColArr,
-                                      const PivotField* pRowArr,
-                                      const PivotField* pDataArr,
-                                      USHORT            nColCnt,
-                                      USHORT            nRowCnt,
-                                      USHORT            nDataCnt );
 };
 
 
diff --git a/binfilter/inc/bf_sc/table.hxx b/binfilter/inc/bf_sc/table.hxx
index c7e97b8..bccad31 100644
--- a/binfilter/inc/bf_sc/table.hxx
+++ b/binfilter/inc/bf_sc/table.hxx
@@ -280,14 +280,6 @@ public:
     void        ExtendPrintArea( OutputDevice* pDev,
                         USHORT nStartCol, USHORT nStartRow, USHORT& rEndCol, USHORT nEndRow );
 
-    void        GetDataArea( USHORT& rStartCol, USHORT& rStartRow, USHORT& rEndCol, USHORT& rEndRow,
-                                BOOL bIncludeOld );
-
-
-    void        GetNextPos( USHORT& rCol, USHORT& rRow, short nMovX, short nMovY,
-                                BOOL bMarked, BOOL bUnprotected, const ScMarkData& rMark );
-
-
     BOOL        HasData( USHORT nCol, USHORT nRow );
     BOOL        HasStringData( USHORT nCol, USHORT nRow );
     BOOL        HasValueData( USHORT nCol, USHORT nRow );


More information about the Libreoffice-commits mailing list