writerfilter/source/ooxml/OOXMLFastContextHandler.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 67c98f6f643e8653490174fcbb7aa618b19b27e2
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Aug 21 14:30:39 2014 +0200
Simplify ((A && B) || !A) to (!A || B)
Change-Id: Iae4f45f1e64effa1369e9aba13b6b972a5ba76a0
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 2f7f709..268400d 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1987,7 +1987,7 @@ OOXMLFastContextHandlerWrapper::lcl_createFastChildContext
// filter out a single token. Just hardwire the wrap token here till we
// need a more generic solution.
bool bIsWrap = Element == static_cast<sal_Int32>(NMSP_vmlWord | XML_wrap);
- if ( bInNamespaces && ((bIsWrap &&
static_cast<OOXMLFastContextHandlerShape*>(mpParent)->isShapeSent()) ||
!bIsWrap) )
+ if ( bInNamespaces && (!bIsWrap ||
static_cast<OOXMLFastContextHandlerShape*>(mpParent)->isShapeSent()) )
xResult.set(OOXMLFactory::getInstance()->createFastChildContextFromStart(this,
Element));
else if (mxContext.is())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
