From 1e752272d9448694778a251c09137e4fbd2c83dc Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 14 Apr 2016 14:30:29 +0200
Subject: -Werror=logical-op (GCC 6)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

"logical ‘or’ of collectively exhaustive tests is always true"; apparently a
typo in 63114e6d863de32e2d93f0da54caca928916d9c2 "Create SvxFieldData instance
directly from the UNO textfield object"

Change-Id: I9e504ccb5ebad5a42a8c07d7f16d7c316dd82cf1
---
 editeng/source/items/flditem.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editeng/source/items')

diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index a49f7c4489a7..121dcf8625b0 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -185,7 +185,7 @@ SvxFieldData* SvxFieldData::Create(const uno::Reference<text::XTextContent>& xTe
                     {
                         pData->SetFormat(SVXAUTHORFORMAT_SHORTNAME);
                     }
-                    else if (nFmt >= SVXAUTHORFORMAT_FULLNAME || nFmt <= SVXAUTHORFORMAT_SHORTNAME)
+                    else if (nFmt >= SVXAUTHORFORMAT_FULLNAME && nFmt <= SVXAUTHORFORMAT_SHORTNAME)
                     {
                         pData->SetFormat(static_cast<SvxAuthorFormat>(nFmt));
                     }
-- 
cgit