[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - reportdesign/source

[Libreoffice Gerrit user]

 reportdesign/source/ui/report/ReportController.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1f7bbcfa7fc55437f11f0d8b93848d9c71f9b3cc
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Sun Aug 12 11:39:04 2018 +0200
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Aug 16 17:51:07 2018 +0200

    tdf#117795: not all elements have ChartFontName property
    
    See bt https://bugs.documentfoundation.org/attachment.cgi?id=144114
    In this bugtracker we tried to apply a change of fontname on reportdesign::OFixedLine
    
    Change-Id: I60ee5ca9f967fc71939e2f57ecd9de7edd680958
    Reviewed-on: https://gerrit.libreoffice.org/58895
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>
    (cherry picked from commit 3512079dc42a6472136f9c229fc9ea0b0033ebf9)
    Reviewed-on: https://gerrit.libreoffice.org/59151
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Reviewed-by: Lionel Elie Mamane <lionel at mamane.lu>
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 9b47422943b7..34b86170620a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -4140,7 +4140,14 @@ bool OReportController::impl_setPropertyAtControls_throw(const char* pUndoResId,
     {
         const uno::Reference< beans::XPropertySet > xControlModel(*aIter,uno::UNO_QUERY);
         if ( xControlModel.is() )
-            xControlModel->setPropertyValue(_sProperty,_aValue);
+            try
+            {
+                xControlModel->setPropertyValue(_sProperty,_aValue);
+            }
+            catch(const UnknownPropertyException& e)
+            {
+                SAL_WARN("reportdesign", "UnknowPropertyException:" << e);
+            }
     }
 
     return !aSelection.empty();