diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-11-10 15:06:12 +0000 |
commit | 99aef3d8e977dbcb1853575b15bfaf980ae8fed9 (patch) | |
tree | 5a1f66da7920a7e705bd382b239111bfdfa3fc65 /idlc/source/astinterface.cxx | |
parent | 2c0e1d0cd8623e7dd612869da87274fdfe50d852 (diff) |
CWS-TOOLING: integrate CWS cmcfixes50
2008-11-10 13:31:50 +0100 cmc r263517 : gio doesn't do anything useful for remote stuff wrt info
2008-11-06 00:11:47 +0100 cmc r263359 : #i93436# pile of other 64bit new gcc warnings
2008-11-05 00:39:03 +0100 cmc r263340 : i95856 let a ppc64 vanilla build succeed
2008-11-04 14:00:25 +0100 cmc r263320 : #i93436# useless const
2008-11-04 11:53:10 +0100 cmc r263314 : #i93436# ambiguous
2008-11-04 11:48:05 +0100 cmc r263313 : #i93436# add some braces
2008-11-04 11:29:24 +0100 cmc r263312 : #i93436# ambiguous
2008-11-04 10:53:46 +0100 cmc r263311 :
Diffstat (limited to 'idlc/source/astinterface.cxx')
-rw-r--r-- | idlc/source/astinterface.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx index 4a368a8e3408..ebd254bc613f 100644 --- a/idlc/source/astinterface.cxx +++ b/idlc/source/astinterface.cxx @@ -304,7 +304,7 @@ void AstInterface::checkInheritedInterfaceClashes( return; case INTERFACE_DIRECT_MANDATORY: - if (direct || !optional && !mainOptional) { + if (direct || (!optional && !mainOptional)) { doubleDeclarations.interfaces.push_back(ifc); } return; |