idlc/test/parser/interfaceinheritance.tests | 8 ++++++++ unoidl/source/sourceprovider-parser.y | 1 - 2 files changed, 8 insertions(+), 1 deletion(-)
New commits: commit e14e4f5351cb9a6c3977abf20f9a255d8493dd57 Author: Stephan Bergmann <[email protected]> Date: Tue Nov 26 11:03:41 2013 +0100 Duplicate base checking code already covers check for opt base != XInterface Change-Id: Icd47d87f93641a0b24a96a4be8d3d120f0405f2d diff --git a/idlc/test/parser/interfaceinheritance.tests b/idlc/test/parser/interfaceinheritance.tests index a7b8412..f9cac4c 100644 --- a/idlc/test/parser/interfaceinheritance.tests +++ b/idlc/test/parser/interfaceinheritance.tests @@ -269,3 +269,11 @@ interface Derived { interface Hidden; interface Base; }; + + +EXPECT FAILURE "interfaceinheritance.tests 30": +interface Base {}; +interface Derived { + interface Base; + [optional] interface com::sun::star::uno::XInterface; +}; diff --git a/unoidl/source/sourceprovider-parser.y b/unoidl/source/sourceprovider-parser.y index f7f022f..8e6c0c4 100644 --- a/unoidl/source/sourceprovider-parser.y +++ b/unoidl/source/sourceprovider-parser.y @@ -4113,7 +4113,6 @@ bool SourceProviderInterfaceTypeEntityPad::addDirectBase( addOptionalBaseMembers( location, yyscanner, data, base.name, base.entity); } - //TODO: check that opt base != XInterface (optional ? directOptionalBases : directMandatoryBases).push_back(base); return true; } _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
