[Libreoffice-commits] core.git: filter/source

[Caolán McNamara]

 filter/source/msfilter/eschesdo.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 317e3d43c937e7d3bff61b100c08f04c837c4d25
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Aug 28 17:09:06 2017 +0100

    crashtesting: failure on exporting tdf95568-1.ots to xlsx
    
    since...
    
    commit c0cc02e2934aeb12dda44818955e5964496c186a
    Date:   Thu Aug 17 21:47:22 2017 +0200
    
        tdf#50097: DOCX: export form controls as MSO ActiveX controls
    
    Change-Id: I55f1dcbe454e696df71a7656c796e36e91c42762
    Reviewed-on: https://gerrit.libreoffice.org/41651
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 1348c38bfe7e..5ed8d3892125 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -425,9 +425,13 @@ sal_uInt32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
             const Reference< XPropertySet > xPropSet(rObj.mXPropSet, UNO_QUERY);
             if(xPropSet.is())
             {
-                text::TextContentAnchorType eAnchorType;
-                xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
-                bInline = eAnchorType == text::TextContentAnchorType_AS_CHARACTER;
+                const Reference<XPropertySetInfo> xPropInfo = xPropSet->getPropertySetInfo();
+                if (xPropInfo.is() && xPropInfo->hasPropertyByName("AnchorType"))
+                {
+                    text::TextContentAnchorType eAnchorType;
+                    xPropSet->getPropertyValue("AnchorType") >>= eAnchorType;
+                    bInline = eAnchorType == text::TextContentAnchorType_AS_CHARACTER;
+                }
             }
 
             if(bInline)