diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-01-29 10:02:54 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-01-29 10:02:54 +0000 |
| commit | 25dad84813feb405e709c31b180361dc1b7cfaaa (patch) | |
| tree | 764c39b2ec2f74b33e8f50129525f5c24b9f67c0 /xmlhelp/source/cxxhelp/qe | |
| parent | 7deeb2a401b108ac176c4670b6674bfabfcef63c (diff) | |
CWS-TOOLING: integrate CWS cmcfixes52
2009-01-05 10:49:04 +0100 cmc r265860 : #i97763# remove low-hanging warnings
Diffstat (limited to 'xmlhelp/source/cxxhelp/qe')
| -rw-r--r-- | xmlhelp/source/cxxhelp/qe/DocGenerator.cxx | 2 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/qe/Search.cxx | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx index cc44fc1edd9d..b3aea87db3d2 100644 --- a/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx +++ b/xmlhelp/source/cxxhelp/qe/DocGenerator.cxx @@ -473,6 +473,7 @@ bool GeneratorHeap::next( std::vector< RoleFiller* >& array ) throw( xmlsearch:: if( heapSize_ > 0 ) { if( ! heap_[0]->next() ) // no more + { if( heapSize_ > 1) { delete heap_[0]; @@ -484,6 +485,7 @@ bool GeneratorHeap::next( std::vector< RoleFiller* >& array ) throw( xmlsearch:: heapSize_ = 0; return false; } + } heapify(0); heap_[0]->generateFillers( array ); return true; diff --git a/xmlhelp/source/cxxhelp/qe/Search.cxx b/xmlhelp/source/cxxhelp/qe/Search.cxx index b53746bf1916..493205661d64 100644 --- a/xmlhelp/source/cxxhelp/qe/Search.cxx +++ b/xmlhelp/source/cxxhelp/qe/Search.cxx @@ -347,6 +347,7 @@ void Search::startSearch() for (j = i + 1; j < free2_; j++ ) { if( conceptData_[j].is() ) + { if( conceptData_[i]->cEquals( conceptData_[j].get() ) ) { conceptData_[i]->addLast( conceptData_[j].get() ); @@ -354,6 +355,7 @@ void Search::startSearch() } else i = j; + } } } |