Fix various XServiceInfo implementations

...to match what is recorded in the .component files

Change-Id: Ie548cd37872d3b8540222201afaac73040e65c8f

1 files changed, 6 insertions, 4 deletions

diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index 8646fd512b67..e3789cf92030 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -191,10 +191,11 @@ IMPLEMENT_DEFAULT_CLONING( OImageControlModel )
 StringSequence  OImageControlModel::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControlModel::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_COMPONENT_IMAGECONTROL;
+    pArray[aSupported.getLength()-2] = FRM_SUN_COMPONENT_IMAGECONTROL;
+    pArray[aSupported.getLength()-1] = FRM_COMPONENT_IMAGECONTROL;
     return aSupported;
 }
 
@@ -725,10 +726,11 @@ Any SAL_CALL OImageControlControl::queryAggregation(const Type& _rType) throw (R
 StringSequence  OImageControlControl::getSupportedServiceNames() throw(std::exception)
 {
     StringSequence aSupported = OBoundControl::getSupportedServiceNames();
-    aSupported.realloc(aSupported.getLength() + 1);
+    aSupported.realloc(aSupported.getLength() + 2);
 
     OUString*pArray = aSupported.getArray();
-    pArray[aSupported.getLength()-1] = FRM_SUN_CONTROL_IMAGECONTROL;
+    pArray[aSupported.getLength()-2] = FRM_SUN_CONTROL_IMAGECONTROL;
+    pArray[aSupported.getLength()-1] = STARDIV_ONE_FORM_CONTROL_IMAGECONTROL;
     return aSupported;
 }