mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#91794 remove OSL_DEBUG_LEVEL > 1 conditionals

Browse Source 
I removed OSL_DEBUG_LEVEL > 1 conditionals and in some
places i replaced OSL_ENSURE(..) with assert()

Change-Id: Ide7e4b633e85a699f680f47caac5bff36bf180a2
Reviewed-on: https://gerrit.libreoffice.org/23076
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
This commit is contained in:
Rohan Kumar
2016-03-09 18:41:20 +05:30
committed by Björn Michaelsen
parent 8dd5dbbb6e
commit b430ec96e3
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forms/source/xforms/model.cxx
View File

@@ -73,7 +73,7 @@ using namespace com::sun::star::xml::dom;
using namespace xforms;
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
#define DBG_INVARIANT_TYPE(TYPE) class DBG_##TYPE { const TYPE* mpT; void check() { mpT->dbg_assertInvariant(); } public: DBG_##TYPE(const TYPE* pT) : mpT(pT) { check(); } ~DBG_##TYPE() { check(); } } _DBG_##TYPE(this);
#define DBG_INVARIANT() DBG_INVARIANT_TYPE(Model)
@@ -197,17 +197,17 @@ void Model::setExternalData( bool _bData )
mbExternalData = _bData;
}
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
void Model::dbg_assertInvariant() const
{
OSL_ENSURE( mpInstances != NULL, "no instances found" );
OSL_ENSURE( mxInstances.is(), "No instance container!" );
assert(mpInstances && "no instances found");
assert(mxInstances.is() && "No instance container!");
OSL_ENSURE( mpBindings != NULL, "no bindings element" );
OSL_ENSURE( mxBindings.is(), "No Bindings container" );
assert(mpBindings && "no bindings element");
assert(mxBindings.is() && "No Bindings container");
OSL_ENSURE( mpSubmissions != NULL, "no submissions element" );
OSL_ENSURE( mxSubmissions.is(), "No Submission container" );
assert(mpSubmissions && "no submissions element");
assert(mxSubmissions.is() && "No Submission container");
}
#endif

2
forms/source/xforms/model.hxx
View File

@@ -145,7 +145,7 @@ public:
void setExternalData( bool _bData );
#if OSL_DEBUG_LEVEL > 1
#if OSL_DEBUG_LEVEL > 0
void dbg_assertInvariant() const;
#endif