diff options
| -rw-r--r-- | basic/source/runtime/stdobj1.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/commontools/TSortIndex.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/commontools/predicateinput.cxx | 4 | ||||
| -rw-r--r-- | include/sfx2/shell.hxx | 2 |
4 files changed, 6 insertions, 8 deletions
diff --git a/basic/source/runtime/stdobj1.cxx b/basic/source/runtime/stdobj1.cxx index 24b04742d10c..061aa646f038 100644 --- a/basic/source/runtime/stdobj1.cxx +++ b/basic/source/runtime/stdobj1.cxx @@ -250,7 +250,7 @@ SbStdFont::SbStdFont() : // handle name property yourself p = Find( OUString("Name"), SbxCLASS_PROPERTY ); - DBG_ASSERT( p, "No Name Property" ); + assert(p && "No Name Property"); p->SetUserData( ATTR_IMP_NAME ); } @@ -399,7 +399,7 @@ SbStdClipboard::SbStdClipboard() : SbxObject( OUString("Clipboard") ) { SbxVariable* p = Find( OUString("Name"), SbxCLASS_PROPERTY ); - DBG_ASSERT( p, "No Name Property" ); + assert(p && "No Name Property"); p->SetUserData( ATTR_IMP_NAME ); // register methods diff --git a/connectivity/source/commontools/TSortIndex.cxx b/connectivity/source/commontools/TSortIndex.cxx index 4cae6249981e..0d0e97a40d10 100644 --- a/connectivity/source/commontools/TSortIndex.cxx +++ b/connectivity/source/commontools/TSortIndex.cxx @@ -105,7 +105,7 @@ OSortIndex::~OSortIndex() void OSortIndex::AddKeyValue(OKeyValue * pKeyValue) { - OSL_ENSURE(pKeyValue,"Can not be null here!"); + assert(pKeyValue && "Can not be null here!"); if(m_bFrozen) { m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),(OKeyValue *)NULL)); @@ -115,8 +115,6 @@ void OSortIndex::AddKeyValue(OKeyValue * pKeyValue) m_aKeyValues.push_back(TIntValuePairVector::value_type(pKeyValue->getValue(),pKeyValue)); } - - void OSortIndex::Freeze() { OSL_ENSURE(! m_bFrozen,"OSortIndex::Freeze: already frozen!"); diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 41cf0b3ae581..9f9cbeedd1de 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -408,10 +408,10 @@ namespace dbtools } else { - if ( pParseNode->count() >= 3 ) + if (pParseNode->count() >= 3) { OSQLParseNode* pValueNode = pParseNode->getChild(2); - OSL_ENSURE( pValueNode, "OPredicateInputController::getPredicateValue: invalid node child!" ); + assert(pValueNode && "OPredicateInputController::getPredicateValue: invalid node child!"); if ( !_bForStatementUse ) { if ( SQL_NODE_STRING == pValueNode->getNodeType() ) diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 7047e4dccf46..7d877d8a567f 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -273,7 +273,7 @@ SfxItemPool& SfxShell::GetPool() const */ { - DBG_ASSERT( pPool, "no pool" ); + assert(pPool && "no pool"); return *pPool; } |