diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:42:59 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-15 12:42:59 +0000 |
| commit | 3f3a04b4f57b00141620da774ff9288685034c16 (patch) | |
| tree | a5bee03d031577d9ba86e87b2f3a7f3178cd8b0f /desktop/source | |
| parent | b82aed8e7f02baa2fd8e97ba4ec36833d0a035f9 (diff) | |
more merge fixes
Diffstat (limited to 'desktop/source')
| -rwxr-xr-x | desktop/source/deployment/registry/component/dp_component.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index ca23d0ec0520..323f8e5d3afd 100755 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -645,7 +645,7 @@ BackendImpl::BackendImpl( OUSTR("*.jar"), getResourceString(RID_STR_JAVA_TYPELIB), RID_IMG_JAVA_TYPELIB ) ), - m_typeInfos( 5 ) + m_typeInfos( 6 ) { m_typeInfos[ 0 ] = m_xDynComponentTypeInfo; m_typeInfos[ 1 ] = m_xJavaComponentTypeInfo; |