diff options
Diffstat (limited to 'xmlhelp/source/cxxhelp/inc')
| -rw-r--r-- | xmlhelp/source/cxxhelp/inc/db/Block.hxx | 8 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx | 6 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx | 4 | ||||
| -rw-r--r-- | xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/xmlhelp/source/cxxhelp/inc/db/Block.hxx b/xmlhelp/source/cxxhelp/inc/db/Block.hxx index 7b3446d4b515..ee57708bf2fe 100644 --- a/xmlhelp/source/cxxhelp/inc/db/Block.hxx +++ b/xmlhelp/source/cxxhelp/inc/db/Block.hxx @@ -99,10 +99,10 @@ namespace xmlsearch { inline sal_Int32 getInteger_( const sal_Int8* v ) { - return (((((( v[0]&0xFF ) << 8 ) - | v[1]&0xFF ) << 8 ) - | v[2]&0xFF ) << 8 ) - | v[3]&0xFF; + return (((((( (v[0]&0xFF) ) << 8 ) + | (v[1]&0xFF) ) << 8 ) + | (v[2]&0xFF) ) << 8 ) + | (v[3]&0xFF); } diff --git a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx b/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx index 2c0a25892f61..52e8e1560102 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/ConceptData.hxx @@ -67,9 +67,9 @@ namespace xmlsearch { bool crEquals( ConceptData* r ) { return cEquals( r ) && role_ == r->role_; } bool crqEquals( ConceptData* r ) { return crEquals( r ) && queryNo_ == r->queryNo_; } bool compareWith( ConceptData* r ) { return - concept_ < r->concept_ || - cEquals( r ) && role_ < r->role_ || - crEquals( r ) && penalty_ < r->penalty_; } + (concept_ < r->concept_) || + (cEquals( r ) && role_ < r->role_) || + (crEquals( r ) && penalty_ < r->penalty_); } void addLast( ConceptData* r ); diff --git a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx index 99bc46584e52..27e545af06cf 100644 --- a/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx +++ b/xmlhelp/source/cxxhelp/inc/qe/DocGenerator.hxx @@ -93,9 +93,9 @@ namespace xmlsearch { bool smallerThan( NextDocGenerator* other ) { return - document_ < other->document_ + (document_ < other->document_) || - document_ == other->document_ && concept_ < other->concept_; + (document_ == other->document_ && concept_ < other->concept_); } diff --git a/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx b/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx index 0ebb01e16f8f..edae2cb85724 100644 --- a/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx +++ b/xmlhelp/source/cxxhelp/inc/util/IndexAccessor.hxx @@ -52,10 +52,12 @@ namespace xmlsearch { IndexAccessor( const rtl::OUString& dirName ) { if( dirName.getLength() ) + { if( dirName.getStr()[dirName.getLength()-1] != sal_Unicode( '/' ) ) dirName_ = ( dirName + rtl::OUString::createFromAscii( "/" ) ) ; else dirName_ = dirName; + } } |