[Libreoffice-commits] core.git: Branch 'private/swe/libreoffice-5-2+backports' - sw/qa writerfilter/source

[Caolán McNamara]

 sw/qa/core/data/ooxml/pass/ofz4825-1.docx             |binary
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |    2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b01146c534b8a2edf0b73b528bf1428e45ee8bd1
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Dec 29 14:40:13 2017 +0000

    ofz#4825 Bad-cast
    
    Change-Id: I57f180c9e28d5f2439efcc1f2726d8fabc108bc9
    Reviewed-on: https://gerrit.libreoffice.org/47176
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit 752684babf5ebc4ac6dfa4a7ea30f7f7cb4a9e4a)

diff --git a/sw/qa/core/data/ooxml/pass/ofz4825-1.docx 
b/sw/qa/core/data/ooxml/pass/ofz4825-1.docx
new file mode 100644
index 000000000000..ce8e6493af45
Binary files /dev/null and b/sw/qa/core/data/ooxml/pass/ofz4825-1.docx differ
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index d3a6a02d3ab6..49d54521fc39 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1847,7 +1847,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
     bool bSkipImages = getDocument()->IsSkipImages() && 
oox::getNamespace(Element) == static_cast<sal_Int32>(NMSP_dml) &&
         !((oox::getBaseToken(Element) == XML_linkedTxbx) || 
(oox::getBaseToken(Element) == XML_txbx));
 
-    if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || 
static_cast<OOXMLFastContextHandlerShape*>(mpParent)->isShapeSent()) )
+    if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || 
dynamic_cast<OOXMLFastContextHandlerShape&>(*mpParent).isShapeSent()) )
         xResult.set(OOXMLFactory::createFastChildContextFromStart(this, 
Element));
     else if (mxContext.is()  && !bSkipImages)
     {

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits