diff options
| -rw-r--r-- | extensions/source/bibliography/general.cxx | 4 | ||||
| -rw-r--r-- | xmlsecurity/source/framework/buffernode.cxx | 8 | ||||
| -rw-r--r-- | xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 65dafe55b28e..8576bce5d440 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -846,7 +846,7 @@ sal_Bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent ) if( pWindow->HasChildPathFocus() ) { // save focused control DBG_ASSERT( nFocused == 0xFFFF, "+BibGeneralPage::HandleShortCutKey(): more than one with focus?!" ); - DBG_ASSERT( !aMatchList.empty(), "+BibGeneralPage::HandleShortCutKey(): push_back and no content?!" ); + DBG_ASSERT( aMatchList.size() > 0, "+BibGeneralPage::HandleShortCutKey(): push_back and no content?!" ); nFocused = aMatchList.size() - 1; } } @@ -856,7 +856,7 @@ sal_Bool BibGeneralPage::HandleShortCutKey( const KeyEvent& rKeyEvent ) if( bHandled ) { - DBG_ASSERT( !aMatchList.empty(), "*BibGeneralPage::HandleShortCutKey(): be prepared to crash..." ); + DBG_ASSERT( aMatchList.size() > 0, "*BibGeneralPage::HandleShortCutKey(): be prepared to crash..." ); if( nFocused >= ( aMatchList.size() - 1 ) ) // >=... includes 0xFFFF diff --git a/xmlsecurity/source/framework/buffernode.cxx b/xmlsecurity/source/framework/buffernode.cxx index a6de3ca2d182..a7c0a24f33df 100644 --- a/xmlsecurity/source/framework/buffernode.cxx +++ b/xmlsecurity/source/framework/buffernode.cxx @@ -317,7 +317,7 @@ bool BufferNode::hasAnything() const * Email: michael.mi@sun.com ******************************************************************************/ { - return (m_pBlocker != NULL || !m_vElementCollectors.empty()); + return (m_pBlocker != NULL || m_vElementCollectors.size() > 0); } bool BufferNode::hasChildren() const @@ -344,7 +344,7 @@ bool BufferNode::hasChildren() const * Email: michael.mi@sun.com ******************************************************************************/ { - return (!m_vChildren.empty()); + return (m_vChildren.size() > 0); } std::vector< const BufferNode* >* BufferNode::getChildren() const @@ -378,7 +378,7 @@ const BufferNode* BufferNode::getFirstChild() const { BufferNode* rc = NULL; - if (!m_vChildren.empty()) + if (m_vChildren.size() > 0) { rc = (BufferNode*)m_vChildren.front(); } @@ -853,7 +853,7 @@ void BufferNode::elementCollectorNotify() * Email: michael.mi@sun.com ******************************************************************************/ { - if (!m_vElementCollectors.empty()) + if (m_vElementCollectors.size()>0) { cssxc::sax::ElementMarkPriority nMaxPriority = cssxc::sax::ElementMarkPriority_MINIMUM; cssxc::sax::ElementMarkPriority nPriority; diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx index 015f802b0d6e..c416d383e591 100644 --- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx +++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx @@ -161,7 +161,7 @@ BufferNode* SAXEventKeeperImpl::addNewElementMarkBuffers() { BufferNode* pBufferNode = NULL; - if ( (!m_vNewElementCollectors.empty()) || + if ( (m_vNewElementCollectors.size()>0) || (m_pNewBlocker != NULL)) { /* @@ -202,7 +202,7 @@ BufferNode* SAXEventKeeperImpl::addNewElementMarkBuffers() m_pNewBlocker = NULL; } - if (!m_vNewElementCollectors.empty()) + if (m_vNewElementCollectors.size()>0) { std::vector< const ElementCollector* >::const_iterator ii = m_vNewElementCollectors.begin(); @@ -713,7 +713,7 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer() ******************************************************************************/ { m_bIsReleasing = true; - while (!m_vReleasedElementMarkBuffers.empty()) + while (m_vReleasedElementMarkBuffers.size()>0) { std::vector< sal_Int32 >::iterator pId = m_vReleasedElementMarkBuffers.begin(); sal_Int32 nId = *pId; |