1 files changed, 10 insertions, 8 deletions
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 2bc98cd66de3..3c99baa3ee79 100755
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -812,14 +812,16 @@ sal_Bool DrawController::convertFastPropertyValue (
     else if (mxSubController.is())
     {
         rConvertedValue = rValue;
-        rOldValue = mxSubController->getFastPropertyValue(nHandle);
-        bResult = (rOldValue != rConvertedValue);
-        /*        bResult = mpSubController->convertFastPropertyValue(
-            rConvertedValue,
-            rOldValue,
-            nHandle,
-            rValue);
-        */
+        try
+        {
+            rOldValue = mxSubController->getFastPropertyValue(nHandle);
+            bResult = (rOldValue != rConvertedValue);
+        }
+        catch(beans::UnknownPropertyException aException)
+        {
+            // The prperty is unknown and thus an illegal argument to this method.
+            throw com::sun::star::lang::IllegalArgumentException();
+        }
     }
 
     return bResult;