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

[Stephan Bergmann]

 sw/source/core/doc/DocumentStylePoolManager.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 836b5ac33938a49f2c2537e278fbf49fd6b8e9ea
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 31 08:55:37 2018 +0100

    Make nOffs be long from the start
    
    ...implicitly casting it to smaller types where necessary, instead of the other
    way around
    
    Change-Id: Ib7673fbae016b0c91bf37d6768692fa99ccae46c
    Reviewed-on: https://gerrit.libreoffice.org/48955
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index 822c6acd7049..130e30424356 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -1989,7 +1989,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
             aFormat.SetIncludeUpperLevels( 1 );
             aFormat.SetSuffix( "." );
 
-            sal_uInt16 nOffs = 397; // 0.70 cm
+            long const nOffs = 397; // 0.70 cm
 
             if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_WIDTH_AND_POSITION )
             {
@@ -2009,7 +2009,7 @@ SwNumRule* DocumentStylePoolManager::GetNumRuleFromPool( sal_uInt16 nId )
                 }
                 else if ( eNumberFormatPositionAndSpaceMode == SvxNumberFormat::LABEL_ALIGNMENT )
                 {
-                    long nPos = (n+1) * static_cast<long>(nOffs);
+                    long nPos = (n+1) * nOffs;
                     aFormat.SetListtabPos(nPos + 357);
                     aFormat.SetIndentAt(nPos + 357);
                 }