Kaydet (Commit) 9c9cad9f authored tarafından David Tardon's avatar David Tardon

ignore type parameters when processing dependencies

Change-Id: I0a6d0315fe8db90b156d5cd988f79e66022e9414
üst 2ca8cdf9
...@@ -138,12 +138,12 @@ static sal_Bool checkFieldDependencies(TypeManager& typeMgr, TypeDependency& dep ...@@ -138,12 +138,12 @@ static sal_Bool checkFieldDependencies(TypeManager& typeMgr, TypeDependency& dep
if (count == 0 || reader.getTypeClass() == RT_TYPE_ENUM) if (count == 0 || reader.getTypeClass() == RT_TYPE_ENUM)
return sal_True; return sal_True;
OString fieldType;
for (sal_uInt16 i=0; i < count; i++) for (sal_uInt16 i=0; i < count; i++)
{ {
fieldType = reader.getFieldType(i); const OString fieldType = reader.getFieldType(i);
const bool bIsTypeParam(reader.getFieldAccess(i) & RT_ACCESS_PARAMETERIZED_TYPE);
if (!fieldType.isEmpty()) if (!fieldType.isEmpty() && !bIsTypeParam)
{ {
dependencies.insert(type, fieldType, TYPEUSE_MEMBER); dependencies.insert(type, fieldType, TYPEUSE_MEMBER);
checkTypeDependencies(typeMgr, dependencies, fieldType); checkTypeDependencies(typeMgr, dependencies, fieldType);
...@@ -224,9 +224,12 @@ static sal_Bool checkReferenceDependencies(TypeManager& typeMgr, TypeDependency& ...@@ -224,9 +224,12 @@ static sal_Bool checkReferenceDependencies(TypeManager& typeMgr, TypeDependency&
{ {
referenceName = reader.getReferenceName(i); referenceName = reader.getReferenceName(i);
if (reader.getReferenceType(i) != RT_REF_TYPE_PARAMETER)
{
dependencies.insert(type, referenceName, TYPEUSE_NORMAL); dependencies.insert(type, referenceName, TYPEUSE_NORMAL);
checkTypeDependencies(typeMgr, dependencies, referenceName); checkTypeDependencies(typeMgr, dependencies, referenceName);
} }
}
return sal_True; return sal_True;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment