[Libreoffice-commits] .: binfilter/bf_sc binfilter/inc
Joseph Powers
jpowers at kemper.freedesktop.org
Mon Oct 3 05:24:20 PDT 2011
binfilter/bf_sc/source/core/tool/sc_addincol.cxx | 19 ++++++++++---------
binfilter/bf_sc/source/core/tool/sc_adiasync.cxx | 6 ------
binfilter/bf_sc/source/core/tool/sc_appoptio.cxx | 12 ++++++------
binfilter/bf_sc/source/core/tool/sc_autoform.cxx | 6 ------
binfilter/bf_sc/source/core/tool/sc_callform.cxx | 8 +-------
binfilter/bf_sc/source/core/tool/sc_cellform.cxx | 4 ----
binfilter/bf_sc/source/core/tool/sc_chartarr.cxx | 1 -
binfilter/inc/bf_sc/autoform.hxx | 3 +--
binfilter/inc/bf_sc/callform.hxx | 2 +-
9 files changed, 19 insertions(+), 42 deletions(-)
New commits:
commit 2d753aa71dd62e9542c5f675464ed127aa6564ca
Author: Joseph Powers <jpowers27 at cox.net>
Date: Mon Oct 3 05:21:24 2011 -0700
More DBG_BF_ASSERT cleanup in bf_sc
diff --git a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
index 970e5c2..0fbac52 100644
--- a/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_addincol.cxx
@@ -695,20 +695,21 @@ public:
/*N*/ const ScAddInArgDesc* pArgs = pFuncData->GetArguments();
/*N*/
/*N*/ // is aVarArg sequence needed?
-/*N*/ if ( nParamCount >= nDescCount && nDescCount > 0 &&
-/*N*/ pArgs[nDescCount-1].eType == SC_ADDINARG_VARARGS )
-/*N*/ {
-/*?*/ {DBG_BF_ASSERT(0, "STRIP");}
-/*N*/ }
-/*N*/ else if ( nParamCount <= nDescCount )
-/*N*/ {
+/*N*/ if ( !( nParamCount >= nDescCount
+ && nDescCount > 0
+ && pArgs[nDescCount-1].eType == SC_ADDINARG_VARARGS
+ )
+ )
+ {
+/*N*/ if ( nParamCount <= nDescCount )
+/*N*/ {
/*N*/ // all args behind nParamCount must be optional
/*N*/ bValidCount = TRUE;
/*N*/ for (long i=nParamCount; i<nDescCount; i++)
/*?*/ if ( !pArgs[i].bOptional )
/*?*/ bValidCount = FALSE;
-/*N*/ }
-/*N*/ // else invalid (too many arguments)
+/*N*/ }
+ }
/*N*/
/*N*/ if ( bValidCount )
/*N*/ aArgs.realloc( nDescCount ); // sequence must always match function signature
diff --git a/binfilter/bf_sc/source/core/tool/sc_adiasync.cxx b/binfilter/bf_sc/source/core/tool/sc_adiasync.cxx
index 49081f9..41d20ff 100644
--- a/binfilter/bf_sc/source/core/tool/sc_adiasync.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_adiasync.cxx
@@ -88,12 +88,6 @@ static ScAddInAsync aSeekObj;
/*N*/ ScAddInAsync::~ScAddInAsync()
/*N*/ {
-/*N*/ // aSeekObj hat das alles nicht, Handle 0 gibt es sonst nicht
-/*N*/ if ( nHandle )
-/*N*/ {
-/*?*/ // im dTor wg. theAddInAsyncTbl.DeleteAndDestroy in ScGlobal::Clear
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx b/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
index 5bc963b..e69691b 100644
--- a/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_appoptio.cxx
@@ -632,37 +632,37 @@ using ::rtl::OUString;
/*N*/ IMPL_LINK( ScAppCfg, LayoutCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
/*N*/ IMPL_LINK( ScAppCfg, InputCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
/*N*/ IMPL_LINK( ScAppCfg, RevisionCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
/*N*/ IMPL_LINK( ScAppCfg, ContentCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
/*N*/ IMPL_LINK( ScAppCfg, SortListCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
/*N*/ IMPL_LINK( ScAppCfg, MiscCommitHdl, void *, EMPTYARG )
/*N*/ {
- DBG_BF_ASSERT(0, "STRIP");
+ DBG_BF_ASSERT(0, "STRIP"); // IMPL_LINK
/*N*/ return 0;
/*N*/ }
diff --git a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
index eefc534..52d161c 100644
--- a/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_autoform.cxx
@@ -219,11 +219,6 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ {
/*N*/ }
-/*N*/ void ScAutoFormatDataField::SetAdjust( const SvxAdjustItem& /*rAdjust*/ )
-/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
-
/*N*/ #define READ( aItem, ItemType, nVers ) \
/*N*/ pNew = aItem.Create( rStream, nVers ); \
/*N*/ aItem = *(ItemType*)pNew; \
@@ -258,7 +253,6 @@ const USHORT AUTOFORMAT_OLD_ID_NEW = 4203;
/*N*/ READ( aBackground, SvxBrushItem, rVersions.nBrushVersion)
/*N*/
/*N*/ pNew = aAdjust.Create( rStream, rVersions.nAdjustVersion );
-/*N*/ SetAdjust( *(SvxAdjustItem*)pNew );
/*N*/ delete pNew;
/*N*/
/*N*/ READ( aHorJustify, SvxHorJustifyItem, rVersions.nHorJustifyVersion)
diff --git a/binfilter/bf_sc/source/core/tool/sc_callform.cxx b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
index 9956d93..775bb06 100644
--- a/binfilter/bf_sc/source/core/tool/sc_callform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_callform.cxx
@@ -116,11 +116,6 @@ typedef void (CALLTYPE* FARPROC) ( void );
/*N*/ }
-/*N*/ short FuncCollection::Compare(DataObject*, DataObject*) const
-/*N*/ {
- DBG_BF_ASSERT(0, "STRIP"); return 0;
-/*N*/ }
-
/*N*/ BOOL FuncCollection::SearchFunc( const String& rName, USHORT& rIndex ) const
/*N*/ {
/*N*/ FuncData aDataObj(rName);
@@ -151,7 +146,7 @@ public:
/*N*/
/*N*/ virtual DataObject* Clone() const { return new ModuleCollection(*this); }
/*N*/ ModuleData* operator[]( const USHORT nIndex) const {return (ModuleData*)At(nIndex);}
- virtual short Compare(DataObject*, DataObject*) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}
+ virtual short Compare(DataObject*, DataObject*) const { return 0; } // DBG_BF_ASSERT
/*N*/ };
/*N*/ #ifdef _MSC_VER
@@ -175,7 +170,6 @@ public:
/*N*/ }
/*N*/ }
-
/*N*/ BOOL FuncData::Call(void** ppParam)
/*N*/ {
/*N*/ BOOL bRet = FALSE;
diff --git a/binfilter/bf_sc/source/core/tool/sc_cellform.cxx b/binfilter/bf_sc/source/core/tool/sc_cellform.cxx
index 064836d..3a49bfc 100644
--- a/binfilter/bf_sc/source/core/tool/sc_cellform.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_cellform.cxx
@@ -123,10 +123,6 @@ const ScFormulaCell* pLastFormulaTreeTop = 0;
/*N*/ else
/*N*/ {
/*N*/ USHORT nErrCode = pFCell->GetErrCode();
-/*N*/ if ( nErrCode == errInterpOverflow )
-/*N*/ { // maxrecursion ausbuegeln, Err527 Workaround
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
-/*N*/ }
/*N*/
/*N*/ // erst nach dem Interpretieren (GetErrCode) das Zahlformat holen:
/*N*/ if ( (nFormat % SV_COUNTRY_LANGUAGE_OFFSET) == 0 )
diff --git a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
index d19b646..5fd5b72 100644
--- a/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
+++ b/binfilter/bf_sc/source/core/tool/sc_chartarr.cxx
@@ -85,7 +85,6 @@ namespace binfilter {
/*N*/ bDummyUpperLeft( FALSE ),
/*N*/ bValid( TRUE )
/*N*/ {
-/*?*/ DBG_BF_ASSERT(0, "STRIP");
/*N*/ }
/*N*/
/*N*/ ScChartArray::ScChartArray( const ScChartArray& rArr ) : DataObject(rArr),
diff --git a/binfilter/inc/bf_sc/autoform.hxx b/binfilter/inc/bf_sc/autoform.hxx
index d6a19eb..367a2d1 100644
--- a/binfilter/inc/bf_sc/autoform.hxx
+++ b/binfilter/inc/bf_sc/autoform.hxx
@@ -177,7 +177,6 @@ public:
void SetMargin( const SvxMarginItem& rMargin ) { aMargin = rMargin; }
void SetBox( const SvxBoxItem& rBox ) { aBox = rBox; }
void SetBackground( const SvxBrushItem& rBackground ) { aBackground = rBackground; }
- void SetAdjust( const SvxAdjustItem& rAdjust );
void SetRotateAngle( const SfxInt32Item& rRotateAngle ) { aRotateAngle.SetValue( rRotateAngle.GetValue() ); }
void SetRotateMode( const SvxRotateModeItem& rRotateMode ) { aRotateMode.SetValue( rRotateMode.GetValue() ); }
@@ -255,7 +254,7 @@ public:
virtual ~ScAutoFormat();
virtual DataObject* Clone() const { return new ScAutoFormat( *this ); }
ScAutoFormatData* operator[]( const USHORT nIndex ) const {return (ScAutoFormatData*)At( nIndex );}
- virtual short Compare( DataObject* /*pKey1*/, DataObject* /*pKey2*/ ) const{DBG_BF_ASSERT(0, "STRIP"); return 0;}
+ virtual short Compare( DataObject* /*pKey1*/, DataObject* /*pKey2*/ ) const { return 0; } // DBG_BF_ASSERT
BOOL Load();
BOOL Save() {return false;}
void SetSaveLater( BOOL bSet );
diff --git a/binfilter/inc/bf_sc/callform.hxx b/binfilter/inc/bf_sc/callform.hxx
index f76d4f8..388e09f 100644
--- a/binfilter/inc/bf_sc/callform.hxx
+++ b/binfilter/inc/bf_sc/callform.hxx
@@ -106,7 +106,7 @@ public:
FuncCollection(const FuncCollection& rFuncCollection) : SortedCollection ( rFuncCollection ) {}
virtual DataObject* Clone() const { return new FuncCollection(*this); }
- virtual short Compare(DataObject* pKey1, DataObject* pKey2) const;
+ virtual short Compare(DataObject*, DataObject* ) const { return 0; } // DBG_BF_ASSERT
BOOL SearchFunc( const String& rName, USHORT& rIndex ) const;
};
More information about the Libreoffice-commits
mailing list