[Libreoffice-commits] core.git: sw/source

[Noel Grandin (via logerrit)]

 sw/source/filter/xml/xmlimpit.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit cac7ad2d011eb6602b6c9702dddb76d129f093c8
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Aug 26 18:42:45 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Wed Aug 26 22:03:25 2020 +0200

    remove always true conditon
    
    Change-Id: Ifc75e7361f67b716fcfc3ed8e55fbb4b2e126ae5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101421
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index 4d6cc1b7b321..543d3ba90c59 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -56,7 +56,7 @@ using namespace ::com::sun::star;
 using namespace ::xmloff::token;
 using uno::Any;
 
-const sal_uInt16 nUnknownWhich = RES_UNKNOWNATR_CONTAINER;
+constexpr sal_uInt16 nUnknownWhich = RES_UNKNOWNATR_CONTAINER;
 
 SvXMLImportItemMapper::SvXMLImportItemMapper(
                                 SvXMLItemMapEntriesRef const & rMapEntries ) :
@@ -146,7 +146,7 @@ void SvXMLImportItemMapper::importXML( SfxItemSet& rSet,
                               rNamespaceMap );
             }
         }
-        else if (USHRT_MAX != nUnknownWhich && !aLocalName.isEmpty())
+        else if (!aLocalName.isEmpty())
         {
             if( !pUnknownItem )
             {