[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - svx/source

[Michael Stahl]

 svx/source/fmcomp/fmgridcl.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit e58f2c9ffa627df299cdc5cbddaeaf2f173736c2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Jun 20 15:02:37 2013 +0200

    FmGridControl:  handle non-existing properties
    
    Fix crash with unhandled exception requesting "Description".
    
    Change-Id: I6b6cb61273fb042532ab63620729f4129239fe81
    (cherry picked from commit 32e2c6456fb3bf3bf75f9b11c90193c537b4ef26)
    Reviewed-on: https://gerrit.libreoffice.org/4399
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 26eacd9..ab8334a 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -1908,7 +1908,14 @@ namespace
                 Reference<XPropertySet> xProp;
                 xIndex->getByIndex( _nPosition ) >>= xProp;
                 if ( xProp.is() )
-                    xProp->getPropertyValue( _sPropName ) >>= sRetText;
+                {
+                    try {
+                        xProp->getPropertyValue( _sPropName ) >>= sRetText;
+                    } catch (UnknownPropertyException const& e) {
+                        SAL_WARN("svx.form",
+                                "exception caught: " << e.Message);
+                    }
+                }
             }
         }
         return sRetText;