summaryrefslogtreecommitdiff
path: root/autodoc
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-12-11 07:05:03 +0000
committerRüdiger Timm <rt@openoffice.org>2008-12-11 07:05:03 +0000
commitc6a3645a0e8d054e8d8dc012710edf892d1cb696 (patch)
tree44f82dfcb58718c3bc9ab93b2d7b0a1c55d44c1a /autodoc
parent2aef3f79ebc34107a7dd5c9f40af4bf0f1140d73 (diff)
CWS-TOOLING: integrate CWS cmcfixes51
2008-12-08 10:12:55 +0100 cmc r264975 : #i96203# protect with ifdefs to avoid unused symbol on mac 2008-12-05 12:23:47 +0100 cmc r264898 : CWS-TOOLING: rebase CWS cmcfixes51 to trunk@264807 (milestone: DEV300:m37) 2008-12-01 14:45:17 +0100 cmc r264606 : #i76655# ehlos apparently required 2008-11-28 17:49:30 +0100 cmc r264567 : #i96655# remove newly unused method 2008-11-28 10:41:28 +0100 cmc r264531 : #i96647# better ppc-bridges flushCode impl 2008-11-27 12:58:40 +0100 cmc r264478 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 12:32:49 +0100 cmc r264476 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 12:26:02 +0100 cmc r264475 : #i96655# redundant old table export helpers 2008-11-27 11:49:06 +0100 cmc r264473 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 11:38:35 +0100 cmc r264471 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 11:14:21 +0100 cmc r264467 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 11:06:22 +0100 cmc r264464 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 10:58:18 +0100 cmc r264462 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 10:41:44 +0100 cmc r264461 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 10:19:24 +0100 cmc r264460 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 10:13:39 +0100 cmc r264459 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 10:06:14 +0100 cmc r264458 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 09:59:54 +0100 cmc r264457 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 09:52:51 +0100 cmc r264456 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 09:48:26 +0100 cmc r264454 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 09:40:20 +0100 cmc r264452 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 09:35:26 +0100 cmc r264451 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 09:31:00 +0100 cmc r264450 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 09:24:08 +0100 cmc r264449 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 00:26:15 +0100 cmc r264443 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 00:21:01 +0100 cmc r264442 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-27 00:09:40 +0100 cmc r264441 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 23:51:56 +0100 cmc r264440 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 23:49:09 +0100 cmc r264439 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 18:09:54 +0100 cmc r264432 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 18:07:40 +0100 cmc r264431 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 17:28:02 +0100 cmc r264429 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 17:27:39 +0100 cmc r264428 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 17:18:36 +0100 cmc r264426 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 16:22:16 +0100 cmc r264415 : #i96624# make implicit braces and brackets explicit to avoid warnings 2008-11-26 16:00:23 +0100 cmc r264409 : #i90426# remove warnings from svtools 2008-11-26 15:59:17 +0100 cmc r264408 : #i90426# remove warnings 2008-11-26 15:47:32 +0100 cmc r264404 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 14:46:57 +0100 cmc r264394 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 14:19:50 +0100 cmc r264387 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 14:15:26 +0100 cmc r264386 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 14:11:26 +0100 cmc r264384 : #i96084# confirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 13:44:23 +0100 cmc r264380 : #i96084# comfirm existing logic with explicit brackets to remove new gcc warnings 2008-11-26 13:12:24 +0100 cmc r264372 : #i96604# silence new warnings 2008-11-26 12:35:02 +0100 cmc r264369 : #i96203# make qstarter work in 3-layer land 2008-11-26 12:33:04 +0100 cmc r264368 : #i96170# ensure gtypes are up and running
Diffstat (limited to 'autodoc')
-rw-r--r--autodoc/source/ary/cpp/c_funct.cxx2
-rw-r--r--autodoc/source/display/idl/hfi_doc.cxx6
-rw-r--r--autodoc/source/display/idl/hfi_typetext.cxx4
-rw-r--r--autodoc/source/parser_i/idl/pe_evalu.cxx4
4 files changed, 9 insertions, 7 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;