writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 1cc210b11814cce0cc3af393f8333b0d5154dbca Author: Stephan Bergmann <[email protected]> Date: Fri Jun 29 15:57:34 2018 +0200 Improved loplugin:redundantcast (const-qualified typedefs): writerfilter Change-Id: I389287456feba683c6af650546931325e4a6f3ba Reviewed-on: https://gerrit.libreoffice.org/56707 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx index e88c3cf7898a..5ed859bfd1f9 100644 --- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx +++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx @@ -143,7 +143,7 @@ void SAL_CALL OOXMLFastContextHandler::startFastElement (Token_t Element, const uno::Reference< xml::sax::XFastAttributeList > & Attribs) { - if (oox::getNamespace(Element) == static_cast<sal_Int32>(NMSP_mce)) + if (oox::getNamespace(Element) == NMSP_mce) m_bDiscardChildren = prepareMceContext(Element, Attribs); else if (!m_bDiscardChildren) @@ -1892,7 +1892,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext // here until we need a more generic solution. bool bIsWrap = Element == static_cast<sal_Int32>(NMSP_vmlWord | XML_wrap); bool bIsSignatureLine = Element == static_cast<sal_Int32>(NMSP_vmlOffice | XML_signatureline); - bool bSkipImages = getDocument()->IsSkipImages() && oox::getNamespace(Element) == static_cast<sal_Int32>(NMSP_dml) && + bool bSkipImages = getDocument()->IsSkipImages() && oox::getNamespace(Element) == NMSP_dml && !((oox::getBaseToken(Element) == XML_linkedTxbx) || (oox::getBaseToken(Element) == XML_txbx)); if ( bInNamespaces && ((!bIsWrap && !bIsSignatureLine) || dynamic_cast<OOXMLFastContextHandlerShape&>(*mpParent).isShapeSent()) ) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
