summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-14 15:54:06 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-14 17:32:17 +0200
commit3f507037e64994f18d661ce4f3cc06a7cd1c818c (patch)
tree414db6fe14ac98fb997620c232342547b9c22746 /sw
parentac93d8475e89e9f02980999b4f8d1f2591ffcf81 (diff)
-Werror=logical-op (GCC 6)
"logical ‘or’ of equal expressions" Change-Id: I156cb8f09dadb7b625585cfd28d584ba0ae7633e
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/draw/dflyobj.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index b672d7e40aba..8451721f02f7 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -731,7 +731,7 @@ void SwVirtFlyDrawObj::NbcCrop(const Point& rRef, const Fraction& xFact, const F
{
// Get Wrt Shell
SwWrtShell *pSh = dynamic_cast<SwWrtShell*>( GetFlyFrame()->getRootFrame()->GetCurrShell() );
- if (!pSh || dynamic_cast<const SwWrtShell*>( pSh) == nullptr)
+ if (!pSh)
return;
// Compute old and new rect. This will give us the deformation to apply to