summaryrefslogtreecommitdiff
path: root/extensions
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-31 10:15:47 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-31 10:15:47 +0100
commit9e77c2fb7cadfd477fb1b971b011d43f30781660 (patch)
tree7a7d70822e2628a1e6383a15eeedb8fea5309123 /extensions
parent11235e86497df47ff3acc61c1cab9fff0b91949e (diff)
Remove UNOIDL "array" and "union" vaporware remnants
...and deprecate what cannot be removed for compatibility. Change-Id: I1ea335af775b867b468b8285113631167729a92a
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/ole/unoconversionutilities.hxx7
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx1
2 files changed, 1 insertions, 7 deletions
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 1307d33bc4ab..546d7965616c 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -963,12 +963,7 @@ void UnoConversionUtilities<T>::anyToVariant(VARIANT* pVariant, const Any& rAny)
//TypeClass_TYPEDEF
//TypeClass_ANY:
//TypeClass_UNKNOWN:
- //TypeClass_UNSIGNED_OCTET:
- // TypeClass_UNION:
- // TypeClass_ARRAY:
- // TypeClass_UNSIGNED_INT:
- // TypeClass_UNSIGNED_BYTE:
- // TypeClass_MODULE:
+ //TypeClass_MODULE:
throw CannotConvertException(
"[automation bridge]UnoConversionUtilities<T>::anyToVariant\n"
"There is no conversion for this UNO type to a Automation type."
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 7260092d774b..c6d5f3106116 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2207,7 +2207,6 @@ namespace pcr
return false;
if ( ( _rProperty.Type.getTypeClass() == TypeClass_INTERFACE )
- || ( _rProperty.Type.getTypeClass() == TypeClass_ARRAY )
|| ( _rProperty.Type.getTypeClass() == TypeClass_UNKNOWN )
)
return true;