diff options
| -rw-r--r-- | autodoc/source/ary/cpp/c_funct.cxx | 2 | ||||
| -rw-r--r-- | autodoc/source/display/idl/hfi_doc.cxx | 6 | ||||
| -rw-r--r-- | autodoc/source/display/idl/hfi_typetext.cxx | 4 | ||||
| -rw-r--r-- | autodoc/source/parser_i/idl/pe_evalu.cxx | 4 | ||||
| -rw-r--r-- | cosv/source/strings/streamstr.cxx | 2 | ||||
| -rw-r--r-- | unodevtools/source/skeletonmaker/skeletoncommon.cxx | 2 |
6 files changed, 12 insertions, 8 deletions
diff --git a/autodoc/source/ary/cpp/c_funct.cxx b/autodoc/source/ary/cpp/c_funct.cxx index ef0259f28f2e..a8ecc903c5e7 100644 --- a/autodoc/source/ary/cpp/c_funct.cxx +++ b/autodoc/source/ary/cpp/c_funct.cxx @@ -147,7 +147,7 @@ Function::IsIdentical( const Function & i_f ) const AND aFlags == i_f.aFlags AND - ( NOT pExceptions AND NOT i_f.pExceptions + ( ( NOT pExceptions AND NOT i_f.pExceptions ) OR ( pExceptions AND i_f.pExceptions ? *pExceptions == *i_f.pExceptions diff --git a/autodoc/source/display/idl/hfi_doc.cxx b/autodoc/source/display/idl/hfi_doc.cxx index 4f4d6f459fde..d5c686d2bbe0 100644 --- a/autodoc/source/display/idl/hfi_doc.cxx +++ b/autodoc/source/display/idl/hfi_doc.cxx @@ -70,8 +70,10 @@ HF_IdlDocu::Produce_byDocuAndScope( const ce_info & i_rDocu, bool bDescr = NOT i_rDocu.Description().IsEmpty(); if ( i_rDocu.IsDeprecated() - OR (i_pClient != 0 ? i_pClient->SightLevel() == ary::idl::sl_File : false) - AND NOT i_rDocu.IsPublished() + OR ( + (i_pClient != 0 ? i_pClient->SightLevel() == ary::idl::sl_File : false) + AND NOT i_rDocu.IsPublished() + ) OR i_rDocu.IsOptional() ) { // any usage restriction rOut.Produce_Term("Usage Restrictions"); diff --git a/autodoc/source/display/idl/hfi_typetext.cxx b/autodoc/source/display/idl/hfi_typetext.cxx index 6548e46536e3..310a1691b315 100644 --- a/autodoc/source/display/idl/hfi_typetext.cxx +++ b/autodoc/source/display/idl/hfi_typetext.cxx @@ -490,9 +490,9 @@ HF_IdlTypeText::produce_IndexLink( const StringVector & i_module, output::Position aTargetPos(rCeNode); bool - bShowModule = i_bIsOwner OR i_module.size() > 0 AND i_ce.empty(); + bShowModule = i_bIsOwner OR (i_module.size() > 0 AND i_ce.empty()); bool - bShowNonModule = NOT bShowModule OR i_bIsOwner AND NOT i_ce.empty(); + bShowNonModule = NOT bShowModule OR (i_bIsOwner AND NOT i_ce.empty()); bool bUseMember = NOT i_member.empty(); diff --git a/autodoc/source/parser_i/idl/pe_evalu.cxx b/autodoc/source/parser_i/idl/pe_evalu.cxx index 1a96a58823e5..623ac93bfd59 100644 --- a/autodoc/source/parser_i/idl/pe_evalu.cxx +++ b/autodoc/source/parser_i/idl/pe_evalu.cxx @@ -129,8 +129,8 @@ PE_Value::On_expect_name_Identifier(const char * i_sText) void PE_Value::On_got_name_Punctuation(const char * i_sText) { - if ( i_sText[0] == ',' AND NOT IsConst() - OR i_sText[0] == ';' AND IsConst() ) + if ( (i_sText[0] == ',' AND NOT IsConst()) + OR (i_sText[0] == ';' AND IsConst()) ) { SetResult(done,pop_success); eState = e_none; diff --git a/cosv/source/strings/streamstr.cxx b/cosv/source/strings/streamstr.cxx index 86c5aa64146e..0c28b7f5aa22 100644 --- a/cosv/source/strings/streamstr.cxx +++ b/cosv/source/strings/streamstr.cxx @@ -555,7 +555,7 @@ StreamStr::operator_read_line( bstream & i_src ) char oldc = c; if (i_src.read(&c, 1) == 1) { - if (c != 13 AND c != 10 OR c == oldc) + if ( (c != 13 AND c != 10) OR c == oldc) i_src.seek(-1,::csv::cur); } } diff --git a/unodevtools/source/skeletonmaker/skeletoncommon.cxx b/unodevtools/source/skeletonmaker/skeletoncommon.cxx index b18a57b4619d..609a9f61dacd 100644 --- a/unodevtools/source/skeletonmaker/skeletoncommon.cxx +++ b/unodevtools/source/skeletonmaker/skeletoncommon.cxx @@ -542,12 +542,14 @@ bool checkAddinType(TypeManager const & manager, if ( !bIsReturn && type.equals("com/sun/star/table/XCellRange") ) return true; if ( !bIsReturn && type.equals("com/sun/star/beans/XPropertySet") ) + { if ( bHasXPropertySet ) { return false; } else { bHasXPropertySet = true; return true; } + } } return false; } |