remove UL/L suffixes from integer constants on the RHS of expressions

Reviewed-on: https://gerrit.libreoffice.org/41237
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
(cherry picked from commit 2e8acde112e1c6754df26902e79a78346ba45a2d)

Change-Id: I899a8126c9d971601fea6c77eca165718aea0ac5
Reviewed-on: https://gerrit.libreoffice.org/45452
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
(cherry picked from commit 2887aefa4d4f60ba8b0cd7efd5d3a73ffb209781)

7 files changed, 18 insertions, 18 deletions

diff --git a/xmloff/source/core/nmspmap.cxx b/xmloff/source/core/nmspmap.cxx
index 8f6cb4801aca..800262a71582 100644
--- a/xmloff/source/core/nmspmap.cxx
+++ b/xmloff/source/core/nmspmap.cxx
@@ -310,7 +310,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName,
     rtl::Reference<NameSpaceEntry> xEntry(new NameSpaceEntry());
 
         sal_Int32 nColonPos = rAttrName.indexOf( ':' );
-        if( -1L == nColonPos )
+        if( -1 == nColonPos )
         {
             // case: no ':' found -> default namespace
             (xEntry->sPrefix).clear();
@@ -320,7 +320,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName,
         {
             // normal case: ':' found -> get prefix/suffix
             xEntry->sPrefix = rAttrName.copy( 0L, nColonPos );
-            xEntry->sName = rAttrName.copy( nColonPos + 1L );
+            xEntry->sName = rAttrName.copy( nColonPos + 1 );
         }
 
         if( pPrefix )
@@ -339,7 +339,7 @@ sal_uInt16 SvXMLNamespaceMap::GetKeyByAttrName_( const OUString& rAttrName,
         else if ( xEntry->sPrefix == sXMLNS )
             // not found, but xmlns prefix: return xmlns 'namespace'
             nKey = xEntry->nKey = XML_NAMESPACE_XMLNS;
-        else if( nColonPos == -1L )
+        else if( nColonPos == -1 )
             // not found, and no namespace: 'namespace' none
             nKey = xEntry->nKey = XML_NAMESPACE_NONE;
 
diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx
index fec3e48fa4ae..1d62b4e109d0 100644
--- a/xmloff/source/core/unoatrcn.cxx
+++ b/xmloff/source/core/unoatrcn.cxx
@@ -64,7 +64,7 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const
     const sal_uInt16 nAttrCount = mpContainer->GetAttrCount();
 
     sal_Int32 nPos = aName.indexOf( ':' );
-    if( nPos == -1L )
+    if( nPos == -1 )
     {
         for( sal_uInt16 nAttr = 0; nAttr < nAttrCount; nAttr++ )
         {
@@ -76,7 +76,7 @@ sal_uInt16 SvUnoAttributeContainer::getIndexByName(const OUString& aName ) const
     else
     {
         const OUString aPrefix( aName.copy( 0L, nPos ) );
-        const OUString aLName( aName.copy( nPos+1L ) );
+        const OUString aLName( aName.copy( nPos+1 ) );
 
         for( sal_uInt16 nAttr = 0; nAttr < nAttrCount; nAttr++ )
         {
@@ -161,10 +161,10 @@ void SAL_CALL SvUnoAttributeContainer::replaceByName(const OUString& aName, cons
             throw container::NoSuchElementException();
 
         sal_Int32 nPos = aName.indexOf( ':' );
-        if( nPos != -1L )
+        if( nPos != -1 )
         {
             const OUString aPrefix( aName.copy( 0L, nPos ));
-            const OUString aLName( aName.copy( nPos+1L ));
+            const OUString aLName( aName.copy( nPos+1 ));
 
             if( pData->Namespace.isEmpty() )
             {
@@ -203,10 +203,10 @@ throw( lang::IllegalArgumentException, container::ElementExistException, lang::W
         throw container::ElementExistException();
 
     sal_Int32 nPos = aName.indexOf( ':' );
-    if( nPos != -1L )
+    if( nPos != -1 )
     {
         const OUString aPrefix( aName.copy( 0L, nPos ));
-        const OUString aLName( aName.copy( nPos+1L ));
+        const OUString aLName( aName.copy( nPos+1 ));
 
         if( pData->Namespace.isEmpty() )
         {
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index 925d7966958d..e2e930419b2a 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -334,7 +334,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
         }
 
         // if not the last entry, add one space to next tag
-        if(a + 1UL != maList.size())
+        if(a + 1 != maList.size())
         {
             aNewString += aEmptySpace;
         }
@@ -741,7 +741,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
         }
 
         // if not the last entry, add one space to next tag
-        if(a + 1UL != maList.size())
+        if(a + 1 != maList.size())
         {
             aNewString += aEmptySpace;
         }
diff --git a/xmloff/source/style/fonthdl.cxx b/xmloff/source/style/fonthdl.cxx
index a5aa39b826e5..29f80c776be6 100644
--- a/xmloff/source/style/fonthdl.cxx
+++ b/xmloff/source/style/fonthdl.cxx
@@ -127,13 +127,13 @@ bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any
 
             // Set position to the character behind the ';', so we won't
             // forget this.
-            if( -1L != nPos )
+            if( -1 != nPos )
                 nPos++;
 
             // If the property value was empty, we stop now.
             // If there is a ';' at the first position, the empty name
             // at the start will be removed.
-            if( 0L == nLast )
+            if( 0 == nLast )
                 continue;
 
             // nFirst and nLast now denote the first and last character of
@@ -174,7 +174,7 @@ bool XMLFontFamilyNamePropHdl::exportXML( OUString& rStrExpValue, const uno::Any
                     sValue.append( '\'' );
             }
         }
-        while( -1L != nPos );
+        while( -1 != nPos );
 
         rStrExpValue = sValue.makeStringAndClear();
 
diff --git a/xmloff/source/style/xmlnumi.cxx b/xmloff/source/style/xmlnumi.cxx
index f35637276c1c..f7d047f23229 100644
--- a/xmloff/source/style/xmlnumi.cxx
+++ b/xmloff/source/style/xmlnumi.cxx
@@ -307,7 +307,7 @@ SvxXMLListLevelStyleContext_Impl::SvxXMLListLevelStyleContext_Impl(
         {
         case XML_TOK_TEXT_LEVEL_ATTR_LEVEL:
             nLevel = rValue.toInt32();
-            if( nLevel >= 1L )
+            if( nLevel >= 1 )
                 nLevel--;
             else
                 nLevel = 0;
diff --git a/xmloff/source/text/txtparae.cxx b/xmloff/source/text/txtparae.cxx
index 0ba5f9ddce6f..4da6e0014424 100644
--- a/xmloff/source/text/txtparae.cxx
+++ b/xmloff/source/text/txtparae.cxx
@@ -768,7 +768,7 @@ OUString XMLTextParagraphExport::FindTextStyleAndHyperlink(
             ppAddStates++;
         }
     }
-    if( (aPropStates.size() - nIgnoreProps) > 0L )
+    if( (aPropStates.size() - nIgnoreProps) > 0 )
     {
         // erase the character style, otherwise the autostyle cannot be found!
         // erase the hyperlink, otherwise the autostyle cannot be found!
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 76d759f37f11..abccc08c56d4 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -117,7 +117,7 @@ XMLCharContext::XMLCharContext(
                 IsXMLToken( aLocalName, XML_C ) )
             {
                 sal_Int32 nTmp = xAttrList->getValueByIndex(i).toInt32();
-                if( nTmp > 0L )
+                if( nTmp > 0 )
                 {
                     if( nTmp > USHRT_MAX )
                         m_nCount = USHRT_MAX;
@@ -1874,7 +1874,7 @@ XMLParaContext::XMLParaContext(
         case XML_TOK_TEXT_P_LEVEL:
             {
                 sal_Int32 nTmp = rValue.toInt32();
-                if( nTmp > 0L )
+                if( nTmp > 0 )
                 {
                     if( nTmp > 127 )
                         nTmp = 127;