sal_uInt16/MSHORT to SwTwips/sal_Int32

Change-Id: Ie069f5203591e90210850bc7e5d3f03609df144c

sw/inc/ndtxt.hxx

@@ -608,7 +608,7 @@ public:
 
        @return     the width of the leading whitespace
      */
-    sal_uInt16 GetWidthOfLeadingTabs() const;
+    SwTwips GetWidthOfLeadingTabs() const;
 
     /**
        Returns if the paragraph has a visible numbering or bullet.
@@ -695,7 +695,7 @@ public:
 
     /** @return actual count of initial chars for initial-function.
        If nWishLen == 0 that of first word. */
-    sal_uInt16 GetDropLen( sal_uInt16 nWishLen) const;
+    sal_Int32 GetDropLen(sal_Int32 nWishLen) const;
 
     /// Passes back info needed on the dropcap dimensions
     bool GetDropSize(int& rFontHeight, int& rDropHeight, int& rDropDescent) const;

sw/source/core/text/itratr.cxx

@@ -980,9 +980,9 @@ sal_uInt16 SwTxtNode::GetScalingOfSelectedText( sal_Int32 nStt, sal_Int32 nEnd )
            ( nWidth ? ((100 * aIter.GetFnt()->_GetTxtSize( aDrawInf ).Height()) / nWidth ) : 0 );
 }
 
-sal_uInt16 SwTxtNode::GetWidthOfLeadingTabs() const
+SwTwips SwTxtNode::GetWidthOfLeadingTabs() const
 {
-    sal_uInt16 nRet = 0;
+    SwTwips nRet = 0;
 
     sal_Int32 nIdx = 0;
 
@@ -1011,10 +1011,9 @@ sal_uInt16 SwTxtNode::GetWidthOfLeadingTabs() const
                 SWRECTFN( pFrm )
                 SwRect aRect;
                 pFrm->GetCharRect( aRect, aPos );
-                nRet = (sal_uInt16)
-                       ( pFrm->IsRightToLeft() ?
+                nRet = pFrm->IsRightToLeft() ?
                             (pFrm->*fnRect->fnGetPrtRight)() - (aRect.*fnRect->fnGetRight)() :
-                            (aRect.*fnRect->fnGetLeft)() - (pFrm->*fnRect->fnGetPrtLeft)() );
+                            (aRect.*fnRect->fnGetLeft)() - (pFrm->*fnRect->fnGetPrtLeft)();
                 break;
             }
         }

sw/source/core/text/txtdrop.cxx

@@ -120,7 +120,7 @@ SwDropPortion::~SwDropPortion()
 }
 
 // nWishLen = 0 indicates that we want a whole word
-MSHORT SwTxtNode::GetDropLen( MSHORT nWishLen ) const
+sal_Int32 SwTxtNode::GetDropLen( sal_Int32 nWishLen ) const
 {
     sal_Int32 nEnd = GetTxt().getLength();
     if( nWishLen && nWishLen < nEnd )

sw/source/filter/ww8/wrtw8nds.cxx

@@ -634,7 +634,7 @@ bool SwWW8AttrIter::IsDropCap( int nSwPos )
     bool bWholeWord = mrSwFmtDrop.GetWholeWord();
     if (bWholeWord)
     {
-        short nWordLen = rNd.GetDropLen(0);
+        const sal_Int32 nWordLen = rNd.GetDropLen(0);
         if(nSwPos == nWordLen && nSwPos != 0)
             return true;
     }