summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-08-21 14:30:39 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-08-21 14:30:39 +0200
commit67c98f6f643e8653490174fcbb7aa618b19b27e2 (patch)
treef002900ff813b328cd24f36418e29ae57ec162ce /writerfilter
parent0eabc890ccec6cf428d7e05ad994b24924596b81 (diff)
Simplify ((A && B) || !A) to (!A || B)
Change-Id: Iae4f45f1e64effa1369e9aba13b6b972a5ba76a0
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/ooxml/OOXMLFastContextHandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 2f7f709bdc93..268400de838a 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())
{